Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup and response to PR review

Browse Source
This commit is contained in:
Frances Botsford
2014-10-10 15:22:41 -04:00
parent d8bf0ef5a5
commit c92f52e0bd
48 changed files with 178 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cms/static/sass/_base.scss
View File

@@ -279,17 +279,17 @@ p, ul, ol, dl {
@include clearfix();
.page-header {
width: flex-grid(6,12);
@include float(left);
@include margin-right(flex-gutter());
width: flex-grid(6,12);
}
.nav-actions {
@include float(left);
@include text-align(right);
position: relative;
bottom: -($baseline*0.75);
width: flex-grid(6,12);
@include float(left);
@include text-align(right);
.nav-item {
display: inline-block;

6
cms/static/sass/_config.scss
View File

@@ -1,6 +0,0 @@
// studio - config
// ====================
// setting the layout to handle right to left languages
// false= lang direction left to right (eg. english); true = rtl (eg. arabic)
$rtl: false;

11
cms/static/sass/elements/_controls.scss
View File

@@ -278,7 +278,16 @@
height: ($baseline*1.2);
width: ($baseline);
margin: 0;
background: transparent url("../img/drag-handles.png") no-repeat right center;
// CASE: right to left layout
@include rtl {
background: transparent url("../img/drag-handles.png") no-repeat left center;
}
// CASE: left to right layout
@include ltr {
background: transparent url("../img/drag-handles.png") no-repeat right center;
}
}
&.toggle-action {

18
cms/static/sass/elements/_layout.scss
View File

@@ -40,25 +40,25 @@
@include clearfix();
.page-header {
float: left;
@include float(left);
width: flex-grid(6,12);
margin-right: flex-gutter();
@include margin-right(flex-gutter());
}
.nav-actions {
position: relative;
bottom: -($baseline*0.75);
float: right;
@include float(right);
width: flex-grid(6,12);
text-align: right;
@include text-align(right);
.nav-item {
display: inline-block;
vertical-align: top;
margin-right: ($baseline/2);
@include margin-right(($baseline/2));
&:last-child {
margin-right: 0;
@include margin-right(0);
}
}
@@ -214,8 +214,8 @@
// 3/4 - 1/4 two col layout
%two-col-1 {
.content-primary {
float: left;
margin-right: flex-gutter();
@include float(left);
@include margin-right(flex-gutter());
width: flex-grid(9,12);
box-shadow: none;
border: 0;
@@ -223,7 +223,7 @@
}
.content-supplementary {
float: left;
@include float(left);
width: flex-grid(3,12);
}
}

2
cms/static/sass/elements/_modules.scss
View File

@@ -300,7 +300,7 @@ $outline-indent-width: $baseline;
.icon {
@extend %t-icon5;
margin-right: ($baseline/4);
@include margin-right($baseline/4);
}
}

2
cms/static/sass/elements/_xblocks.scss
View File

@@ -41,7 +41,7 @@
display: inline-block;
width: 49%;
vertical-align: middle;
text-align: right;
@include text-align(right);
}
}

4
cms/static/sass/style-app-extend1-rtl.scss
View File

@@ -1,10 +1,9 @@
// studio - css architecture
// ====================
@import 'vendor/bi-app/bi-app-rtl'; // set the layout for right to left languages
// libs and resets *do not edit*
@import 'bourbon/bourbon'; // lib - bourbon
@import 'vendor/bi-app/bi-app-rtl'; // set the layout for right to left languages
// VENDOR + REBASE *referenced/used vendor presentation and reset*
// ====================
@@ -13,7 +12,6 @@
// BASE *default edX offerings*
// ====================
// base - utilities
@import 'config';
@import 'variables';
@import 'mixins';
@import 'mixins-inherited';

1
cms/static/sass/style-app-extend1.scss
View File

@@ -13,7 +13,6 @@
// BASE *default edX offerings*
// ====================
// base - utilities
@import 'config';
@import 'variables';
@import 'mixins';
@import 'mixins-inherited';

4
cms/static/sass/style-app-rtl.scss
View File

@@ -1,10 +1,9 @@
// studio - css architecture
// ====================
@import 'vendor/bi-app/bi-app-rtl'; // set the layout for right to left languages
// libs and resets *do not edit*
@import 'bourbon/bourbon'; // lib - bourbon
@import 'vendor/bi-app/bi-app-rtl'; // set the layout for right to left languages
// VENDOR + REBASE *referenced/used vendor presentation and reset*
// ====================
@@ -13,7 +12,6 @@
// BASE *default edX offerings*
// ====================
// base - utilities
@import 'config';
@import 'variables';
@import 'mixins';
@import 'mixins-inherited';

1
cms/static/sass/style-app.scss
View File

@@ -13,7 +13,6 @@
// BASE *default edX offerings*
// ====================
// base - utilities
@import 'config';
@import 'variables';
@import 'mixins';
@import 'mixins-inherited';

36
cms/static/sass/style-xmodule-rtl.scss Normal file
View File

@@ -0,0 +1,36 @@
// studio - xmodule architecture
// ====================
// libs and resets *do not edit*
@import 'bourbon/bourbon'; // lib - bourbon
@import 'vendor/bi-app/bi-app-rtl'; // set the layout for right to left languages
// VENDOR + REBASE *referenced/used vendor presentation and reset*
// ====================
@import 'reset';
// BASE *default edX offerings*
// ====================
// base - utilities
@import 'variables';
@import 'mixins';
@import 'mixins-inherited';
// base - assets
@import 'assets/fonts';
@import 'assets/graphics'; // sprites, basic img/figure/svg styling
@import 'assets/anims'; // animations
// base - starter
@import 'base';
// base - elements
@import 'elements/typography';
@import 'elements/icons'; // references to icons used
@import 'elements/controls'; // buttons, link styles, sliders, etc.
@import 'elements/navigation'; // all archetypes of navigation
// xmodule
@import 'xmodule/modules/css/module-styles.scss';
@import 'xmodule/descriptors/css/module-styles.scss';
@import 'elements/xmodules'; // styling for Studio-specific contexts

4
cms/static/sass/style-xmodule.scss
View File

@@ -1,10 +1,9 @@
// studio - xmodule architecture
// ====================
@import 'vendor/bi-app/bi-app-ltr'; // set the layout for right to left languages
// libs and resets *do not edit*
@import 'bourbon/bourbon'; // lib - bourbon
@import 'vendor/bi-app/bi-app-ltr'; // set the layout for left to right languages
// VENDOR + REBASE *referenced/used vendor presentation and reset*
// ====================
@@ -13,7 +12,6 @@
// BASE *default edX offerings*
// ====================
// base - utilities
@import 'config';
@import 'variables';
@import 'mixins';
@import 'mixins-inherited';

4
cms/static/sass/vendor/bi-app/_mixins.scss vendored
View File

@@ -1,9 +1,9 @@
// ------------------------------------------
// bi app mixins
// authors:
// authors:
// twitter.com/anasnakawa
// twitter.com/victorzamfir
// licensed under the MIT license
// licensed under the MIT license
// http://www.opensource.org/licenses/mit-license.php
// ------------------------------------------

4
cms/static/sass/views/_account.scss
View File

@@ -53,7 +53,7 @@
}
.content-primary {
@extend %ui-col-wide;
@extend .ui-col-wide;
form {
@include box-sizing(border-box);
@@ -209,7 +209,7 @@
}
.content-supplementary {
@extend %ui-col-narrow;
@extend .ui-col-narrow;
.bit {
@extend %t-copy-sub1;

4
cms/static/sass/views/_assets.scss
View File

@@ -8,11 +8,11 @@
}
.content-primary {
@extend %ui-col-wide;
@extend .ui-col-wide;
}
.content-supplementary {
@extend %ui-col-narrow;
@extend .ui-col-narrow;
}
.nav-actions {

4
cms/static/sass/views/_checklists.scss
View File

@@ -8,7 +8,7 @@
}
.content-primary {
@extend %ui-col-wide;
@extend .ui-col-wide;
}
// checklists - general
@@ -336,6 +336,6 @@
}
.content-supplementary {
@extend %ui-col-narrow;
@extend .ui-col-narrow;
}
}

