diff --git a/static/css/application.css b/static/css/application.css index c555a685f4b20fc63032fb84291993a18914d309..97f7567ad8e7726ff7180a996f963c2709037c6d 100644 --- a/static/css/application.css +++ b/static/css/application.css @@ -134,7 +134,7 @@ input, select { display: table; width: 100%; } -h1.top-header, div.info-wrapper section.updates > h1, div.profile-wrapper section.course-info header, div.gradebook-wrapper section.gradebook-content h1, div.question-list-header { +h1.top-header, div.course-wrapper section.course-content ol.vert-mod > li header, div.info-wrapper section.updates > h1, div.profile-wrapper section.course-info header, div.gradebook-wrapper section.gradebook-content h1, div.question-list-header { background: #f3f3f3; border-bottom: 1px solid #e3e3e3; margin: -22.652px -22.652px 22.652px; @@ -2659,6 +2659,8 @@ body.courseware { div.course-wrapper ul, div.course-wrapper ol { list-style: none; } +div.course-wrapper section.course-content { + overflow: hidden; } div.course-wrapper section.course-content h1 { margin: 0 0 22.652px; } div.course-wrapper section.course-content p { @@ -2774,6 +2776,16 @@ div.course-wrapper section.course-content ol.vert-mod > li { border-bottom: 1px solid #ddd; margin-bottom: 15px; padding: 0 0 15px; } +div.course-wrapper section.course-content ol.vert-mod > li header { + margin-bottom: 0; } +div.course-wrapper section.course-content ol.vert-mod > li header h1 { + margin: 0; } +div.course-wrapper section.course-content ol.vert-mod > li header h2 { + float: right; + margin-right: 0; + margin-top: 8px; + text-align: right; + padding-right: 0; } div.course-wrapper section.course-content ol.vert-mod > li:last-child { border-bottom: none; margin-bottom: 0; @@ -3499,9 +3511,11 @@ nav.sequence-nav { -moz-box-sizing: border-box; box-sizing: border-box; margin-bottom: 22.652px; - position: relative; } + position: relative; + top: -1px; } nav.sequence-nav ol { border-bottom: 1px solid #e4d080; + border-top: 1px solid #e4d080; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; diff --git a/templates/sass/courseware/_courseware.scss b/templates/sass/courseware/_courseware.scss index 2223556854704c400dc3bcbc8e567a15d6299806..8084077247b0292dd943d44bc6ea01e72f7518c3 100644 --- a/templates/sass/courseware/_courseware.scss +++ b/templates/sass/courseware/_courseware.scss @@ -17,6 +17,7 @@ div.course-wrapper { section.course-content { @extend .content; + overflow: hidden; h1 { margin: 0 0 lh(); @@ -169,6 +170,23 @@ div.course-wrapper { margin-bottom: 15px; padding: 0 0 15px; + header { + @extend h1.top-header; + margin-bottom: 0; + + h1 { + margin: 0; + } + + h2 { + float: right; + margin-right: 0; + margin-top: 8px; + text-align: right; + padding-right: 0; + } + } + &:last-child { border-bottom: none; margin-bottom: 0; diff --git a/templates/sass/courseware/_sequence-nav.scss b/templates/sass/courseware/_sequence-nav.scss index b4de05132602f889fb474f54f740581ab54d1287..77df7e774b9c79f1257f9806e9ad3be27d9b098e 100644 --- a/templates/sass/courseware/_sequence-nav.scss +++ b/templates/sass/courseware/_sequence-nav.scss @@ -3,9 +3,11 @@ nav.sequence-nav { @include box-sizing(border-box); margin-bottom: $body-line-height; position: relative; + top: -1px; ol { border-bottom: 1px solid darken($cream, 20%); + border-top: 1px solid darken($cream, 20%); @include box-sizing(border-box); display: table; padding-right: flex-grid(1, 9);