From e9613002ed222cfbdcc321781b70c20735112e47 Mon Sep 17 00:00:00 2001 From: Chris Rodriguez Date: Fri, 29 Jul 2016 09:14:29 -0400 Subject: [PATCH 1/2] Cleanup after a time-sensitive update --- CHANGELOG.md | 7 ++ bower.json | 2 +- package.json | 2 +- pldoc/_design_elements/colors.md | 110 ------------------------------- pldoc/static/js/colors_json.js | 36 +++++----- 5 files changed, 27 insertions(+), 130 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15f4e082..658a7a45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,18 @@ - - - +## 0.16.3 (2016-07-29) +* Minor update to do some cleanup after time-sensitive 0.16.2 + +- - - + ## 0.16.2 (2016-07-29) * Updated our color options and the swatch layout * Fixed regressions throughout as a result of the changed colors * Updated alerts to meet more needs of the UX team +- - - + ## 0.16.1 (2016-07-15) * Remove edx-icons font variable diff --git a/bower.json b/bower.json index 7bd4fedb..b286180e 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "edx-pattern-library", - "version": "0.16.2", + "version": "0.16.3", "authors": [ "edX Pattern Library Team " ], diff --git a/package.json b/package.json index 553097b3..c27d1c18 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "edx-pattern-library", - "version": "0.16.2", + "version": "0.16.3", "author": "edX Pattern Library Team ", "license": "Apache-2.0", "description": "The (working) Visual, UI, and Front End Styleguide for edX Apps", diff --git a/pldoc/_design_elements/colors.md b/pldoc/_design_elements/colors.md index 8a0fae21..cb17c413 100644 --- a/pldoc/_design_elements/colors.md +++ b/pldoc/_design_elements/colors.md @@ -839,116 +839,6 @@ info: These are the predefined colors used throughout our patterns. Each color i -
-
-
- dark -
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
-
- base -
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
-
- accent -
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
-
- back -
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
-
- x-back -
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
diff --git a/pldoc/static/js/colors_json.js b/pldoc/static/js/colors_json.js index c983c508..9dfbb54a 100644 --- a/pldoc/static/js/colors_json.js +++ b/pldoc/static/js/colors_json.js @@ -8,35 +8,35 @@ define(function() { title: 'Primary Dark', description: 'The darkest shade of the primary color.', recs: [{ - back: ['white', 'light', 'x-light'] + back: ['white', 'back', 'x-back'] }] }], base: [{ title: 'Primary Base', description: 'The base primary color intended for main use.', recs: [{ - back: ['white', 'light', 'x-light'] + back: ['white', 'back', 'x-back'] }] }], accent: [{ title: 'Accent Primary', description: 'The primary accent color.', recs: [{ - back: ['white', 'light', 'x-light'] + back: ['white', 'back', 'x-back'] }] }], back: [{ title: 'Primary Background', description: 'A lighter tint of the primary base color used for backgrounds.', recs: [{ - back: ['dark', 'x-dark', 'black'] + back: ['dark', 'black'] }] }], 'x-back': [{ title: 'Primary Lighter Background', description: 'A very light, near white, tint of the primary base color for lighter backgrounds.', recs: [{ - back: ['dark', 'x-dark', 'black'] + back: ['dark', 'black'] }] }] }, { @@ -45,35 +45,35 @@ define(function() { title: 'Secondary Dark', description: 'The darkest shade of the secondary color.', recs: [{ - back: ['white', 'light', 'x-light'] + back: ['white', 'back', 'x-back'] }] }], base: [{ title: 'Secondary Base', description: 'The base secondary color intended for main use.', recs: [{ - back: ['white', 'light', 'x-light'] + back: ['white', 'back', 'x-back'] }] }], accent: [{ title: 'Accent Secondary', description: 'The secondary accent color.', recs: [{ - back: ['white', 'light', 'x-light'] + back: ['white', 'back', 'x-back'] }] }], back: [{ title: 'Secondary Background', description: 'A lighter tint of the secondary base color used for backgrounds.', recs: [{ - back: ['dark', 'x-dark', 'black'] + back: ['dark', 'black'] }] }], 'x-back': [{ title: 'Secondary Lighter Background', description: 'A very light, near white, tint of the secondary base color for lighter backgrounds.', recs: [{ - back: ['dark', 'x-dark', 'black'] + back: ['dark', 'black'] }] }] }, { @@ -82,35 +82,35 @@ define(function() { title: 'Gray Dark', description: 'The darkest shade of the gray color.', recs: [{ - back: ['white', 'light', 'x-light'] + back: ['white', 'back', 'x-back'] }] }], base: [{ title: 'Gray Base', description: 'The base gray color intended for main use.', recs: [{ - back: ['white', 'light', 'x-light'] + back: ['white', 'back', 'x-back'] }] }], accent: [{ title: 'Accent Gray', description: 'The gray accent color.', recs: [{ - back: ['white', 'light', 'x-light'] + back: ['white', 'back', 'x-back'] }] }], back: [{ title: 'Gray Background', description: 'A lighter tint of the gray base color used for backgrounds.', recs: [{ - back: ['dark', 'x-dark', 'black'] + back: ['dark', 'black'] }] }], 'x-back': [{ title: 'Gray Lighter Background', description: 'A very light, near white, tint of the gray base color for lighter backgrounds.', recs: [{ - back: ['dark', 'x-dark', 'black'] + back: ['dark', 'black'] }] }] }, { @@ -133,7 +133,7 @@ define(function() { title: 'Success Background', description: 'Success messaging background color.', recs: [{ - back: ['black', 'x-dark', 'dark'] + back: ['black', 'dark'] }] }] }, { @@ -156,7 +156,7 @@ define(function() { title: 'Error Background', description: 'Error messaging background color.', recs: [{ - back: ['black', 'x-dark', 'dark'] + back: ['black', 'dark'] }] }] }, { @@ -172,7 +172,7 @@ define(function() { title: 'Warning Background', description: 'Warning messaging background color.', recs: [{ - back: ['black', 'x-dark', 'dark'] + back: ['black', 'dark'] }] }] }] From fd11ff312514cc17edf6c25f891e423ebe37d941 Mon Sep 17 00:00:00 2001 From: Chris Rodriguez Date: Fri, 29 Jul 2016 09:32:05 -0400 Subject: [PATCH 2/2] Removing version stuff for now --- CHANGELOG.md | 7 ------- bower.json | 2 +- package.json | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 658a7a45..15f4e082 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,18 +2,11 @@ - - - -## 0.16.3 (2016-07-29) -* Minor update to do some cleanup after time-sensitive 0.16.2 - -- - - - ## 0.16.2 (2016-07-29) * Updated our color options and the swatch layout * Fixed regressions throughout as a result of the changed colors * Updated alerts to meet more needs of the UX team -- - - - ## 0.16.1 (2016-07-15) * Remove edx-icons font variable diff --git a/bower.json b/bower.json index b286180e..7bd4fedb 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "edx-pattern-library", - "version": "0.16.3", + "version": "0.16.2", "authors": [ "edX Pattern Library Team " ], diff --git a/package.json b/package.json index c27d1c18..553097b3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "edx-pattern-library", - "version": "0.16.3", + "version": "0.16.2", "author": "edX Pattern Library Team ", "license": "Apache-2.0", "description": "The (working) Visual, UI, and Front End Styleguide for edX Apps",