diff --git a/cms/static/sass/_mixins.scss b/cms/static/sass/_mixins.scss new file mode 120000 index 0000000000..0c1b1f5b81 --- /dev/null +++ b/cms/static/sass/_mixins.scss @@ -0,0 +1 @@ +../../../common/static/sass/_mixins.scss \ No newline at end of file diff --git a/cms/static/sass/base-style.scss b/cms/static/sass/base-style.scss index 86ac2c9370..b2a880d614 100644 --- a/cms/static/sass/base-style.scss +++ b/cms/static/sass/base-style.scss @@ -3,6 +3,7 @@ @import 'keyframes'; @import 'reset'; +@import 'mixins'; @import 'base', 'layout', 'content-types'; @import 'calendar'; @import 'section', 'unit', 'index'; diff --git a/common/lib/xmodule/xmodule/css/video/display.scss b/common/lib/xmodule/xmodule/css/video/display.scss index 57461deabf..2f58ae6d6e 100644 --- a/common/lib/xmodule/xmodule/css/video/display.scss +++ b/common/lib/xmodule/xmodule/css/video/display.scss @@ -5,6 +5,7 @@ div.video { margin: 0 -12px; padding: 12px; border-radius: 5px; + font-size: 16px; article.video-wrapper { float: left; diff --git a/common/static/sass/_mixins.scss b/common/static/sass/_mixins.scss new file mode 100644 index 0000000000..58a92d1ee6 --- /dev/null +++ b/common/static/sass/_mixins.scss @@ -0,0 +1,24 @@ +@function em($pxval, $base: 16) { + @return #{$pxval / $base}em; +} + +// Line-height +@function lh($amount: 1) { + @return $body-line-height * $amount; +} + +@mixin hide-text(){ + text-indent: -9999px; + overflow: hidden; + display: block; +} + +@mixin vertically-and-horizontally-centered ( $height, $width ) { + left: 50%; + margin-left: -$width / 2; + //margin-top: -$height / 2; + min-height: $height; + min-width: $width; + position: absolute; + top: 150px; +} diff --git a/lms/static/sass/base/_mixins.scss b/lms/static/sass/base/_mixins.scss deleted file mode 100644 index 58a92d1ee6..0000000000 --- a/lms/static/sass/base/_mixins.scss +++ /dev/null @@ -1,24 +0,0 @@ -@function em($pxval, $base: 16) { - @return #{$pxval / $base}em; -} - -// Line-height -@function lh($amount: 1) { - @return $body-line-height * $amount; -} - -@mixin hide-text(){ - text-indent: -9999px; - overflow: hidden; - display: block; -} - -@mixin vertically-and-horizontally-centered ( $height, $width ) { - left: 50%; - margin-left: -$width / 2; - //margin-top: -$height / 2; - min-height: $height; - min-width: $width; - position: absolute; - top: 150px; -} diff --git a/lms/static/sass/base/_mixins.scss b/lms/static/sass/base/_mixins.scss new file mode 120000 index 0000000000..61597bb5eb --- /dev/null +++ b/lms/static/sass/base/_mixins.scss @@ -0,0 +1 @@ +../../../../common/static/sass/_mixins.scss \ No newline at end of file