Skip to content

E
edx-platform
Commit a391676c by kimth
Options

Merge branch 'master' into kimth/remember-caption

parents 65507c08 06b9f0c5
Showing with 1 additions and 1 deletions
common/lib/xmodule/xmodule/css/sequence/display.scss
...@@ -297,7 +297,6 @@ nav.sequence-bottom { ...@@ -297,7 +297,6 @@ nav.sequence-bottom {
ul { ul {
@extend .clearfix; @extend .clearfix;
@include inline-block(); @include inline-block();
width: 103px;
li { li {
float: left; float: left;
......
lms/static/sass/base/_base.scss
...@@ -43,6 +43,7 @@ p { ...@@ -43,6 +43,7 @@ p {
span { span {
font: normal 1em/1.6em $sans-serif; font: normal 1em/1.6em $sans-serif;
color: $base-font-color;
} }
/* Fix for CodeMirror: prevent top-level span from affecting deeply-embedded span in CodeMirror */ /* Fix for CodeMirror: prevent top-level span from affecting deeply-embedded span in CodeMirror */
.CodeMirror span { .CodeMirror span {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment