Merge pull request #12089 from edx/revert-pattern-lib-css-changes

Revert "Introduce Pattern Library test pages"

Merge pull request #12089 from edx/revert-pattern-lib-css-changes
Revert "Introduce Pattern Library test pages"
15ea5ece · Brian Jacobel · 31ca2a63 · 36917398 · 15ea5ece · 31ca2a63
Commit 15ea5ece authored 8 years ago by Brian Jacobel
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -568,6 +568,20 @@ PIPELINE_CSS = {
        ],
        'output_filename': 'css/cms-style-vendor-tinymce-skin.css',
    },
+    'style-main': {
+        # this is unnecessary and can be removed
+        'source_filenames': [
+            'css/studio-main.css',
+        ],
+        'output_filename': 'css/studio-main.css',
+    },
+    'style-main-rtl': {
+        # this is unnecessary and can be removed
+        'source_filenames': [
+            'css/studio-main-rtl.css',
+        ],
+        'output_filename': 'css/studio-main-rtl.css',
+    },
    'style-edx-icons': {
        'source_filenames': [
            'css/edx-icons.css',

--- a/cms/static/sass/_build-v2.scss
+++ b/cms/static/sass/_build-v2.scss
-// ------------------------------
-// Studio: Shared Build Compile
-// Version 2 - introduces the Pattern Library
-
-
-// Configuration
-@import 'config';
-
-// Extensions
--- a/cms/static/sass/_build-v1.scss
+++ b/cms/static/sass/_build-v1.scss
 // ------------------------------
 // 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.


--- a/cms/static/sass/_config.scss
+++ b/cms/static/sass/_config.scss
-// ------------------------------
-// Studio configuration settings
-
-
-// ------------------------------
-// #VARIABLES
-// ------------------------------
--- a/cms/static/sass/studio-main-v1-rtl.scss
+++ b/cms/static/sass/studio-main-v1-rtl.scss
@@ -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-v1'; // shared app style assets/rendering
+@import 'build'; // shared app style assets/rendering
--- a/cms/static/sass/studio-main-v2-rtl.scss
+++ b/cms/static/sass/studio-main-v2-rtl.scss
-// ------------------------------
-// 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';
--- a/cms/static/sass/studio-main-v2.scss
+++ b/cms/static/sass/studio-main-v2.scss
-// ------------------------------
-// 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';
--- a/cms/static/sass/studio-main-v1.scss
+++ b/cms/static/sass/studio-main-v1.scss
-// Studio - css architecture
-// Version 1 styling (pre-Pattern Library)
+// studio - css architecture
 // ====================

 // Table of Contents
@@ -18,4 +17,4 @@
 @import 'bourbon/bourbon'; // lib - bourbon
 @import 'vendor/bi-app/bi-app-ltr'; // set the layout for left to right languages

-@import 'build-v1'; // shared app style assets/rendering
+@import 'build'; // shared app style assets/rendering
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
 ## coding=utf-8
-
-## Pages currently use v1 styling by default. Once the Pattern Library
-## rollout has been completed, this default can be switched to v2.
-<%! main_css = "css/studio-main-v1.css" %>
-
-## Standard imports
 <%namespace name='static' file='static_content.html'/>
 <%!
 from django.utils.translation import ugettext as _
@@ -13,7 +7,6 @@ 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]-->
@@ -43,8 +36,7 @@ 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='${self.attr.main_css}'/>
+    <%static:css group='style-main'/>

    <%include file="widgets/segment-io.html" />


--- a/cms/templates/ux/reference/index.html
+++ b/cms/templates/ux/reference/index.html
@@ -24,7 +24,6 @@
                            <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>

--- a/cms/templates/ux/reference/pattern-library-test.html
+++ b/cms/templates/ux/reference/pattern-library-test.html
-## Override the default styles_version to the Pattern Library version (version 2)
-<%! main_css = "css/studio-main-v2.css" %>
-
-<%inherit file="../../base.html" />
-
-<%block name="title">Pattern Library Test Page</%block>
-<%block name="bodyclass">is-signedin pattern-library</%block>
-
-<%block name="content">
-<h3 class="hd-6 example-set-hd">Warning Alert with Message Only</h3>
-<div class="example-set">
-    <div class="alert alert-warning" role="alert" aria-labelledby="alert-warning-publish-title" tabindex="-1">
-        <span class="icon alert-icon icon-warning" aria-hidden="true"></span>
-
-        <div class="alert-message">
-            <p class="alert-copy">
-                Interesting pattern library content to come...
-            </p>
-        </div>
-
-    </div>
-</div>
-</%block>
--- a/common/djangoapps/pipeline_mako/__init__.py
+++ b/common/djangoapps/pipeline_mako/__init__.py
@@ -10,7 +10,7 @@ from django.contrib.staticfiles.storage import staticfiles_storage


 def compressed_css(package_name, raw=False):
-    package = pipeline_css_info(package_name)
+    package = settings.PIPELINE_CSS.get(package_name, {})
    if package:
        package = {package_name: package}
    packager = Packager(css_packages=package, js_packages={})
@@ -24,28 +24,6 @@ def compressed_css(package_name, raw=False):
        return render_individual_css(package, paths, raw=raw)


-def pipeline_css_info(package_name):
-    """
-    Returns information about a CSS package needed for the Django pipeline.
-
-    Note: if the package name was not registered, then the information
-    returned is based on the package_name being a relative path to a
-    single CSS file.
-
-    Args:
-        package_name: The name of the CSS package.
-
-    Returns:
-        A dictionary with information about the CSS package.
-    """
-    if package_name in settings.PIPELINE_CSS:
-        return settings.PIPELINE_CSS[package_name]
-    return {
-        'source_filenames': [package_name],
-        'output_filename': package_name,
-    }
-
-
 def render_css(package, path, raw=False):
    template_name = package.template_name or "mako/css.html"
    context = package.extra_context

--- a/common/djangoapps/pipeline_mako/templates/static_content.html
+++ b/common/djangoapps/pipeline_mako/templates/static_content.html
 <%!
 from django.contrib.staticfiles.storage import staticfiles_storage
-from pipeline_mako import compressed_css, compressed_js, pipeline_css_info
+from pipeline_mako import compressed_css, compressed_js
 from django.utils.translation import get_language_bidi
 from mako.exceptions import TemplateLookupException

@@ -40,7 +40,7 @@ except:
  % if settings.PIPELINE_ENABLED:
    ${compressed_css(group, raw=raw)}
  % else:
-    % for filename in pipeline_css_info(group)['source_filenames']:
+    % for filename in settings.PIPELINE_CSS[group]['source_filenames']:
      <link rel="stylesheet" href="${staticfiles_storage.url(filename.replace('.scss', '.css'))}${"?raw" if raw else ""}" type="text/css" media="all" / >
    % endfor
  %endif

--- a/lms/djangoapps/courseware/tests/test_comprehensive_theming.py
+++ b/lms/djangoapps/courseware/tests/test_comprehensive_theming.py
@@ -104,8 +104,8 @@ class TestComprehensiveTheming(TestCase):
        """
        Test that static files finders are adjusted according to the applied comprehensive theme.
        """
-        result = staticfiles.finders.find('red-theme/css/lms-main-v1.css')
-        self.assertEqual(result, settings.REPO_ROOT / "themes/red-theme/lms/static/css/lms-main-v1.css")
+        result = staticfiles.finders.find('red-theme/css/lms-main.css')
+        self.assertEqual(result, settings.REPO_ROOT / "themes/red-theme/lms/static/css/lms-main.css")

        lms_main_css = ""
        with open(result) as css_file:
@@ -117,8 +117,8 @@ class TestComprehensiveTheming(TestCase):
        """
        Test default css is served if no theme is applied
        """
-        result = staticfiles.finders.find('css/lms-main-v1.css')
-        self.assertEqual(result, settings.REPO_ROOT / "lms/static/css/lms-main-v1.css")
+        result = staticfiles.finders.find('css/lms-main.css')
+        self.assertEqual(result, settings.REPO_ROOT / "lms/static/css/lms-main.css")

        lms_main_css = ""
        with open(result) as css_file:

--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1390,6 +1390,20 @@ PIPELINE_CSS = {
        ],
        'output_filename': 'css/lms-style-vendor-tinymce-skin.css',
    },
