From d731b07bd4c42c78bbabbd40b29ec03659094199 Mon Sep 17 00:00:00 2001 From: Andy Armstrong Date: Tue, 19 Jan 2016 15:24:06 -0500 Subject: [PATCH] Add UXPL to edx-platform UITK-39 --- common/static/pattern-library/fonts | 1 + common/static/pattern-library/js | 1 + lms/envs/common.py | 6 +++--- lms/static/certificates/sass/_config.scss | 1 + package.json | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) create mode 120000 common/static/pattern-library/fonts create mode 120000 common/static/pattern-library/js diff --git a/common/static/pattern-library/fonts b/common/static/pattern-library/fonts new file mode 120000 index 0000000000..8da17c1b1f --- /dev/null +++ b/common/static/pattern-library/fonts @@ -0,0 +1 @@ +../../../node_modules/edx-pattern-library/pattern-library/fonts \ No newline at end of file diff --git a/common/static/pattern-library/js b/common/static/pattern-library/js new file mode 120000 index 0000000000..49d5a2e738 --- /dev/null +++ b/common/static/pattern-library/js @@ -0,0 +1 @@ +../../../node_modules/edx-pattern-library/pattern-library/js \ No newline at end of file diff --git a/lms/envs/common.py b/lms/envs/common.py index 1bdcc3af9e..d0c3dd809a 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -1236,9 +1236,9 @@ main_vendor_js = base_vendor_js + [ 'js/vendor/jquery-ui.min.js', 'js/vendor/jquery.qtip.min.js', 'js/vendor/jquery.ba-bbq.min.js', - 'js/vendor/afontgarde/modernizr.fontface-generatedcontent.js', - 'js/vendor/afontgarde/afontgarde.js', - 'js/vendor/afontgarde/edx-icons.js' + 'pattern-library/js/modernizr.custom.js', + 'pattern-library/js/afontgarde.js', + 'pattern-library/js/edx-icons.js' ] # Common files used by both RequireJS code and non-RequireJS code diff --git a/lms/static/certificates/sass/_config.scss b/lms/static/certificates/sass/_config.scss index 0101091515..99bf24e3d9 100644 --- a/lms/static/certificates/sass/_config.scss +++ b/lms/static/certificates/sass/_config.scss @@ -8,6 +8,7 @@ // ------------------------------ // #VARIABLES // ------------------------------ +$pattern-library-path: '../../pattern-library' !default; // certificate characteristics $cert-base-color: palette(grayscale-cool, dark); diff --git a/package.json b/package.json index 62e0affb90..0d290c4b67 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "version": "0.1.0", "dependencies": { "coffee-script": "1.6.1", + "edx-pattern-library": "0.10.4", "uglify-js": "2.4.24" }, "devDependencies": {