diff --git a/cms/static/img/logo-edx-studio.png b/cms/static/img/logo-edx-studio.png new file mode 100644 index 0000000000..006194a195 Binary files /dev/null and b/cms/static/img/logo-edx-studio.png differ diff --git a/cms/static/sass/_extends.scss b/cms/static/sass/_extends.scss new file mode 100644 index 0000000000..5907481bd1 --- /dev/null +++ b/cms/static/sass/_extends.scss @@ -0,0 +1,78 @@ +.faded-hr-divider { + @include background-image(linear-gradient(180deg, rgba(200,200,200, 0) 0%, + rgba(200,200,200, 1) 50%, + rgba(200,200,200, 0))); + height: 1px; + width: 100%; +} + +.faded-hr-divider-medium { + @include background-image(linear-gradient(180deg, rgba(240,240,240, 0) 0%, + rgba(240,240,240, 1) 50%, + rgba(240,240,240, 0))); + height: 1px; + width: 100%; +} + +.faded-hr-divider-light { + @include background-image(linear-gradient(180deg, rgba(255,255,255, 0) 0%, + rgba(255,255,255, 0.8) 50%, + rgba(255,255,255, 0))); + height: 1px; + width: 100%; +} + +.faded-vertical-divider { + @include background-image(linear-gradient(90deg, rgba(200,200,200, 0) 0%, + rgba(200,200,200, 1) 50%, + rgba(200,200,200, 0))); + height: 100%; + width: 1px; +} + +.faded-vertical-divider-light { + @include background-image(linear-gradient(90deg, rgba(255,255,255, 0) 0%, + rgba(255,255,255, 0.6) 50%, + rgba(255,255,255, 0))); + height: 100%; + width: 1px; +} + +.vertical-divider { + @extend .faded-vertical-divider; + position: relative; + + &::after { + @extend .faded-vertical-divider-light; + content: ""; + display: block; + position: absolute; + left: 1px; + } +} + +.horizontal-divider { + border: none; + @extend .faded-hr-divider; + position: relative; + + &::after { + @extend .faded-hr-divider-light; + content: ""; + display: block; + position: absolute; + top: 1px; + } +} + +.fade-right-hr-divider { + @include background-image(linear-gradient(180deg, rgba(200,200,200, 0) 0%, + rgba(200,200,200, 1))); + border: none; +} + +.fade-left-hr-divider { + @include background-image(linear-gradient(180deg, rgba(200,200,200, 1) 0%, + rgba(200,200,200, 0))); + border: none; +} \ No newline at end of file diff --git a/cms/static/sass/base-style.scss b/cms/static/sass/base-style.scss index e3463477c1..7fb86bfaaa 100644 --- a/cms/static/sass/base-style.scss +++ b/cms/static/sass/base-style.scss @@ -8,6 +8,7 @@ @import "fonts"; @import "variables"; @import "cms_mixins"; +@import "extends"; @import "base"; @import "header"; @import "dashboard"; diff --git a/cms/templates/base.html b/cms/templates/base.html index 84f10fc2d1..5b25746a0f 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -29,8 +29,8 @@ - + <%static:js group='main'/> <%static:js group='module-js'/> diff --git a/common/static/sass/_mixins.scss b/common/static/sass/_mixins.scss index 58a92d1ee6..375ce20b92 100644 --- a/common/static/sass/_mixins.scss +++ b/common/static/sass/_mixins.scss @@ -7,10 +7,10 @@ @return $body-line-height * $amount; } -@mixin hide-text(){ - text-indent: -9999px; +@mixin hide-text() { + text-indent: -100%; + white-space: nowrap; overflow: hidden; - display: block; } @mixin vertically-and-horizontally-centered ( $height, $width ) {