+    'style-main': {
+        # this is unnecessary and can be removed
+        'source_filenames': [
+            'css/lms-main.css',
+        ],
+        'output_filename': 'css/lms-main.css',
+    },
+    'style-main-rtl': {
+        # this is unnecessary and can be removed
+        'source_filenames': [
+            'css/lms-main-rtl.css',
+        ],
+        'output_filename': 'css/lms-main-rtl.css',
+    },
    'style-course-vendor': {
        'source_filenames': [
            'js/vendor/CodeMirror/codemirror.css',

--- a/lms/static/certificates/sass/_build.scss
+++ b/lms/static/certificates/sass/_build.scss
 // ------------------------------
 // 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.


-// Configuration
+// ------------------------------
+// #CONFIG + LIB
+// ------------------------------
+@import 'lib';
 @import 'config';
+@import '../../../../node_modules/edx-pattern-library/pattern-library/sass/edx-pattern-library';

-// Extensions
+// ------------------------------
+// #EXTENSIONS
+// ------------------------------
 @import 'utilities';
 @import 'base';
 @import 'components';

--- a/lms/static/certificates/sass/_config.scss
+++ b/lms/static/certificates/sass/_config.scss
 // ------------------------------
 // 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);

--- a/lms/static/certificates/sass/_lib.scss
+++ b/lms/static/certificates/sass/_lib.scss
+// ------------------------------
+// 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';
--- a/lms/static/certificates/sass/_ltr.scss
+++ b/lms/static/certificates/sass/_ltr.scss
+// ------------------------------
+// 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';
--- a/lms/static/certificates/sass/_rtl.scss
+++ b/lms/static/certificates/sass/_rtl.scss
+// ------------------------------
+// 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';