diff --git a/lms/static/sass/course/base/_base.scss b/lms/static/sass/course/base/_base.scss index 1edb9aa7ba..902c8025fd 100644 --- a/lms/static/sass/course/base/_base.scss +++ b/lms/static/sass/course/base/_base.scss @@ -2,6 +2,7 @@ body { min-width: 980px; min-height: 100%; background: url(../images/bg-texture.png) #d6d6d6; + font-style: normal; } body, h1, h2, h3, h4, h5, h6, p, p a:link, p a:visited, a, label { @@ -39,11 +40,6 @@ a { } } - - - - - form { label { display: block; diff --git a/lms/static/sass/course/layout/_courseware_header.scss b/lms/static/sass/course/layout/_courseware_header.scss index 86b5fe58c5..103139b330 100644 --- a/lms/static/sass/course/layout/_courseware_header.scss +++ b/lms/static/sass/course/layout/_courseware_header.scss @@ -40,7 +40,6 @@ nav.course-material { } &.active { - // background: rgba(0, 0, 0, .2); @include linear-gradient(top, rgba(0, 0, 0, .4), rgba(0, 0, 0, .25)); background-color: transparent; @include box-shadow(0 1px 0 rgba(255, 255, 255, .5), 0 1px 1px rgba(0, 0, 0, .3) inset); diff --git a/lms/static/sass/course/wiki/_wiki.scss b/lms/static/sass/course/wiki/_wiki.scss index 1bc38abd9a..84260e2a86 100644 --- a/lms/static/sass/course/wiki/_wiki.scss +++ b/lms/static/sass/course/wiki/_wiki.scss @@ -397,7 +397,7 @@ section.wiki { #hint_id_content { position: absolute; - top: 10px; + top: 4px; right: 0%; font-size: 12px; text-align:right; diff --git a/lms/static/sass/ie.scss b/lms/static/sass/ie.scss index 35997d95a7..a22d3935fd 100644 --- a/lms/static/sass/ie.scss +++ b/lms/static/sass/ie.scss @@ -130,6 +130,13 @@ header.global { background: #000; } -.modal .inner-wrapper form label { - display: block; +nav.course-material ol.course-tabs li a.active, nav.course-material .xmodule_SequenceModule nav.sequence-nav ol.course-tabs li a.seq_video.active, .xmodule_SequenceModule nav.sequence-nav nav.course-material ol.course-tabs li a.seq_video.active { + background-color: #333; + background-color: rgba(0, 0, 0, .4); } + +header.global ol.user > li.primary a.dropdown { + padding-top: 6px; + padding-bottom: 6px; +} + diff --git a/lms/static/sass/shared/_footer.scss b/lms/static/sass/shared/_footer.scss index d182ed4316..a418b887ad 100644 --- a/lms/static/sass/shared/_footer.scss +++ b/lms/static/sass/shared/_footer.scss @@ -110,6 +110,7 @@ footer { padding: 0; a { + @include inline-block; opacity: 0.3; @include transition(all, 0.1s, linear); diff --git a/lms/static/sass/shared/_modal.scss b/lms/static/sass/shared/_modal.scss index 409c6088ec..b7ea762ce8 100644 --- a/lms/static/sass/shared/_modal.scss +++ b/lms/static/sass/shared/_modal.scss @@ -147,10 +147,9 @@ } label { - display: none; + color: #999; &.field-error { - display: block; color: #8F0E0E; + input { @@ -164,6 +163,14 @@ margin-right: 5px; } + ::-webkit-input-placeholder { + color: #ddd; + } + + :-moz-placeholder { + color: #ddd; + } + textarea { background: rgb(255,255,255); display: block; diff --git a/lms/templates/login_modal.html b/lms/templates/login_modal.html index 8652f457e6..d7d327178c 100644 --- a/lms/templates/login_modal.html +++ b/lms/templates/login_modal.html @@ -10,9 +10,9 @@
- + - +