Skip to content

E
edx-platform
Commit ee368e87 by Brian Talbot Committed by David Baumgold
Options

Studio: cleaning up/removing unused sass 

* removing unused font-family-centric Sass variables
* removing unused graphic images and Sass references
* clean up of style removal fallout
parent 8b73de91
Showing with 34 additions and 619 deletions
cms/static/sass/_base.scss
......@@ -569,11 +569,6 @@ hr.divide {
}
.window {
// border-radius: 3px;
// box-shadow: 0 1px 1px $shadow-l1;
// margin-bottom: $baseline;
// border: 1px solid $gray-l2;
// background: $white;
.window-contents {
padding: 20px;
......@@ -615,162 +610,6 @@ hr.divide {
}
}
// ====================
// system notifications
.toast-notification {
@include transition(all $tmg-f2 linear 0s);
@include linear-gradient(top, rgba(255, 255, 255, .1), rgba(255, 255, 255, 0));
@extend %t-copy-sub1;
display: none;
position: fixed;
top: 20px;
right: 20px;
z-index: 99999;
max-width: 350px;
padding: 15px 20px 17px;
border-radius: 3px;
border: 1px solid #333;
background-color: rgba(30, 30, 30, .92);
box-shadow: 0 1px 3px rgba(0, 0, 0, .3), 0 1px 0 rgba(255, 255, 255, .1) inset;
text-align: center;
color: #fff;
p, span {
color: #fff;
}
strong {
@extend %t-copy-base;
@extend %t-strong;
display: block;
margin-bottom: 10px;
text-align: center;
}
.close-button {
@extend %t-action1;
@extend %t-strong;
position: absolute;
top: 0;
right: 0;
width: 27px;
height: 27px;
line-height: 25px;
color: #aaa;
text-align: center;
.close-icon {
@extend %t-action2;
@extend %t-strong;
}
}
.action-button {
@include blue-button;
@include box-sizing(border-box);
@extend %t-action4;
width: 100%;
margin-top: 10px;
text-align: center;
}
}
.waiting {
position: relative;
&:before {
content: '';
display: block;
position: absolute;
top: 0;
left: 0;
z-index: 999998;
width: 100%;
height: 100%;
border-radius: inherit;
background: rgba(255, 255, 255, .9);
}
&:after {
@extend .spinner-icon;
content: '';
display: block;
position: absolute;
top: 50%;
left: 50%;
margin-left: -10px;
margin-top: -10px;
z-index: 999999;
}
}
.waiting-inline {
&:after {
content: '';
@extend .spinner-icon;
}
}
.new-button {
@include green-button;
@extend %t-action4;
padding: 8px 20px 10px;
text-align: center;
&.big {
display: block;
}
.icon-plus {
margin-top: -2px;
line-height: 0;
}
}
.view-button {
@include blue-button;
@extend %t-action4;
text-align: center;
&.big {
display: block;
}
.icon-eye-open {
@extend %t-action2;
display: inline-block;
vertical-align: middle;
margin-right: 8px;
margin-top: -3px;
line-height: 0;
}
}
.edit-button.standard,
.delete-button.standard,
.duplicate-button.standard {
@include white-button;
@extend %t-regular;
@extend %t-action4;
float: left;
padding: 3px 10px 4px;
margin-left: 7px;
.edit-icon,
.delete-icon,
.duplicate-icon{
margin-right: 4px;
}
}
.delete-button.standard {
&:hover {
background-color: tint($orange, 75%);
}
}
.tooltip {
@include transition(opacity $tmg-f3 ease-out 0s);
@include font-size(12);
......@@ -818,19 +657,6 @@ hr.divide {
@extend %ui-disabled;
}
.non-list {
list-style: none;
margin: 0;
padding: 0;
}
.wrap {
text-wrap: wrap;
white-space: pre-wrap;
white-space: -moz-pre-wrap;
word-wrap: break-word;
}
// ui - semantic + visual divider
hr.divider {
@extend %cont-text-sr;
......@@ -922,13 +748,3 @@ body.js {
}
}
}
// ====================
// works in progress & testing
body.hide-wip {
.wip-box {
display: none;
}
}
cms/static/sass/_variables.scss
......@@ -15,9 +15,7 @@ $fg-min-width: 900px;
// ====================
// fonts
$f-serif: 'Bree Serif', Georgia, Cambria, 'Times New Roman', Times, serif;
$f-sans-serif: 'Open Sans','Helvetica Neue', Helvetica, Arial, sans-serif;
$f-decorative: '';
$f-monospace: 'Bitstream Vera Sans Mono', Consolas, Courier, monospace;
// ====================
......@@ -230,6 +228,3 @@ $body-line-height: golden-ratio(.875em, 1);
// carried over from LMS for xmodules
$action-primary-active-bg: #1AA1DE; // $m-blue
$very-light-text: #fff;
cms/static/sass/assets/_content-types.scss deleted 100644 → 0
%content-type {
display: inline-block;
width: 14px;
height: 16px;
padding-left: 14px;
background-position: 8px center;
background-repeat: no-repeat;
vertical-align: middle;
}
.videosequence-icon {
@extend %content-type;
background-image: url('../img/content-types/videosequence.png');
}
.video-icon {
@extend %content-type;
background-image: url('../img/content-types/video.png');
}
.problemset-icon {
@extend %content-type;
background-image: url('../img/content-types/problemset.png');
}
.problem-icon {
@extend %content-type;
background-image: url('../img/content-types/problem.png');
}
.lab-icon {
@extend %content-type;
background-image: url('../img/content-types/lab.png');
}
.tab-icon {
@extend %content-type;
background-image: url('../img/content-types/lab.png');
}
.html-icon {
@extend %content-type;
background-image: url('../img/content-types/html.png');
}
.vertical-icon {
@extend %content-type;
background-image: url('../img/content-types/vertical.png');
}
.sequential-icon {
@extend %content-type;
background-image: url('../img/content-types/sequential.png');
}
.chapter-icon {
@extend %content-type;
background-image: url('../img/content-types/chapter.png');
}
.module-icon {
@extend %content-type;
background-image: url('../img/content-types/module.png');
}
.module-icon {
@extend %content-type;
background-image: url('../img/content-types/module.png');
}
cms/static/sass/assets/_graphics.scss
.expand-collapse-icon {
@include transition(none);
position: relative;
display: inline-block;
width: 9px;
height: 11px;
margin-right: 10px;
background: url(../img/expand-collapse-icons.png) no-repeat;
&.expand {
top: 1px;
background-position: 0 0;
}
&.collapse {
top: -1px;
background-position: 0 -11px;
}
}
.sequence-icon {
display: inline-block;
width: 15px;
height: 9px;
margin-right: 5px;
background: url(../img/sequence-icon.png) no-repeat;
}
.video-icon {
display: inline-block;
width: 14px;
height: 12px;
margin-right: 5px;
background: url(../img/video-icon.png) no-repeat;
}
.upload-icon {
display: inline-block;
width: 22px;
height: 13px;
margin-right: 5px;
background: url(../img/upload-icon.png) no-repeat;
}
.list-icon {
display: inline-block;
width: 14px;
height: 10px;
margin-right: 5px;
background: url(../img/list-icon.png) no-repeat;
}
.close-icon {
display: inline-block;
width: 13px;
height: 12px;
background: url(../img/close-icon.png) no-repeat;
}
.home-icon {
display: inline-block;
width: 19px;
height: 16px;
background: url(../img/home-icon.png) no-repeat;
}
.small-home-icon {
display: inline-block;
width: 16px;
height: 14px;
background: url(../img/small-home-icon.png) no-repeat;
}
.log-out-icon {
display: inline-block;
width: 15px;
height: 13px;
background: url(../img/log-out-icon.png) no-repeat;
}
.collapse-all-icon {
display: inline-block;
width: 15px;
height: 9px;
background: url(../img/collapse-all-icon.png) no-repeat;
}
.calendar-icon {
display: inline-block;
width: 12px;
height: 11px;
margin-right: 5px;
background: url(../img/calendar-icon.png) no-repeat;
}
.edit-icon {
display: inline-block;
width: 12px;
height: 12px;
margin-right: 2px;
background: url(../img/edit-icon.png) no-repeat;
&.white {
background: url(../img/edit-icon-white.png) no-repeat;
}
}
.duplicate-icon {
display: inline-block;
width: 12px;
height: 12px;
margin-right: 2px;
}
.visibility-toggle {
.toggle-icon {
display: inline-block;
width: 27px;
height: 20px;
background: url(../img/small-toggle-icons.png) no-repeat;
background-position: 0 -34px;
}
&.hidden .toggle-icon {
background-position: 0 -4px;
}
&.both .toggle-icon {
background-position: 0 -64px;
}
}
.delete-icon {
display: inline-block;
width: 10px;
height: 11px;
margin-right: 2px;
background: url(../img/delete-icon.png) no-repeat;
&.white {
background: url(../img/delete-icon-white.png) no-repeat;
}
}
.drag-handle {
display: inline-block;
float: right;
......@@ -153,98 +8,6 @@
cursor: move;
}
.draft-tag,
.public-tag,
.private-tag {
@extend %t-action5;
@extend %t-strong;
margin-left: 3px;
text-transform: uppercase;
color: #a4aab7;
}
.draft-tag {
color: #9f7d10;
}
.plus-icon {
display: inline-block;
width: 11px;
height: 11px;
margin-right: 8px;
background: url(../img/plus-icon.png) no-repeat;
&.white {
background: url(../img/plus-icon-white.png) no-repeat;
}
}
.plus-icon-small {
display: inline-block;
width: 6px;
height: 6px;
margin-right: 8px;
background: url(../img/plus-icon-small.png) no-repeat center;
}
.folder-icon {
display: inline-block;
width: 15px;
height: 11px;
margin-right: 4px;
background: url(../img/folder-icon.png) no-repeat;
}
.new-folder-icon {
display: inline-block;
width: 23px;
height: 11px;
margin-right: 8px;
background: url(../img/new-folder-icon.png) no-repeat;
}
.file-icon {
display: inline-block;
width: 10px;
height: 11px;
margin-right: 8px;
background: url(../img/file-icon.png) no-repeat;
}
.new-unit-icon {
display: inline-block;
width: 23px;
height: 12px;
margin-right: 8px;
background: url(../img/new-unit-icon.png) right no-repeat;
}
.new-policy-icon {
display: inline-block;
width: 23px;
height: 12px;
margin-right: 8px;
background: url(../img/new-unit-icon.png) right no-repeat;
}
.textbook-icon {
display: inline-block;
width: 32px;
height: 32px;
margin-right: 8px;
vertical-align: middle;
background: url(../img/textbook-icon.png) no-repeat;
}
.slides-icon {
display: inline-block;
width: 32px;
height: 32px;
margin-right: 8px;
vertical-align: middle;
background: url(../img/slides-icon.png) no-repeat;
}
.large-slide-icon {
display: inline-block;
width: 100px;
......@@ -324,20 +87,3 @@
margin-right: 5px;
background: url(../img/large-video-icon.png) center no-repeat;
}
.spinner-icon {
display: inline-block;
width: 20px;
height: 20px;
margin-left: 10px;
vertical-align: middle;
background: url(../img/blue-spinner.gif) no-repeat;
}
.spinner-in-field-icon {
display: inline-block;
width: 14px;
height: 14px;
vertical-align: middle;
background: url(../img/spinner-in-field.gif) no-repeat;
}
cms/static/sass/elements/_navigation.scss
......@@ -22,6 +22,29 @@ nav {
// ====================
// skip navigation
.nav-skip {
@include font-size(13);
display: block;
position: absolute;
left: 0px;
top: -($baseline*30);
width: 1px;
height: 1px;
overflow: hidden;
background: $white;
border-bottom: 1px solid $gray-l4;
padding: ($baseline*0.75) ($baseline/2);
&:focus, &:active {
position: static;
width: auto;
height: auto;
}
}
// ====================
// dropdown
.nav-dd {
......
cms/static/sass/style-app-extend1.scss
......@@ -56,8 +56,5 @@
// base - contexts
@import 'contexts/ie'; // ie-specific rules (mostly for known/older bugs)
// temp - inherited
@import 'assets/content-types';
@import 'developer'; // used for any developer-created scss that needs further polish/refactoring
@import 'shame'; // used for any bad-form/orphaned scss
cms/static/sass/views/_dashboard.scss
......@@ -418,8 +418,15 @@
pointer-events: auto;
}
.course-title {
color: $orange-d1;
.view-live-button {
@extend %ui-depth3;
@extend %btn-primary-blue;
@extend %sizing;
@include transition(opacity $tmg-f2 ease-in-out 0);
@include box-sizing(border-box);
padding: ($baseline/2);
opacity: 0.0;
pointer-events: none;
}
.course-metadata {
......
cms/templates/base.html
......@@ -40,7 +40,7 @@
<%block name="header_extras"></%block>
</head>
<body class="${dir_rtl} <%block name='bodyclass'></%block> hide-wip lang_${LANGUAGE_CODE}">
<body class="${dir_rtl} <%block name='bodyclass'></%block> lang_${LANGUAGE_CODE}">
<%block name="view_notes"></%block>
<a class="nav-skip" href="#content">${_("Skip to this view's content")}</a>
......
common/static/sass/_mixins-inherited.scss
......@@ -296,20 +296,7 @@
}
}
@mixin dark-grey-button {
@include button;
border: 1px solid $gray-d2;
border-radius: 3px;
background: -webkit-linear-gradient(top, rgba(255, 255, 255, .2), rgba(255, 255, 255, 0)) $gray-d1;
box-shadow: 0 1px 0 rgba(255, 255, 255, .2) inset;
color: $white;
&:hover, &:focus {
background-color: $gray-d4;
color: $white;
}
}
// only needed for course updates
@mixin edit-box {
box-shadow: 0 1px 0 rgba(255, 255, 255, .2) inset;
padding: 15px 20px;
......@@ -353,93 +340,6 @@
}
}
@mixin tree-view {
border: 0;
background: $white;
.branch {
margin-bottom: 0;
}
.branch > .section-item {
border-top: 1px solid #c5cad4;
}
.section-item {
@include transition(background $tmg-avg ease-in-out 0);
@extend %t-action3;
position: relative;
display: block;
padding: 6px 8px 8px 16px;
background: #edf1f5;
&:hover, &:focus {
background: $blue-l5;
.item-actions {
display: block;
}
}
&.editing {
background: $orange-l4;
}
.draft-item:after,
.public-item:after,
.private-item:after {
@extend %t-strong;
@extend %t-action5;
margin-left: 3px;
text-transform: uppercase;
}
.draft-item:after {
content: "- draft";
}
.private-item:after {
content: "- private";
}
.private-item {
color: $gray-l1;
}
.draft-item {
color: $yellow-d1;
}
}
a {
color: $baseFontColor;
&.new-unit-item {
color: #6d788b;
}
}
ol {
.section-item {
padding-left: 56px;
}
.new-unit-item {
margin-left: 56px;
}
}
ol ol {
.section-item {
padding-left: 96px;
}
.new-unit-item {
margin-left: 96px;
}
}
}
// ====================
// sunsetted mixins
......
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