Skip to content

Commit

Permalink
Merge pull request #348 from edx/clrux/color-cleanup-post-launch
Browse files Browse the repository at this point in the history 
Cleanup after a time-sensitive update
  • Loading branch information
Chris committed Jul 29, 2016
2 parents 9c8e7ad + fd11ff3 commit 636c548
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 128 deletions.
110 changes: 0 additions & 110 deletions pldoc/_design_elements/colors.md
View file
Expand Up @@ -839,116 +839,6 @@ info: These are the predefined colors used throughout our patterns. Each color i
<button type="button" class="swatch grayscale x-back" title="Gray Extra light background on white"></button>
</div>
</div>
<div class="row on-dark-grayscale">
<div class="col col-2">
<div class="swatch color-description copy">
dark
</div>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale dark" title="Gray Dark on dark gray"></button>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale base" title="Gray Base on dark gray"></button>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale accent" title="Gray Accent on dark gray"></button>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale back" title="Gray Background on dark gray"></button>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale x-back" title="Gray Extra light background on dark gray"></button>
</div>
</div>
<div class="row on-base-grayscale">
<div class="col col-2">
<div class="swatch color-description copy">
base
</div>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale dark" title="Gray Dark on base"></button>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale base" title="Gray Base on base"></button>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale accent" title="Gray Accent on base"></button>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale back" title="Gray Background on base"></button>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale x-back" title="Gray Extra light background on base"></button>
</div>
</div>
<div class="row on-accent-grayscale">
<div class="col col-2">
<div class="swatch color-description copy">
accent
</div>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale dark" title="Gray Dark on accent"></button>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale base" title="Gray Base on accent"></button>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale accent" title="Gray Accent on accent"></button>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale back" title="Gray Background on accent"></button>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale x-back" title="Gray Extra light background on accent"></button>
</div>
</div>
<div class="row on-back-grayscale">
<div class="col col-2">
<div class="swatch color-description copy">
back
</div>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale dark" title="Gray Dark on back"></button>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale base" title="Gray Base on back"></button>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale accent" title="Gray Accent on back"></button>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale back" title="Gray Background on back"></button>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale x-back" title="Gray Extra light background on back"></button>
</div>
</div>
<div class="row on-x-back-grayscale">
<div class="col col-2">
<div class="swatch color-description copy">
x-back
</div>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale dark" title="Gray Dark on x-back"></button>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale base" title="Gray Base on x-back"></button>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale accent" title="Gray Accent on x-back"></button>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale back" title="Gray Background on x-back"></button>
</div>
<div class="col col-2">
<button type="button" class="swatch grayscale x-back" title="Gray Extra light background on x-back"></button>
</div>
</div>
</div>
</div>
</div>
Expand Down
36 changes: 18 additions & 18 deletions pldoc/static/js/colors_json.js
View file
Expand Up @@ -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']
}]
}]
}, {
Expand All @@ -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']
}]
}]
}, {
Expand All @@ -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']
}]
}]
}, {
Expand All @@ -133,7 +133,7 @@ define(function() {
title: 'Success Background',
description: 'Success messaging background color.',
recs: [{
back: ['black', 'x-dark', 'dark']
back: ['black', 'dark']
}]
}]
}, {
Expand All @@ -156,7 +156,7 @@ define(function() {
title: 'Error Background',
description: 'Error messaging background color.',
recs: [{
back: ['black', 'x-dark', 'dark']
back: ['black', 'dark']
}]
}]
}, {
Expand All @@ -172,7 +172,7 @@ define(function() {
title: 'Warning Background',
description: 'Warning messaging background color.',
recs: [{
back: ['black', 'x-dark', 'dark']
back: ['black', 'dark']
}]
}]
}]
Expand Down

0 comments on commit 636c548

Please sign in to comment.