Skip to content

E
edx-platform
Commit 98070e4f by Bridger Maxwell
Options

Merge

parents 6f3a7aa3 3840870b
Showing with 144 additions and 115 deletions
sass/_askbot-original.scss
...@@ -1129,35 +1129,35 @@ ul { ...@@ -1129,35 +1129,35 @@ ul {
#id_title { #id_title {
width: 100%; } width: 100%; }
.wmd-preview { // .wmd-preview {
margin: 3px 0 5px 0; // margin: 3px 0 5px 0;
padding: 6px; // padding: 6px;
background-color: #F5F5F5; // background-color: #F5F5F5;
min-height: 20px; // min-height: 20px;
overflow: auto; // overflow: auto;
font-size: 13px; // font-size: 13px;
font-family: Arial; // font-family: Arial;
p { // p {
margin-bottom: 14px; // margin-bottom: 14px;
line-height: 1.4; // line-height: 1.4;
font-size: 14px; } // font-size: 14px; }
pre { // pre {
background-color: #E7F1F8; } // background-color: #E7F1F8; }
blockquote { // blockquote {
background-color: #eee; } // background-color: #eee; }
IMG { // IMG {
max-width: 600px; } } // max-width: 600px; } }
.preview-toggle { // .preview-toggle {
width: 100%; // width: 100%;
color: #b6a475; // color: #b6a475;
text-align: left; // text-align: left;
span:hover { // span:hover {
cursor: pointer; } } // cursor: pointer; } }
.after-editor { // .after-editor {
margin-top: 15px; // margin-top: 15px;
margin-bottom: 15px; } // margin-bottom: 15px; }
.checkbox { .checkbox {
margin-left: 5px; margin-left: 5px;
...@@ -1719,32 +1719,32 @@ ul { ...@@ -1719,32 +1719,32 @@ ul {
width: 395px; width: 395px;
font-size: 14px; } font-size: 14px; }
.openid-signin input.submit, .meta input.submit, .users-page input.submit, .user-profile-edit-page input.submit, .user-profile-page input.submit { // .openid-signin input.submit, .meta input.submit, .users-page input.submit, .user-profile-edit-page input.submit, .user-profile-page input.submit {
background: url(../images/small-button-blue.png) repeat-x top; // background: url(../images/small-button-blue.png) repeat-x top;
border: 0; // border: 0;
color: #4a757f; // color: #4a757f;
font-weight: bold; // font-weight: bold;
font-size: 13px; // font-size: 13px;
font-family: Arial; // font-family: Arial;
height: 26px; // height: 26px;
margin: 5px 0px; // margin: 5px 0px;
width: 100px; // width: 100px;
cursor: pointer; // cursor: pointer;
border-radius: 4px; // border-radius: 4px;
-ms-border-radius: 4px; // -ms-border-radius: 4px;
-moz-border-radius: 4px; // -moz-border-radius: 4px;
-webkit-border-radius: 4px; // -webkit-border-radius: 4px;
-khtml-border-radius: 4px; // -khtml-border-radius: 4px;
text-shadow: 0px 1px 0px #e6f6fa; // text-shadow: 0px 1px 0px #e6f6fa;
-moz-text-shadow: 0px 1px 0px #e6f6fa; // -moz-text-shadow: 0px 1px 0px #e6f6fa;
-webkit-text-shadow: 0px 1px 0px #e6f6fa; // -webkit-text-shadow: 0px 1px 0px #e6f6fa;
-webkit-box-shadow: 1px 1px 2px #808080; // -webkit-box-shadow: 1px 1px 2px #808080;
-moz-box-shadow: 1px 1px 2px #808080; // -moz-box-shadow: 1px 1px 2px #808080;
box-shadow: 1px 1px 2px #808080; } // box-shadow: 1px 1px 2px #808080; }
.openid-signin input.submit:hover, .meta input.submit:hover, .users-page input.submit:hover, .user-profile-edit-page input.submit:hover, .user-profile-page input.submit:hover { // .openid-signin input.submit:hover, .meta input.submit:hover, .users-page input.submit:hover, .user-profile-edit-page input.submit:hover, .user-profile-page input.submit:hover {
background: url(../images/small-button-blue.png) repeat-x bottom; // background: url(../images/small-button-blue.png) repeat-x bottom;
text-decoration: none; } // text-decoration: none; }
.openid-signin .cancel, .meta .cancel, .users-page .cancel, .user-profile-edit-page .cancel, .user-profile-page .cancel { .openid-signin .cancel, .meta .cancel, .users-page .cancel, .user-profile-edit-page .cancel, .user-profile-page .cancel {
background: url(../images/small-button-cancel.png) repeat-x top !important; background: url(../images/small-button-cancel.png) repeat-x top !important;
...@@ -1905,49 +1905,49 @@ a { ...@@ -1905,49 +1905,49 @@ a {
p { p {
font-size: 13px; } } font-size: 13px; } }
.follow-toggle, .submit { // .follow-toggle, .submit {
border: 0 !important; // border: 0 !important;
color: #4a757f; // color: #4a757f;
font-weight: bold; // font-weight: bold;
font-size: 12px; // font-size: 12px;
height: 26px; // height: 26px;
line-height: 26px; // line-height: 26px;
margin-top: -2px; // margin-top: -2px;
font-size: 15px; // font-size: 15px;
cursor: pointer; // cursor: pointer;
font-family: 'Yanone Kaffeesatz',sans-serif; // font-family: 'Yanone Kaffeesatz',sans-serif;
background: url(../images/small-button-blue.png) repeat-x top; // background: url(../images/small-button-blue.png) repeat-x top;
border-radius: 4px; // border-radius: 4px;
-ms-border-radius: 4px; // -ms-border-radius: 4px;
-moz-border-radius: 4px; // -moz-border-radius: 4px;
-webkit-border-radius: 4px; // -webkit-border-radius: 4px;
-khtml-border-radius: 4px; // -khtml-border-radius: 4px;
text-shadow: 0px 1px 0px #e6f6fa; // text-shadow: 0px 1px 0px #e6f6fa;
-moz-text-shadow: 0px 1px 0px #e6f6fa; // -moz-text-shadow: 0px 1px 0px #e6f6fa;
-webkit-text-shadow: 0px 1px 0px #e6f6fa; // -webkit-text-shadow: 0px 1px 0px #e6f6fa;
-webkit-box-shadow: 1px 1px 2px #808080; // -webkit-box-shadow: 1px 1px 2px #808080;
-moz-box-shadow: 1px 1px 2px #808080; // -moz-box-shadow: 1px 1px 2px #808080;
box-shadow: 1px 1px 2px #808080; } // box-shadow: 1px 1px 2px #808080; }
.follow-toggle:hover, .submit:hover { // .follow-toggle:hover, .submit:hover {
background: url(../images/small-button-blue.png) repeat-x bottom; // background: url(../images/small-button-blue.png) repeat-x bottom;
text-decoration: none !important; } // text-decoration: none !important; }
.follow-toggle { // .follow-toggle {
.follow { // .follow {
font-color: #000; // font-color: #000;
font-style: normal; } // font-style: normal; }
.unfollow { // .unfollow {
div.unfollow-red { // div.unfollow-red {
display: none; } // display: none; }
&:hover div { // &:hover div {
&.unfollow-red { // &.unfollow-red {
display: inline; // display: inline;
color: #fff; // color: #fff;
font-weight: bold; // font-weight: bold;
color: #A05736; } // color: #A05736; }
&.unfollow-green { // &.unfollow-green {
display: none; } } } } // display: none; } } } }
.count { .count {
font-family: 'Yanone Kaffeesatz',sans-serif; font-family: 'Yanone Kaffeesatz',sans-serif;
...@@ -2363,23 +2363,23 @@ button::-moz-focus-inner { ...@@ -2363,23 +2363,23 @@ button::-moz-focus-inner {
padding: 0; padding: 0;
border: none; } border: none; }
.submit { // .submit {
cursor: pointer; // cursor: pointer;
background-color: #D4D0C8; // background-color: #D4D0C8;
height: 30px; // height: 30px;
border: 1px solid #777777; // border: 1px solid #777777;
font-weight: bold; // font-weight: bold;
font-size: 120%; // font-size: 120%;
&:hover { // &:hover {
text-decoration: underline; } // text-decoration: underline; }
&.small { // &.small {
margin-right: 5px; // margin-right: 5px;
height: 20px; // height: 20px;
font-weight: normal; // font-weight: normal;
font-size: 12px; // font-size: 12px;
padding: 1px 5px; // padding: 1px 5px;
&:hover { // &:hover {
text-decoration: none; } } } // text-decoration: none; } } }
.question-page a.submit { .question-page a.submit {
display: -moz-inline-stack; display: -moz-inline-stack;
......
sass/_discussion-answers.scss
...@@ -48,4 +48,5 @@ div.answer-own { ...@@ -48,4 +48,5 @@ div.answer-own {
border-top: 1px solid #eee; border-top: 1px solid #eee;
overflow:hidden; overflow:hidden;
padding-left: flex-grid(1.2); padding-left: flex-grid(1.2);
padding-top: 10px;
} }
sass/_discussion-forms.scss
...@@ -22,7 +22,35 @@ form.answer-form { ...@@ -22,7 +22,35 @@ form.answer-form {
padding: 15px 0; padding: 15px 0;
width: auto; width: auto;
a { a {
@extend .light-button; @extend .light-button;
} }
} }
.wmd-preview {
margin: 3px 0 15px 0;
padding: 10px;
background-color: #F5F5F5;
min-height: 20px;
overflow: auto;
font-size: 13px;
font-family: Arial;
p {
margin-bottom: 14px;
line-height: 1.4;
font-size: 14px;
}
pre {
background-color: #E7F1F8;
}
blockquote {
background-color: #eee;
}
}
}
input.after-editor {
margin-bottom: 20px;
margin-right: 10px;
} }
sass/_form-wmd-toolbar.scss
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
} }
#wmd-preview { #wmd-preview {
background-color: LightSkyBlue; background-color: LightSkyBlue;
} }
#wmd-output { #wmd-output {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment