diff --git a/lms/static/sass/course/base/_base.scss b/lms/static/sass/course/base/_base.scss index 902c8025fd..1edb9aa7ba 100644 --- a/lms/static/sass/course/base/_base.scss +++ b/lms/static/sass/course/base/_base.scss @@ -2,7 +2,6 @@ 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 { @@ -40,6 +39,11 @@ 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 103139b330..86b5fe58c5 100644 --- a/lms/static/sass/course/layout/_courseware_header.scss +++ b/lms/static/sass/course/layout/_courseware_header.scss @@ -40,6 +40,7 @@ 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 84260e2a86..1bc38abd9a 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: 4px; + top: 10px; right: 0%; font-size: 12px; text-align:right; diff --git a/lms/static/sass/ie.scss b/lms/static/sass/ie.scss index a22d3935fd..35997d95a7 100644 --- a/lms/static/sass/ie.scss +++ b/lms/static/sass/ie.scss @@ -130,13 +130,6 @@ header.global { background: #000; } -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); +.modal .inner-wrapper form label { + display: block; } - -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 a418b887ad..d182ed4316 100644 --- a/lms/static/sass/shared/_footer.scss +++ b/lms/static/sass/shared/_footer.scss @@ -110,7 +110,6 @@ 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 b7ea762ce8..409c6088ec 100644 --- a/lms/static/sass/shared/_modal.scss +++ b/lms/static/sass/shared/_modal.scss @@ -147,9 +147,10 @@ } label { - color: #999; + display: none; &.field-error { + display: block; color: #8F0E0E; + input { @@ -163,14 +164,6 @@ 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 d7d327178c..8652f457e6 100644 --- a/lms/templates/login_modal.html +++ b/lms/templates/login_modal.html @@ -10,9 +10,9 @@