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

Reconcile double reverts

Browse Source 
Resolves conflicts between reverts of pattern library test pages and multi-site comprehensive theming, and the re-introduction of pattern library test pages. Fixes a pipeline rendering test which relied on other tests updating assets. The test now ensures that static assets are available before running.
This commit is contained in:
Andy Armstrong
2016-03-25 13:49:26 -04:00
committed by Renzo Lucioni
parent affee69296
commit 60fab86f01
29 changed files with 167 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cms/static/sass/_build.scss → cms/static/sass/_build-v1.scss
View File

@@ -1,5 +1,6 @@
// ------------------------------
// Studio: Shared Build Compile
// Version 1 styling (pre-Pattern Library)
// About: Sass compile for Studio that are shared between LTR and RTL UI. Configuration and vendor specific imports happen before this shared set of imports are compiled in the studio-main-*.scss files.

9
cms/static/sass/_build-v2.scss Normal file
View File

@@ -0,0 +1,9 @@
// ------------------------------
// Studio: Shared Build Compile
// Version 2 - introduces the Pattern Library
// Configuration
@import 'config';
// Extensions

7
cms/static/sass/_config.scss Normal file
View File

@@ -0,0 +1,7 @@
// ------------------------------
// Studio configuration settings
// ------------------------------
// #VARIABLES
// ------------------------------

2
cms/static/sass/studio-main-rtl.scss → cms/static/sass/studio-main-v1-rtl.scss
View File

@@ -17,4 +17,4 @@
@import 'bourbon/bourbon'; // lib - bourbon
@import 'vendor/bi-app/bi-app-rtl'; // set the layout for right to left languages
@import 'build'; // shared app style assets/rendering
@import 'build-v1'; // shared app style assets/rendering

5
cms/static/sass/studio-main.scss → cms/static/sass/studio-main-v1.scss
View File

@@ -1,4 +1,5 @@
// studio - css architecture
// Studio - css architecture
// Version 1 styling (pre-Pattern Library)
// ====================
// Table of Contents
@@ -17,4 +18,4 @@
@import 'bourbon/bourbon'; // lib - bourbon
@import 'vendor/bi-app/bi-app-ltr'; // set the layout for left to right languages
@import 'build'; // shared app style assets/rendering
@import 'build-v1'; // shared app style assets/rendering

14
cms/static/sass/studio-main-v2-rtl.scss Normal file
View File

@@ -0,0 +1,14 @@
// ------------------------------
// Studio main styling
// Version 2 - introduces the Pattern Library
// NOTE: This is the right-to-left (RTL) configured style compile.
// It should mirror main-ltr w/ the exception of bi-app references.
// Load the RTL version of the edX Pattern Library
$pattern-library-path: '../edx-pattern-library' !default;
@import 'edx-pattern-library/pattern-library/sass/edx-pattern-library-rtl';
// Load the shared build
@import 'build-v2';

14
cms/static/sass/studio-main-v2.scss Normal file
View File

@@ -0,0 +1,14 @@
// ------------------------------
// Studio main styling
// Version 2 - introduces the Pattern Library
// NOTE: This is the left-to-right (LTR) configured style compile.
// It should mirror main-rtl w/ the exception of bi-app references.
// Load the LTR version of the edX Pattern Library
$pattern-library-path: '../edx-pattern-library' !default;
@import 'edx-pattern-library/pattern-library/sass/edx-pattern-library-ltr';
// Load the shared build
@import 'build-v2';

4
cms/templates/base.html
View File

@@ -13,6 +13,7 @@ from openedx.core.djangolib.js_utils import (
dump_js_escaped_json, js_escaped_string
)
%>
<%page expression_filter="h"/>
<!doctype html>
<!--[if lte IE 9]><html class="ie9 lte9" lang="${LANGUAGE_CODE}"><![endif]-->
@@ -42,7 +43,8 @@ from openedx.core.djangolib.js_utils import (
<%static:css group='style-vendor'/>
<%static:css group='style-vendor-tinymce-content'/>
<%static:css group='style-vendor-tinymce-skin'/>
<%static:css group='style-main'/>
<%static:css group='${self.attr.main_css}'/>
<%include file="widgets/segment-io.html" />

1
cms/templates/ux/reference/index.html
View File

@@ -24,6 +24,7 @@
<ul>
<li><a href="container.html">Container page</a></li>
<li><a href="unit.html">Unit page</a></li>
<li><a href="pattern-library-test.html">Pattern Library test page</a></li>
</ul>
</section>
</li>