30
cms/static/sass/views/_dashboard.scss
View File

@@ -14,18 +14,18 @@
// ====================
// basic layout
.content-primary, .content-supplementary {
@include box-sizing(border-box);
}
// basic layout
.content-primary, .content-supplementary {
@include box-sizing(border-box);
}
.content-primary {
@extend %ui-col-wide;
}
.content-primary {
@extend .ui-col-wide;
}
.content-supplementary {
@extend %ui-col-narrow;
}
.content-supplementary {
@extend .ui-col-narrow;
}
// ====================
@@ -437,13 +437,13 @@
.course-link {
@extend %ui-depth2;
width: flex-grid(6, 9);
margin-right: flex-gutter();
@include margin-right(flex-gutter());
}
// course title
.course-title {
@extend %t-title4;
margin: 0 ($baseline*2) ($baseline/4) 0;
@include margin(0, ($baseline*2), ($baseline/4), 0);
font-weight: 300;
}
@@ -484,17 +484,17 @@
@extend %ui-depth3;
position: static;
width: flex-grid(3, 9);
text-align: right;
@include text-align(right);
opacity: 0;
pointer-events: none;
.action {
display: inline-block;
vertical-align: middle;
margin-right: ($baseline/2);
@include margin-right($baseline/2);
&:last-child {
margin-right: 0;
@include margin-right(0);
}
}

4
cms/static/sass/views/_export.scss
View File

@@ -9,11 +9,11 @@
}
.content-primary {
@extend %ui-col-wide;
@extend .ui-col-wide;
}
.content-supplementary {
@extend %ui-col-narrow;
@extend .ui-col-narrow;
}

