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.
Showing
- cms/static/sass/_build-v1.scss 1 addition, 0 deletionscms/static/sass/_build-v1.scss
- cms/static/sass/_build-v2.scss 9 additions, 0 deletionscms/static/sass/_build-v2.scss
- cms/static/sass/_config.scss 7 additions, 0 deletionscms/static/sass/_config.scss
- cms/static/sass/studio-main-v1-rtl.scss 1 addition, 1 deletioncms/static/sass/studio-main-v1-rtl.scss
- cms/static/sass/studio-main-v1.scss 3 additions, 2 deletionscms/static/sass/studio-main-v1.scss
- cms/static/sass/studio-main-v2-rtl.scss 14 additions, 0 deletionscms/static/sass/studio-main-v2-rtl.scss
- cms/static/sass/studio-main-v2.scss 14 additions, 0 deletionscms/static/sass/studio-main-v2.scss
- cms/templates/base.html 3 additions, 1 deletioncms/templates/base.html
- cms/templates/ux/reference/index.html 1 addition, 0 deletionscms/templates/ux/reference/index.html
- common/djangoapps/pipeline_mako/tests/test_render.py 9 additions, 0 deletionscommon/djangoapps/pipeline_mako/tests/test_render.py
- lms/static/certificates/sass/_build.scss 5 additions, 9 deletionslms/static/certificates/sass/_build.scss
- lms/static/certificates/sass/_config.scss 0 additions, 4 deletionslms/static/certificates/sass/_config.scss
- lms/static/certificates/sass/_lib.scss 0 additions, 9 deletionslms/static/certificates/sass/_lib.scss
- lms/static/certificates/sass/_ltr.scss 0 additions, 23 deletionslms/static/certificates/sass/_ltr.scss
- lms/static/certificates/sass/_rtl.scss 0 additions, 23 deletionslms/static/certificates/sass/_rtl.scss
- lms/static/certificates/sass/main-ltr.scss 7 additions, 10 deletionslms/static/certificates/sass/main-ltr.scss
- lms/static/certificates/sass/main-rtl.scss 7 additions, 10 deletionslms/static/certificates/sass/main-rtl.scss
- lms/static/sass/_build-lms-v1.scss 0 additions, 0 deletionslms/static/sass/_build-lms-v1.scss
- lms/static/sass/_build-lms-v2.scss 9 additions, 0 deletionslms/static/sass/_build-lms-v2.scss
- lms/static/sass/_config.scss 7 additions, 0 deletionslms/static/sass/_config.scss
Please register or sign in to comment