diff --git a/lms/static/sass/base/_base.scss b/lms/static/sass/base/_base.scss index da16de3c6b..3dfa0b988c 100644 --- a/lms/static/sass/base/_base.scss +++ b/lms/static/sass/base/_base.scss @@ -10,7 +10,6 @@ html, body { font-size: 1em; font-style: normal; line-height: 1em; - //-webkit-font-smoothing: antialiased; } html{ @@ -33,7 +32,6 @@ h1 { letter-spacing: 1px; margin-bottom: ($baseline*1.5); text-align: center; - //text-transform: uppercase; } h2 { @@ -50,14 +48,13 @@ p + h2, ul + h2, ol + h2 { } p { - color: $base-font-color; - font: normal 1em/1.6em $serif; + color: inherit; margin: 0; } span { - font: normal 1em/1.6em $sans-serif; - color: $base-font-color; + font: inherit; + color: inherit; } /* Fix for CodeMirror: prevent top-level span from affecting deeply-embedded span in CodeMirror */ @@ -79,9 +76,10 @@ p + p, ul + p, ol + p { } p { - a:link, a:visited { + a, a:visited { color: $link-color; - font: normal 1em/1em $serif; + font: inherit; + font-weight: inherit; text-decoration: none; @include transition(all 0.1s linear 0s); @@ -92,9 +90,9 @@ p { } } -a:link, a:visited { +a, a:visited { color: $link-color; - font: normal 1em/1em $sans-serif; + font: inherit; text-decoration: none; @include transition(all 0.1s linear 0s); @@ -109,14 +107,6 @@ a:link, a:visited { } } -a:focus { - /** - * Add general focus styling here - * for example: - * outline: 3px groove $black; - **/ -} - .content-wrapper { width: flex-grid(12); margin: 0 auto; diff --git a/lms/static/sass/course/base/_base.scss b/lms/static/sass/course/base/_base.scss index 39106ea598..7aba39d2b6 100644 --- a/lms/static/sass/course/base/_base.scss +++ b/lms/static/sass/course/base/_base.scss @@ -43,7 +43,7 @@ body { //background-image: $course-bg-image; } -body, h1, h2, h3, h4, h5, h6, p, p a:link, p a:visited, a, label { +body, h1, h2, h3, h4, h5, h6, p, label { @include text-align(left); font-family: $sans-serif; } @@ -52,6 +52,10 @@ table { table-layout: fixed; } +.xblock table { + table-layout: auto +} + a { &:hover, &:focus { color: $pink; diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss index 343099af7b..02a28b479b 100644 --- a/lms/static/sass/course/courseware/_courseware.scss +++ b/lms/static/sass/course/courseware/_courseware.scss @@ -105,11 +105,6 @@ div.course-wrapper { p { margin-bottom: lh(); - - &:empty { - display: none; - margin-bottom: 0; - } } .sequential-status-message { diff --git a/lms/static/sass/views/_homepage.scss b/lms/static/sass/views/_homepage.scss index bbaa766fb3..3d5c915d91 100644 --- a/lms/static/sass/views/_homepage.scss +++ b/lms/static/sass/views/_homepage.scss @@ -72,6 +72,11 @@ $learn-more-horizontal-position: calc(50% - 100px); // calculate the left positi .course-info { height: $course-info-height; + font-family: $sans-serif; + + h2 { + font-family: $sans-serif; + } .course-organization, .course-code, .course-date { @extend %t-icon6;