4
cms/static/sass/views/_import.scss vendored
View File

@@ -8,11 +8,11 @@
}
.content-primary {
@extend %ui-col-wide;
@extend .ui-col-wide;
}
.content-supplementary {
@extend %ui-col-narrow;
@extend .ui-col-narrow;
}
// UI: export controls

30
cms/static/sass/views/_outline.scss
View File

@@ -73,7 +73,7 @@
}
.content-primary {
@extend %ui-col-wide;
@extend .ui-col-wide;
.no-content {
@extend %no-content;
@@ -81,7 +81,7 @@
}
.content-supplementary {
@extend %ui-col-narrow;
@extend .ui-col-narrow;
}
@@ -295,7 +295,7 @@
}
.section-header-details {
float: left;
@include float(left);
width: flex-grid(6, 9);
.icon, .wrapper-section-title {
@@ -304,7 +304,7 @@
}
.icon {
margin-right: ($baseline/4);
@include margin-right($baseline/4);
}
.wrapper-section-title {
@@ -314,10 +314,10 @@
}
.section-header-actions {
float: right;
@include float(right);
width: flex-grid(3, 9);
margin-top: -($baseline/4);
text-align: right;
@include text-align(right);
.actions-list {
@extend %actions-list;
@@ -383,7 +383,7 @@
}
.subsection-header-details {
float: left;
@include float(left);
width: flex-grid(6, 9);
.icon, .wrapper-subsection-title {
@@ -392,7 +392,7 @@
}
.icon {
margin-right: ($baseline/4);
@include margin-right($baseline/4);
}
.wrapper-subsection-title {
@@ -403,10 +403,10 @@
}
.subsection-header-actions {
float: right;
@include float(right);
width: flex-grid(3, 9);
margin-top: -($baseline/4);
text-align: right;
@include text-align(right);
.actions-list {
@extend %actions-list;
@@ -422,7 +422,7 @@
// status
.subsection-status {
margin: 0 0 0 $outline-indent-width;
@include margin(0, 0, 0, $outline-indent-width);
}
// content
@@ -465,16 +465,16 @@
}
.unit-header-details {
float: left;
@include float(left);
width: flex-grid(6, 9);
margin-top: ($baseline/4);
}
.unit-header-actions {
float: right;
@include float(right);
width: flex-grid(3, 9);
margin-top: -($baseline/10);
text-align: right;
@include text-align(right);
.actions-list {
@extend %actions-list;
@@ -495,7 +495,7 @@
.icon {
display: inline-block;
vertical-align: middle;
margin-right: ($baseline/2);
@include margin-right($baseline/2);
}
}
}

4
cms/static/sass/views/_settings.scss
View File

@@ -9,7 +9,7 @@
.content-primary {
@extend %ui-window;
@extend %ui-col-wide;
@extend .ui-col-wide;
padding: $baseline ($baseline*1.5);
}
@@ -897,7 +897,7 @@
}
.content-supplementary {
@extend %ui-col-narrow;
@extend .ui-col-narrow;
}
.wrapper-modal-window {

6
cms/static/sass/views/_textbooks.scss
View File

@@ -8,7 +8,7 @@
}
.content-primary {
@extend %ui-col-wide;
@extend .ui-col-wide;
.no-textbook-content {
@extend %no-content;
@@ -303,7 +303,7 @@
display: block;
width: 46%;
border-bottom: none;
@include margin(0 ($baseline*0.75) 0 0);
@include margin(0, ($baseline*0.75), 0, 0);
padding: ($baseline/4) 0 0 0;
@include float(left);
position: relative;
@@ -352,6 +352,6 @@
}
}
.content-supplementary {
@extend %ui-col-narrow;
@extend .ui-col-narrow;
}
}

4
cms/static/sass/views/_updates.scss
View File

@@ -164,7 +164,7 @@
width: 30%;
padding: 20px 30px;
margin: 0;
@include border-radius(0 3px 3px 0);
@include border-radius(0, 3px, 3px, 0);
@include border-left(none);
background: $lightGrey;
@@ -184,7 +184,7 @@
.edit-icon,
.delete-icon {
@include margin-right(4px);
@include margin-right($baseline/5);
}
}

6
cms/static/sass/views/_users.scss
View File

@@ -9,11 +9,11 @@
}
.content-primary {
@extend %ui-col-wide;
@extend .ui-col-wide;
}
.content-supplementary {
@extend %ui-col-narrow;
@extend .ui-col-narrow;
}
// ELEM: content
@@ -132,7 +132,7 @@
@include transition(color $tmg-f2 ease-in-out 0s);
@extend %t-title4;
@extend %t-strong;
@include margin(0 ($baseline/2) ($baseline/10) 0);
@include margin(0, ($baseline/2), ($baseline/10), 0);
color: $gray-d4;
}