Skip to content

E
edx-platform
Commit 2f2a4cc6 by thomasxiii
Options

Merge pull request #468 from MITx/feature/kfiedler/courseware-style 

Made save buttons blue, finished remaining askbot bugs, and removed all instances of $mit-red
parents de4abe30 20d9e6e8
Showing with 67 additions and 45 deletions
cms/static/sass/_base.scss
......@@ -12,7 +12,6 @@ $bright-blue: #3c8ebf;
$orange: #f96e5b;
$yellow: #fff8af;
$cream: #F6EFD4;
$mit-red: #933;
$border-color: #ddd;
@mixin hide-text {
......
common/lib/xmodule/xmodule/css/capa/display.scss
......@@ -270,4 +270,10 @@ section.problem {
border: 1px solid #ccc;
padding: lh();
}
section.action {
input.save {
@extend .blue-button;
}
}
}
common/lib/xmodule/xmodule/css/video/display.scss
......@@ -305,11 +305,11 @@ div.video {
@include box-shadow(0 1px 0 #333);
a.ui-slider-handle {
background: $mit-red url(../images/slider-handle.png) center center no-repeat;
background: $pink url(../images/slider-handle.png) center center no-repeat;
@include background-size(50%);
border: 1px solid darken($mit-red, 20%);
border: 1px solid darken($pink, 20%);
@include border-radius(15px);
@include box-shadow(inset 0 1px 0 lighten($mit-red, 10%));
@include box-shadow(inset 0 1px 0 lighten($pink, 10%));
cursor: pointer;
height: 15px;
left: -6px;
......@@ -408,6 +408,7 @@ div.video {
cursor: pointer;
margin-bottom: 8px;
padding: 0;
line-height: lh();
&.current {
color: #333;
......@@ -415,7 +416,7 @@ div.video {
}
&:hover {
color: $mit-red;
color: $blue;
}
&:empty {
......
lms/static/sass/base/_variables.scss
......@@ -27,5 +27,4 @@ $border-color: #C8C8C8;
$light-gray: #ddd;
$dark-gray: #333;
$mit-red: #993333;
$text-color: $dark-gray;
lms/static/sass/course/base/_base.scss
......@@ -53,6 +53,11 @@ input[type="password"] {
}
}
label {
font-weight: normal;
font-style: normal;
}
input[type="reset"],
input[type="submit"],
input[type="button"],
......
lms/static/sass/course/courseware/_courseware.scss
......@@ -148,7 +148,7 @@ div.course-wrapper {
a.ui-slider-handle {
@include box-shadow(inset 0 1px 0 lighten($pink, 10%));
background: $mit-red url(../images/slider-bars.png) center center no-repeat;
background: $pink url(../images/slider-bars.png) center center no-repeat;
border: 1px solid darken($pink, 20%);
cursor: pointer;
......
lms/static/sass/course/discussion/_answers.scss
......@@ -91,7 +91,7 @@ div.answer-block {
div.deleted {
p {
color: $mit-red;
color: $pink;
}
}
......@@ -113,7 +113,7 @@ div.paginator {
&.curr {
background: none;
color: $mit-red;
color: $pink;
font-weight: bold;
}
......
lms/static/sass/course/discussion/_discussion.scss
......@@ -76,6 +76,6 @@ body.askbot {
}
.acSelect {
background-color: $mit-red;
background-color: $pink;
color: #fff;
}
lms/static/sass/course/discussion/_forms.scss
......@@ -16,6 +16,18 @@ form.answer-form {
margin-top: 15px;
resize: vertical;
width: 99%;
&#editor {
min-height: em(120);
}
}
div.checkbox {
margin-bottom: lh();
label {
display: inline;
}
}
div.form-item {
......@@ -97,7 +109,7 @@ form.answer-form {
margin-left: 2.5%;
padding-left: 1.5%;
border-left: 1px dashed #ddd;
color: $mit-red;
color: $pink;
}
ul, ol, pre {
......@@ -141,32 +153,32 @@ form.question-form {
}
div#question-list {
background-color: rgba(255,255,255,0.95);
@include box-sizing(border-box);
margin-top: -15px;
max-width: 505px;
min-width: 300px;
overflow: hidden;
padding-left: 5px;
position: absolute;
width: 35%;
z-index: 9999;
h2 {
text-transform: none;
padding: 8px 0;
border-bottom: 1px solid #eee;
margin: 0;
span {
background: #eee;
color: #555;
padding: 2px 5px;
@include border-radius(2px);
margin-right: 5px;
background-color: rgba(255,255,255,0.95);
@include box-sizing(border-box);
margin-top: -15px;
max-width: 505px;
min-width: 300px;
overflow: hidden;
padding-left: 5px;
position: absolute;
width: 35%;
z-index: 9999;
h2 {
text-transform: none;
padding: 8px 0;
border-bottom: 1px solid #eee;
margin: 0;
span {
background: #eee;
color: #555;
padding: 2px 5px;
@include border-radius(2px);
margin-right: 5px;
}
}
}
}
}
lms/static/sass/course/discussion/_modals.scss
// Style for modal boxes that pop up to notify the user of various events
.vote-notification {
background-color: darken($mit-red, 7%);
background-color: darken(#666, 7%);
@include border-radius(4px);
@include box-shadow(0px 2px 9px #aaa);
color: white;
......@@ -14,12 +14,12 @@
z-index: 1;
h3 {
background: $mit-red;
background: #666;
padding: 10px 10px 10px 10px;
font-size: 13px;
margin-bottom: 5px;
border-bottom: darken(#8e0000, 10%) 1px solid;
@include box-shadow(0 1px 0 lighten($mit-red, 10%));
border-bottom: darken(#666, 10%) 1px solid;
@include box-shadow(0 1px 0 lighten(#666, 10%));
color: #fff;
font-weight: normal;
@include border-radius(4px 4px 0 0);
......
lms/static/sass/course/discussion/_question-view.scss
......@@ -4,7 +4,7 @@ div.question-header {
@include clearfix();
div.official-stamp {
background: $mit-red;
background: $pink;
color: #fff;
font-size: 12px;
margin-left: -1px;
......@@ -120,7 +120,7 @@ div.question-header {
margin-left: 2.5%;
padding-left: 1.5%;
border-left: 1px dashed #ddd;
color: $mit-red;;
color: $pink;
}
ul, ol, pre {
......@@ -217,13 +217,13 @@ div.question-header {
form.post-comments {
padding: 15px;
button {
color: #fff;
button:first-of-type {
@extend .blue-button;
}
button:last-child {
margin-left: 10px;
@extend .light-button;
float: right;
}
}
......@@ -352,7 +352,7 @@ div.question-header {
}
div.question-status {
background: $mit-red;
background: $pink;
clear:both;
color: #fff;
display: block;
......
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