diff --git a/common/lib/xmodule/xmodule/css/sequence/display.scss b/common/lib/xmodule/xmodule/css/sequence/display.scss index 6e7c5d24a7..97a8e0e4b3 100644 --- a/common/lib/xmodule/xmodule/css/sequence/display.scss +++ b/common/lib/xmodule/xmodule/css/sequence/display.scss @@ -3,9 +3,9 @@ nav.sequence-nav { // import from external sources. @extend .topbar; border-bottom: 1px solid $border-color; + @include border-top-right-radius(4px); margin: (-(lh())) (-(lh())) lh() (-(lh())); position: relative; - @include border-top-right-radius(4px); ol { @include box-sizing(border-box); @@ -242,9 +242,11 @@ nav.sequence-bottom { border: 1px solid $border-color; @include border-radius(3px); @include inline-block(); + width: 100px; li { float: left; + width: 50%; &.prev, &.next { margin-bottom: 0; @@ -252,12 +254,11 @@ nav.sequence-bottom { a { background-position: center center; background-repeat: no-repeat; - border-bottom: none; + border: none; display: block; padding: lh(.5) 4px; text-indent: -9999px; @include transition(all, .2s, $ease-in-out-quad); - width: 45px; &:hover { background-color: #ddd; @@ -275,7 +276,7 @@ nav.sequence-bottom { &.prev { a { background-image: url('../images/sequence-nav/previous-icon.png'); - border-right: 1px solid lighten($border-color, 10%); + border-right: 1px solid lighten(#c6c6c6, 10%); &:hover { background-color: none; diff --git a/common/lib/xmodule/xmodule/css/video/display.scss b/common/lib/xmodule/xmodule/css/video/display.scss index bb69c30abb..235e2e3277 100644 --- a/common/lib/xmodule/xmodule/css/video/display.scss +++ b/common/lib/xmodule/xmodule/css/video/display.scss @@ -16,7 +16,6 @@ div.video { height: 0; overflow: hidden; padding-bottom: 56.25%; - padding-top: 30px; position: relative; object, iframe { @@ -463,7 +462,8 @@ div.video { } ol.subtitles { - width: 0px; + width: 0; + height: 0; } } diff --git a/common/static/images/sequence-nav/document-icon-current.png b/common/static/images/sequence-nav/document-icon-current.png index f82f38ed59..4eeedd8f76 100644 Binary files a/common/static/images/sequence-nav/document-icon-current.png and b/common/static/images/sequence-nav/document-icon-current.png differ diff --git a/common/static/images/sequence-nav/document-icon-normal.png b/common/static/images/sequence-nav/document-icon-normal.png index 41c7e3af93..d508136647 100644 Binary files a/common/static/images/sequence-nav/document-icon-normal.png and b/common/static/images/sequence-nav/document-icon-normal.png differ diff --git a/common/static/images/sequence-nav/document-icon-visited.png b/common/static/images/sequence-nav/document-icon-visited.png index df8ff0fa7e..c0a1c7d099 100644 Binary files a/common/static/images/sequence-nav/document-icon-visited.png and b/common/static/images/sequence-nav/document-icon-visited.png differ diff --git a/common/static/images/sequence-nav/edit.png b/common/static/images/sequence-nav/edit.png index 6d7f0632c3..f7f5d3d944 100644 Binary files a/common/static/images/sequence-nav/edit.png and b/common/static/images/sequence-nav/edit.png differ diff --git a/common/static/images/sequence-nav/history.png b/common/static/images/sequence-nav/history.png index a65c4398d9..c063fa2240 100644 Binary files a/common/static/images/sequence-nav/history.png and b/common/static/images/sequence-nav/history.png differ diff --git a/common/static/images/sequence-nav/list-icon-current.png b/common/static/images/sequence-nav/list-icon-current.png index be95f52ac5..602f0da61b 100644 Binary files a/common/static/images/sequence-nav/list-icon-current.png and b/common/static/images/sequence-nav/list-icon-current.png differ diff --git a/common/static/images/sequence-nav/list-icon-normal.png b/common/static/images/sequence-nav/list-icon-normal.png index 42c473e82b..09867e09c8 100644 Binary files a/common/static/images/sequence-nav/list-icon-normal.png and b/common/static/images/sequence-nav/list-icon-normal.png differ diff --git a/common/static/images/sequence-nav/list-icon-visited.png b/common/static/images/sequence-nav/list-icon-visited.png index ab911cfa8b..dca52dd3cc 100644 Binary files a/common/static/images/sequence-nav/list-icon-visited.png and b/common/static/images/sequence-nav/list-icon-visited.png differ diff --git a/common/static/images/sequence-nav/next-icon.png b/common/static/images/sequence-nav/next-icon.png index 135d4fa715..ece431dcb8 100644 Binary files a/common/static/images/sequence-nav/next-icon.png and b/common/static/images/sequence-nav/next-icon.png differ diff --git a/common/static/images/sequence-nav/other-icon.png b/common/static/images/sequence-nav/other-icon.png index 822a415972..01c0bab93c 100644 Binary files a/common/static/images/sequence-nav/other-icon.png and b/common/static/images/sequence-nav/other-icon.png differ diff --git a/common/static/images/sequence-nav/previous-icon.png b/common/static/images/sequence-nav/previous-icon.png index 004a69ac4a..3b995df1f0 100644 Binary files a/common/static/images/sequence-nav/previous-icon.png and b/common/static/images/sequence-nav/previous-icon.png differ diff --git a/common/static/images/sequence-nav/problem-icon-alt.png b/common/static/images/sequence-nav/problem-icon-alt.png index c276ba223f..364e041bad 100644 Binary files a/common/static/images/sequence-nav/problem-icon-alt.png and b/common/static/images/sequence-nav/problem-icon-alt.png differ diff --git a/common/static/images/sequence-nav/vertical-icon.png b/common/static/images/sequence-nav/vertical-icon.png index be17eab195..064c6ba046 100644 Binary files a/common/static/images/sequence-nav/vertical-icon.png and b/common/static/images/sequence-nav/vertical-icon.png differ diff --git a/common/static/images/sequence-nav/video-icon-current.png b/common/static/images/sequence-nav/video-icon-current.png index 8bbc910f61..a7a787ee8b 100644 Binary files a/common/static/images/sequence-nav/video-icon-current.png and b/common/static/images/sequence-nav/video-icon-current.png differ diff --git a/common/static/images/sequence-nav/video-icon-normal.png b/common/static/images/sequence-nav/video-icon-normal.png index 52321ebf7b..df907e83a0 100644 Binary files a/common/static/images/sequence-nav/video-icon-normal.png and b/common/static/images/sequence-nav/video-icon-normal.png differ diff --git a/common/static/images/sequence-nav/video-icon-visited.png b/common/static/images/sequence-nav/video-icon-visited.png index b980c5b73e..49ab808567 100644 Binary files a/common/static/images/sequence-nav/video-icon-visited.png and b/common/static/images/sequence-nav/video-icon-visited.png differ diff --git a/common/static/images/sequence-nav/video-icon.png b/common/static/images/sequence-nav/video-icon.png index afb0ad86af..715a38eb96 100644 Binary files a/common/static/images/sequence-nav/video-icon.png and b/common/static/images/sequence-nav/video-icon.png differ diff --git a/common/static/images/sequence-nav/view.png b/common/static/images/sequence-nav/view.png index 8905b519a2..bc85d47c23 100644 Binary files a/common/static/images/sequence-nav/view.png and b/common/static/images/sequence-nav/view.png differ diff --git a/lms/static/images/ui-icons_222222_256x240.png b/lms/static/images/ui-icons_222222_256x240.png new file mode 100755 index 0000000000..b273ff111d Binary files /dev/null and b/lms/static/images/ui-icons_222222_256x240.png differ diff --git a/lms/static/sass/course/_info.scss b/lms/static/sass/course/_info.scss index 6b217f2285..1dac5354b6 100644 --- a/lms/static/sass/course/_info.scss +++ b/lms/static/sass/course/_info.scss @@ -80,38 +80,54 @@ div.info-wrapper { } ol { - background: none; - list-style: none; - padding-left: 0; - margin: 0; - li { - @extend .clearfix; - background: none; - border-bottom: 1px solid $border-color; - @include box-sizing(border-box); - padding: em(7) lh(.75); - position: relative; - font-size: 1em; + a { + display: block; + padding-left: lh(.5); + padding-right: 0; + } &.expandable, &.collapsable { h4 { font-weight: normal; font-size: 1em; - padding-left: 18px; + padding: lh(.25) 0 lh(.25) lh(1.5); + } + } + + &.multiple { + padding: lh(.5) 0 lh(.5) lh(.5); + + a { + @include inline-block; + padding: 0; + + &:hover { + background: transparent; + } } } ul { background: none; - margin: em(7) (-(lh(.75))) 0; + margin: 0; li { border-bottom: 0; border-top: 1px solid $border-color; @include box-shadow(inset 0 1px 0 #eee); font-size: 1em; + padding: lh(.5) 0 lh(.5) lh(.5); + + a { + @include inline-block; + padding: 0; + + &:hover { + background: transparent; + } + } } } @@ -119,23 +135,26 @@ div.info-wrapper { background-image: url('../images/treeview-default.gif'); display: block; height: 100%; - left: lh(.75); margin-left: 0; - max-height: 20px; + max-height: 30px; position: absolute; width: 100%; &:hover { opacity: 0.6; filter: alpha(opacity=60); + + + h4 { + background-color: #e3e3e3; + } } &.expandable-hitarea { - background-position: -80px 1px; + background-position: -72px 7px; } &.collapsable-hitarea { - background-position: -64px -21px; + background-position: -55px -15px; } } @@ -170,11 +189,6 @@ div.info-wrapper { } } } - - a { - @include inline-block(); - line-height: lh(); - } } } } diff --git a/lms/static/sass/course/_textbook.scss b/lms/static/sass/course/_textbook.scss index 249dadf29b..50986f5dd5 100644 --- a/lms/static/sass/course/_textbook.scss +++ b/lms/static/sass/course/_textbook.scss @@ -7,19 +7,20 @@ div.book-wrapper { @include box-sizing(border-box); ul#booknav { - font-size: $body-font-size; - - a { - color: #000; - - &:hover { - color: #666; - } - } + font-size: em(14); li { background: none; - padding-left: 30px; + border-bottom: 0; + padding-left: lh(); + + a { + padding: 0; + + &:hover { + background-color: transparent; + } + } div.hitarea { background-image: url('../images/treeview-default.gif'); @@ -35,6 +36,13 @@ div.book-wrapper { ul { background: none; + margin-top: lh(.25); + border-top: 1px solid $border-color; + padding-top: lh(.25); + + li { + padding-bottom: lh(.25); + } } } @@ -47,8 +55,8 @@ div.book-wrapper { section.book { @extend .content; - padding-right: 0; padding-bottom: 0; + padding-right: 0; padding-top: 0; nav { @@ -68,28 +76,22 @@ div.book-wrapper { width: flex-grid(2, 8); a { - display: table; - @include box-sizing(border-box); - height: 100%; - width: 100%; - vertical-align: middle; - @include transition; background-color: rgba(#000, .7); - background-repeat: no-repeat; background-position: center; + background-repeat: no-repeat; + @include box-sizing(border-box); + display: table; + height: 100%; opacity: 0; filter: alpha(opacity=0); text-indent: -9999px; + @include transition; + vertical-align: middle; + width: 100%; &:hover { opacity: 1; filter: alpha(opacity=100); - - &.last { - } - - &.next { - } } } @@ -120,9 +122,9 @@ div.book-wrapper { } section.page { - text-align: center; - position: relative; border: 1px solid $border-color; + position: relative; + text-align: center; img { max-width: 100%; diff --git a/lms/static/sass/course/base/_base.scss b/lms/static/sass/course/base/_base.scss index d530eb74d4..8d952b5040 100644 --- a/lms/static/sass/course/base/_base.scss +++ b/lms/static/sass/course/base/_base.scss @@ -21,3 +21,8 @@ form { display: block; } } + +::selection, ::-moz-selection, ::-webkit-selection { + background:#444; + color:#fff; +} diff --git a/lms/static/sass/course/base/_extends.scss b/lms/static/sass/course/base/_extends.scss index a0d417f388..72e2f56bbb 100644 --- a/lms/static/sass/course/base/_extends.scss +++ b/lms/static/sass/course/base/_extends.scss @@ -59,7 +59,7 @@ h1.top-header { width: flex-grid(3); h1, h2 { - font-size: em(18); + font-size: em(20); font-weight: 100; letter-spacing: 0; text-transform: none; @@ -88,22 +88,16 @@ h1.top-header { font-weight: normal; margin: 0; overflow: hidden; + font-size: 1em; a { - color: lighten($text-color, 10%); display: block; - font-size: $body-font-size; - padding: 7px 7px 7px 30px; text-decoration: none; @include transition(); } - // span.ui-icon { - // background-image: url(../images/ui-icons_454545_256x240.png); - // } - &.active { - border-bottom: 1px solid #d3d3d3; + @extend .bottom-border; color: #000; font-weight: bold; @@ -113,6 +107,33 @@ h1.top-header { } } + ul, ol { + list-style: none; + margin: 0; + padding-left: 0; + + li { + @extend .bottom-border; + @extend .clearfix; + background: none; + position: relative; + padding: 0; + + a { + display: block; + line-height: lh(); + font-size: 1em; + @include box-sizing(border-box); + padding: lh(.25) lh(.5) lh(.25) 0; + + &:hover { + color: #666; + background: #f6f6f6; + } + } + } + } + header#open_close_accordion { position: relative; diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss index f6c9dceb8e..fa3e844e88 100644 --- a/lms/static/sass/course/courseware/_courseware.scss +++ b/lms/static/sass/course/courseware/_courseware.scss @@ -105,12 +105,14 @@ div.course-wrapper { ul { margin: 0; @include clearfix(); + padding: 0; li { width: flex-grid(3, 9); float: left; margin-right: flex-gutter(9); margin-bottom: lh(); + line-height: lh(); &:nth-child(3n) { margin-right: 0; diff --git a/lms/static/sass/course/courseware/_sidebar.scss b/lms/static/sass/course/courseware/_sidebar.scss index fe9f54d0e3..7f24659533 100644 --- a/lms/static/sass/course/courseware/_sidebar.scss +++ b/lms/static/sass/course/courseware/_sidebar.scss @@ -11,10 +11,10 @@ section.course-index { } div#accordion { - h3 { @include border-radius(0); border-top: 1px solid #e3e3e3; + font-size: em(16, 18); margin: 0; overflow: hidden; @@ -23,8 +23,14 @@ section.course-index { } &:hover { + color: #666; background: #f6f6f6; - text-decoration: none; + } + + &.ui-state-hover { + a { + color: #666; + } } &.ui-accordion-header { @@ -33,8 +39,6 @@ section.course-index { a { @include border-radius(0); @include box-shadow(none); - color: lighten($text-color, 10%); - font-size: $body-font-size; } &.ui-state-active { @@ -45,30 +49,35 @@ section.course-index { background: none; } } + + span.ui-icon { + background-image: url("/static/images/ui-icons_222222_256x240.png"); + opacity: .3; + } } } ul.ui-accordion-content { - @include border-radius(0); background: transparent; border: none; - font-size: 12px; + @include border-radius(0); + font-size: em(14, 18); margin: 0; padding: 1em 1.5em; li { + border-bottom: 0; @include border-radius(0); margin-bottom: lh(.5); a { - border: 1px solid transparent; background: transparent; + border: 1px solid transparent; @include border-radius(4px); - position: relative; - padding: 5px 36px 5px 10px; - text-decoration: none; display: block; - color: #666; + padding: 5px 36px 5px 10px; + position: relative; + text-decoration: none; p { font-weight: bold; @@ -84,16 +93,16 @@ section.course-index { &:after { background: transparent; - border-top: 1px solid rgb(180,180,180); border-right: 1px solid rgb(180,180,180); + border-top: 1px solid rgb(180,180,180); content: ""; display: block; height: 12px; margin-top: -6px; opacity: 0; position: absolute; - top: 50%; right: 30px; + top: 50%; @include transform(rotate(45deg)); width: 12px; } @@ -142,7 +151,6 @@ section.course-index { span.subtitle { font-weight: normal; } - } } } diff --git a/lms/static/sass/course/wiki/_sidebar.scss b/lms/static/sass/course/wiki/_sidebar.scss index ccaed19a17..8c9f97d27d 100644 --- a/lms/static/sass/course/wiki/_sidebar.scss +++ b/lms/static/sass/course/wiki/_sidebar.scss @@ -2,20 +2,8 @@ div#wiki_panel { @extend .sidebar; overflow: auto; - h2 { - @extend .bottom-border; - margin: 0 ; - padding: lh(.5) lh() lh(.5) 0; - color: #000; - } - ul { - padding-left: 0; - margin: 0; - li { - @extend .bottom-border; - &.search { padding: 10px lh() 10px 0; @@ -23,25 +11,14 @@ div#wiki_panel { display: none; } } - - a { - color: #666; - font-size: 14px; - padding: 7px lh() 7px 0; - - &:hover { - background: #efefef; - } - - } } + } - form { - input[type="submit"]{ - @extend .light-button; - text-transform: none; - text-shadow: none; - } + form { + input[type="submit"]{ + @extend .light-button; + text-transform: none; + text-shadow: none; } }