Skip to content
Snippets Groups Projects
Commit 60fab86f authored by Andy Armstrong's avatar Andy Armstrong Committed by Renzo Lucioni
Browse files

Reconcile double reverts 

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.
parent affee692
No related branches found
Tags release-2020-01-27-15.46
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 97 additions and 92 deletions
cms/static/sass/_build.scss → cms/static/sass/_build-v1.scss
+ 1
− 0
View file @ 60fab86f
// ------------------------------
// 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.
......
cms/static/sass/_build-v2.scss 0 → 100644
+ 9
− 0
View file @ 60fab86f
// ------------------------------
// Studio: Shared Build Compile
// Version 2 - introduces the Pattern Library
// Configuration
@import 'config';
// Extensions
cms/static/sass/_config.scss 0 → 100644
+ 7
− 0
View file @ 60fab86f
// ------------------------------
// Studio configuration settings
// ------------------------------
// #VARIABLES
// ------------------------------
cms/static/sass/studio-main-rtl.scss → cms/static/sass/studio-main-v1-rtl.scss
+ 1
− 1
View file @ 60fab86f
......@@ -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
cms/static/sass/studio-main.scss → cms/static/sass/studio-main-v1.scss
+ 3
− 2
View file @ 60fab86f
// 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
cms/static/sass/studio-main-v2-rtl.scss 0 → 100644
+ 14
− 0
View file @ 60fab86f
// ------------------------------
// 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';
cms/static/sass/studio-main-v2.scss 0 → 100644
+ 14
− 0
View file @ 60fab86f
// ------------------------------
// 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';
cms/templates/base.html
+ 3
− 1
View file @ 60fab86f
......@@ -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" />
......
cms/templates/ux/reference/index.html
+ 1
− 0
View file @ 60fab86f
......@@ -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>
......
common/djangoapps/pipeline_mako/tests/test_render.py
+ 9
− 0
View file @ 60fab86f
......@@ -5,6 +5,7 @@ from unittest import skipUnless
from django.conf import settings
from django.test import TestCase
from paver.easy import call_task
from pipeline_mako import render_require_js_path_overrides, compressed_css, compressed_js
......@@ -42,6 +43,14 @@ class RequireJSPathOverridesTest(TestCase):
class PipelineRenderTest(TestCase):
"""Test individual pipeline rendering functions. """
@classmethod
def setUpClass(cls):
"""
Create static assets once for all pipeline render tests.
"""
super(PipelineRenderTest, cls).setUpClass()
call_task('pavelib.assets.update_assets', args=('lms', '--settings=test'))
@skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'Test only valid in LMS')
@ddt.data(
(True,),
......
lms/static/certificates/sass/_build.scss
+ 5
− 9
View file @ 60fab86f
// ------------------------------
// Open edX Certificates: Shared Build Compile
// About: Sass compile for Open edX Certificates elements that are shared between LTR and RTL UI. Configuration and vendor specific imports happen before this shared set of imports are compiled in the main-*.scss files.
// About: Sass compile for Open edX Certificates elements that are shared between LTR and RTL UI.
// Configuration and vendor specific imports happen before this shared set of imports are compiled
// in the main-*.scss files.
// ------------------------------
// #CONFIG + LIB
// ------------------------------
@import 'lib';
// Configuration
@import 'config';
@import '../../../../node_modules/edx-pattern-library/pattern-library/sass/edx-pattern-library';
// ------------------------------
// #EXTENSIONS
// ------------------------------
// Extensions
@import 'utilities';
@import 'base';
@import 'components';
......
lms/static/certificates/sass/_config.scss
+ 0
− 4
View file @ 60fab86f
// ------------------------------
// Open edX Certificates: Config
// About: variable and configuration overrides
// #VARIABLES
// ------------------------------
// #VARIABLES
// ------------------------------
$pattern-library-path: '../../edx-pattern-library' !default;
// certificate characteristics
$cert-base-color: palette(grayscale-cool, dark);
......
lms/static/certificates/sass/_lib.scss deleted 100644 → 0
+ 0
− 9
View file @ affee692
// ------------------------------
// Open edX Certificates: Main Style Compile
// About: third party libraries and dependencies import
@import '../../../../node_modules/edx-pattern-library/node_modules/bourbon/app/assets/stylesheets/bourbon';
@import '../../../../node_modules/edx-pattern-library/node_modules/susy/sass/susy';
@import '../../../../node_modules/edx-pattern-library/node_modules/breakpoint-sass/stylesheets/breakpoint';
lms/static/certificates/sass/_ltr.scss deleted 100644 → 0
+ 0
− 23
View file @ affee692
// ------------------------------
// Open edX Certificates: Main Style Compile
// About: Sass partial for defining settings and utilities for LTR-centric layouts.
// #SETTINGS
// #LIB
// ----------------------------
// #SETTINGS
// ----------------------------
$layout-direction: ltr;
// currently needed since platform Sass won't obey https://github.com/edx/ux-pattern-library/blob/master/pattern-library/sass/patterns/_grid.scss#L23
$grid-direction-default: ltr;
$grid-direction-reversed: ltr;
// ----------------------------
// #LIB
// ----------------------------
@import '../../../../node_modules/edx-pattern-library/node_modules/bi-app-sass/bi-app/bi-app-ltr';
lms/static/certificates/sass/_rtl.scss deleted 100644 → 0
+ 0
− 23
View file @ affee692
// ------------------------------
// Open edX Certificates: Main Style Compile
// About: Sass partial for defining settings and utilities for LTR-centric layouts.
// #SETTINGS
// #LIB
// ----------------------------
// #SETTINGS
// ----------------------------
$layout-direction: rtl;
// currently needed since platform Sass won't obey https://github.com/edx/ux-pattern-library/blob/master/pattern-library/sass/patterns/_grid.scss#L23
$grid-direction-default: rtl;
$grid-direction-reversed: ltr;
// ----------------------------
// #LIB
// ----------------------------
@import '../../../../node_modules/edx-pattern-library/node_modules/bi-app-sass/bi-app/bi-app-rtl';
lms/static/certificates/sass/main-ltr.scss
+ 7
− 10
View file @ 60fab86f
......@@ -3,16 +3,13 @@
// About: Sass compile for the Open edX Certificates Elements.
// NOTE: This is the left to right (LTR) configured style compile. It should mirror main-rtl w/ the exception of bi-app references.
// NOTE: This is the left to right (LTR) configured style compile.
// It should mirror main-rtl w/ the exception of bi-app references.
// ------------------------------
// #CONFIG - layout direction
// ------------------------------
@import 'ltr'; // LTR-specifc settings and utilities
// 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';
// ------------------------------
// #BUILD
// ------------------------------
@import 'build'; // shared compile/build order for both LTR and RTL UI
// Load the shared build
@import 'build';
lms/static/certificates/sass/main-rtl.scss
+ 7
− 10
View file @ 60fab86f
......@@ -3,16 +3,13 @@
// About: Sass compile for the Open edX Certificates Elements.
// NOTE: This is the right to left (RTL) configured style compile. It should mirror main-ltr w/ the exception of bi-app references.
// NOTE: This is the right to left (RTL) configured style compile.
// It should mirror main-ltr w/ the exception of bi-app references.
// ------------------------------
// #CONFIG - layout direction
// ------------------------------
@import 'rtl'; // RTL-specifc settings and utilities
// 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';
// ------------------------------
// #BUILD
// ------------------------------
@import 'build'; // shared compile/build order for both LTR and RTL UI
// Load the shared build
@import 'build';
lms/static/sass/_build-lms-v2.scss 0 → 100644
+ 9
− 0
View file @ 60fab86f
// ------------------------------
// LMS: Shared Build Compile
// Version 2 - introduces the Pattern Library
// Configuration
@import 'config';
// Extensions
lms/static/sass/_config.scss 0 → 100644
+ 7
− 0
View file @ 60fab86f
// ------------------------------
// LMS configuration settings
// ------------------------------
// #VARIABLES
// ------------------------------
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