Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update colors #2911

Merged
merged 30 commits into from Feb 19, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
b0e832b
Use blue-cool-60v for info-darker (sync with accent-cool)
thisisdano Feb 13, 2019
9e186ea
Update state palettes
thisisdano Feb 13, 2019
69c2b66
Update info-light
thisisdano Feb 13, 2019
69eea15
Update error palette
thisisdano Feb 14, 2019
b2e8c7b
Add blue-cool-5v
thisisdano Feb 14, 2019
6b22069
Update blue-cool values
thisisdano Feb 14, 2019
d463050
Add red-cool-10v
thisisdano Feb 14, 2019
a02cf83
Update red-60v and red-70v
thisisdano Feb 14, 2019
3e4d27e
Update accent-cool family
thisisdano Feb 14, 2019
65848ac
Update secondary family
thisisdano Feb 14, 2019
24ced74
Update gray-cool
thisisdano Feb 14, 2019
809a8a1
Update base family
thisisdano Feb 14, 2019
6ed7da6
Update blue-warm (desaturate)
thisisdano Feb 14, 2019
2c8da97
Update gold-10v
thisisdano Feb 14, 2019
209a26f
Update yellow-20v
thisisdano Feb 14, 2019
682f671
Update blue-50
thisisdano Feb 14, 2019
a39f333
Update blue-50
thisisdano Feb 14, 2019
ea4e167
Use blue-50(v) for primary(-vivid)
thisisdano Feb 14, 2019
a758b7e
Revert to previous settings for primary and primary-vivid
thisisdano Feb 14, 2019
236395c
Update green cool
thisisdano Feb 14, 2019
d2f780c
Update blue-warm-10
thisisdano Feb 14, 2019
1a067ff
Add blue-cool-80v
thisisdano Feb 14, 2019
ce21521
Update blue-cool-30v
thisisdano Feb 14, 2019
8659668
Update mint family
thisisdano Feb 15, 2019
00bba5a
Update blue-40v
thisisdano Feb 15, 2019
bc65825
Saturate blue-cool-20/30/40
thisisdano Feb 15, 2019
8c86120
Updat orange
thisisdano Feb 15, 2019
e62e004
Update orange
thisisdano Feb 15, 2019
6e379a2
Update orange-5v
thisisdano Feb 15, 2019
e9a5100
Don't use family vars in color settings
thisisdano Feb 19, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/data/colors/blue-cool.json
Expand Up @@ -8,9 +8,9 @@
"value": [
{ "name": "5", "value": "#e7f2f5" },
{ "name": "10", "value": "#dae9ee" },
{ "name": "20", "value": "#b8cdd5" },
{ "name": "30", "value": "#92b1bf" },
{ "name": "40", "value": "#6b96a8" },
{ "name": "20", "value": "#adcfdc" },
{ "name": "30", "value": "#82b4c9" },
{ "name": "40", "value": "#6499af" },
{ "name": "50", "value": "#3a7d95" },
{ "name": "60", "value": "#2e6276" },
{ "name": "70", "value": "#224a58" },
Expand All @@ -19,15 +19,15 @@
{
"name": "vivid",
"value": [
{ "name": "5", "value": false },
{ "name": "5", "value": "#e1f3f8" },
{ "name": "10", "value": false },
{ "name": "20", "value": "#a9d0df" },
{ "name": "30", "value": "#83b5c9" },
{ "name": "40", "value": "#529ab7" },
{ "name": "20", "value": "#97d4ea" },
{ "name": "30", "value": "#59b9de" },
{ "name": "40", "value": "#28a0cb" },
{ "name": "50", "value": "#0d7ea2" },
{ "name": "60", "value": "#07648d" },
{ "name": "70", "value": "#074b69" },
{ "name": "80", "value": false },
{ "name": "80", "value": "#002d3f" },
{ "name": "90", "value": false }
]
}
Expand Down
12 changes: 6 additions & 6 deletions src/data/colors/blue-warm.json
Expand Up @@ -7,11 +7,11 @@
"name": "blue-warm",
"value": [
{ "name": "5", "value": "#ecf1f7" },
{ "name": "10", "value": "#dfe7f5" },
{ "name": "20", "value": "#bccae6" },
{ "name": "30", "value": "#93afda" },
{ "name": "40", "value": "#6f92ca" },
{ "name": "50", "value": "#3e76c2" },
{ "name": "10", "value": "#e1e7f1" },
{ "name": "20", "value": "#bbcae4" },
{ "name": "30", "value": "#98afd2" },
{ "name": "40", "value": "#7292c7" },
{ "name": "50", "value": "#4a77b4" },
{ "name": "60", "value": "#345d96" },
{ "name": "70", "value": "#2f4668" },
{ "name": "80", "value": "#252f3e" },
Expand All @@ -37,4 +37,4 @@
"options": {
"file": "system-color"
}
}
}
6 changes: 3 additions & 3 deletions src/data/colors/blue.json
Expand Up @@ -11,7 +11,7 @@
{ "name": "20", "value": "#aacdec" },
{ "name": "30", "value": "#73b3e7" },
{ "name": "40", "value": "#4f97d1" },
{ "name": "50", "value": "#357ab2" },
{ "name": "50", "value": "#2378c3" },
{ "name": "60", "value": "#2c608a" },
{ "name": "70", "value": "#274863" },
{ "name": "80", "value": "#1f303e" },
Expand All @@ -23,7 +23,7 @@
{ "name": "10", "value": false },
{ "name": "20", "value": false },
{ "name": "30", "value": "#58b4ff" },
{ "name": "40", "value": "#0096f4" },
{ "name": "40", "value": "#2491ff" },
{ "name": "50", "value": "#0076d6" },
{ "name": "60", "value": "#005ea2" },
{ "name": "70", "value": "#0b4778" },
Expand All @@ -37,4 +37,4 @@
"options": {
"file": "system-color"
}
}
}
2 changes: 1 addition & 1 deletion src/data/colors/gold.json
Expand Up @@ -20,7 +20,7 @@
"name": "vivid",
"value": [
{ "name": "5", "value": "#fef0c8" },
{ "name": "10", "value": "#ffe3a3" },
{ "name": "10", "value": "#ffe396" },
{ "name": "20", "value": "#ffbe2e" },
{ "name": "30", "value": "#e5a000" },
{ "name": "40", "value": "#c2850c" },
Expand Down
6 changes: 3 additions & 3 deletions src/data/colors/gray-cool.json
Expand Up @@ -11,13 +11,13 @@
{ "name": "3", "value": "#f5f6f7" },
{ "name": "4", "value": "#f1f3f6" },
{ "name": "5", "value": "#edeff0" },
{ "name": "10", "value": "#dbdee1" },
{ "name": "10", "value": "#dcdee0" },
{ "name": "20", "value": "#c6cace" },
{ "name": "30", "value": "#a9aeb1" },
{ "name": "40", "value": "#8d9297" },
{ "name": "50", "value": "#71767a" },
{ "name": "60", "value": "#585c62" },
{ "name": "70", "value": "#424549" },
{ "name": "60", "value": "#565c65" },
{ "name": "70", "value": "#3d4551" },
{ "name": "80", "value": "#2d2e2f" },
{ "name": "90", "value": "#1c1d1f" }
]
Expand Down
34 changes: 17 additions & 17 deletions src/data/colors/green-cool.json
Expand Up @@ -6,25 +6,25 @@
{
"name": "green-cool",
"value": [
{ "name": "5", "value": "#e3f5e1" },
{ "name": "10", "value": "#caf0c7" },
{ "name": "20", "value": "#9cd899" },
{ "name": "30", "value": "#77bd75" },
{ "name": "40", "value": "#52a251" },
{ "name": "50", "value": "#3e8520" },
{ "name": "60", "value": "#466432" },
{ "name": "70", "value": "#364b29" },
{ "name": "80", "value": "#293024" },
{ "name": "90", "value": "#141814" },
{ "name": "5", "value": "#ecf3ec" },
{ "name": "10", "value": "#dbebde" },
{ "name": "20", "value": "#b4d0b9" },
{ "name": "30", "value": "#86b98e" },
{ "name": "40", "value": "#5e9f69" },
{ "name": "50", "value": "#4d8055" },
{ "name": "60", "value": "#446443" },
{ "name": "70", "value": "#37493b" },
{ "name": "80", "value": "#28312a" },
{ "name": "90", "value": "#1a1f1a" },
{
"name": "vivid",
"value": [
{ "name": "5", "value": "#dcf8da" },
{ "name": "10", "value": "#a4ef9f" },
{ "name": "20", "value": "#6dd765" },
{ "name": "30", "value": "#2cc821" },
{ "name": "40", "value": "#0ca900" },
{ "name": "50", "value": "#178800" },
{ "name": "5", "value": "#e3f5e1" },
{ "name": "10", "value": "#b7f5bd" },
{ "name": "20", "value": "#70e17b" },
{ "name": "30", "value": "#21c834" },
{ "name": "40", "value": "#00a91c" },
{ "name": "50", "value": "#008817" },
{ "name": "60", "value": false },
{ "name": "70", "value": false },
{ "name": "80", "value": false },
Expand All @@ -37,4 +37,4 @@
"options": {
"file": "system-color"
}
}
}
12 changes: 6 additions & 6 deletions src/data/colors/mint.json
Expand Up @@ -6,10 +6,10 @@
{
"name": "mint",
"value": [
{ "name": "5", "value": "#c9fbeb" },
{ "name": "10", "value": "#97f9d8" },
{ "name": "20", "value": "#48e1af" },
{ "name": "30", "value": "#48c198" },
{ "name": "5", "value": "#dbf6ed" },
{ "name": "10", "value": "#c7efe2" },
{ "name": "20", "value": "#92d9bb" },
{ "name": "30", "value": "#5abf95" },
{ "name": "40", "value": "#34a37e" },
{ "name": "50", "value": "#1f8462" },
{ "name": "60", "value": "#286846" },
Expand All @@ -19,7 +19,7 @@
{
"name": "vivid",
"value": [
{ "name": "5", "value": "#befde9" },
{ "name": "5", "value": "#c9fbeb" },
{ "name": "10", "value": "#5dfdc8" },
{ "name": "20", "value": "#0ceda6" },
{ "name": "30", "value": "#04c585" },
Expand All @@ -37,4 +37,4 @@
"options": {
"file": "system-color"
}
}
}
20 changes: 10 additions & 10 deletions src/data/colors/orange.json
Expand Up @@ -6,21 +6,21 @@
{
"name": "orange",
"value": [
{ "name": "5", "value": "#fceee2" },
{ "name": "10", "value": "#fce2c5" },
{ "name": "20", "value": "#fabd87" },
{ "name": "30", "value": "#eb9b59" },
{ "name": "40", "value": "#db7725" },
{ "name": "50", "value": "#a36830" },
{ "name": "60", "value": "#73563e" },
{ "name": "5", "value": "#f6efe9" },
{ "name": "10", "value": "#f2e4d4" },
{ "name": "20", "value": "#f3bf90" },
{ "name": "30", "value": "#f09860" },
{ "name": "40", "value": "#dd7533" },
{ "name": "50", "value": "#a86437" },
{ "name": "60", "value": "#775540" },
{ "name": "70", "value": "#524236" },
{ "name": "80", "value": "#332d27" },
{ "name": "90", "value": "#1b1614" },
{
"name": "vivid",
"value": [
{ "name": "5", "value": "#ffedda" },
{ "name": "10", "value": false },
{ "name": "5", "value": "#fef2e4" },
{ "name": "10", "value": "#fce2c5" },
{ "name": "20", "value": "#ffbc78" },
{ "name": "30", "value": "#fa9441" },
{ "name": "40", "value": "#e66f0e" },
Expand All @@ -37,4 +37,4 @@
"options": {
"file": "system-color"
}
}
}
2 changes: 1 addition & 1 deletion src/data/colors/red-cool.json
Expand Up @@ -20,7 +20,7 @@
"name": "vivid",
"value": [
{ "name": "5", "value": false },
{ "name": "10", "value": false },
{ "name": "10", "value": "#f8dfe2" },
{ "name": "20", "value": "#f8b9c5" },
{ "name": "30", "value": "#fd8ba0" },
{ "name": "40", "value": "#f45d79" },
Expand Down
6 changes: 3 additions & 3 deletions src/data/colors/red.json
Expand Up @@ -25,8 +25,8 @@
{ "name": "30", "value": "#ff8d7b" },
{ "name": "40", "value": "#fb5a47" },
{ "name": "50", "value": "#e52207" },
{ "name": "60", "value": "#b51d09" },
{ "name": "70", "value": "#8b1303" },
{ "name": "60", "value": "#b50909" },
{ "name": "70", "value": "#8b0a03" },
{ "name": "80", "value": "#5c1111" },
{ "name": "90", "value": false }
]
Expand All @@ -37,4 +37,4 @@
"options": {
"file": "system-color"
}
}
}
4 changes: 2 additions & 2 deletions src/data/colors/yellow.json
Expand Up @@ -21,7 +21,7 @@
"value": [
{ "name": "5", "value": false },
{ "name": "10", "value": "#fee685" },
{ "name": "20", "value": "#ffcb00" },
{ "name": "20", "value": "#face00" },
{ "name": "30", "value": false },
{ "name": "40", "value": false },
{ "name": "50", "value": false },
Expand All @@ -37,4 +37,4 @@
"options": {
"file": "system-color"
}
}
}
16 changes: 8 additions & 8 deletions src/stylesheets/core/system-tokens/_blue-cool.scss
Expand Up @@ -2,24 +2,24 @@ $system-color-blue-cool: (
'blue-cool': (
5: #e7f2f5,
10: #dae9ee,
20: #b8cdd5,
30: #92b1bf,
40: #6b96a8,
20: #adcfdc,
30: #82b4c9,
40: #6499af,
50: #3a7d95,
60: #2e6276,
70: #224a58,
80: #14333d,
90: #0f191c,
'vivid': (
5: false,
5: #e1f3f8,
10: false,
20: #a9d0df,
30: #83b5c9,
40: #529ab7,
20: #97d4ea,
30: #59b9de,
40: #28a0cb,
50: #0d7ea2,
60: #07648d,
70: #074b69,
80: false,
80: #002d3f,
90: false,
),
),
Expand Down
10 changes: 5 additions & 5 deletions src/stylesheets/core/system-tokens/_blue-warm.scss
@@ -1,11 +1,11 @@
$system-color-blue-warm: (
'blue-warm': (
5: #ecf1f7,
10: #dfe7f5,
20: #bccae6,
30: #93afda,
40: #6f92ca,
50: #3e76c2,
10: #e1e7f1,
20: #bbcae4,
30: #98afd2,
40: #7292c7,
50: #4a77b4,
60: #345d96,
70: #2f4668,
80: #252f3e,
Expand Down
4 changes: 2 additions & 2 deletions src/stylesheets/core/system-tokens/_blue.scss
Expand Up @@ -5,7 +5,7 @@ $system-color-blue: (
20: #aacdec,
30: #73b3e7,
40: #4f97d1,
50: #357ab2,
50: #2378c3,
60: #2c608a,
70: #274863,
80: #1f303e,
Expand All @@ -15,7 +15,7 @@ $system-color-blue: (
10: false,
20: false,
30: #58b4ff,
40: #0096f4,
40: #2491ff,
50: #0076d6,
60: #005ea2,
70: #0b4778,
Expand Down
2 changes: 1 addition & 1 deletion src/stylesheets/core/system-tokens/_gold.scss
Expand Up @@ -12,7 +12,7 @@ $system-color-gold: (
90: #191714,
'vivid': (
5: #fef0c8,
10: #ffe3a3,
10: #ffe396,
20: #ffbe2e,
30: #e5a000,
40: #c2850c,
Expand Down
6 changes: 3 additions & 3 deletions src/stylesheets/core/system-tokens/_gray-cool.scss
Expand Up @@ -5,13 +5,13 @@ $system-color-gray-cool: (
3: #f5f6f7,
4: #f1f3f6,
5: #edeff0,
10: #dbdee1,
10: #dcdee0,
20: #c6cace,
30: #a9aeb1,
40: #8d9297,
50: #71767a,
60: #585c62,
70: #424549,
60: #565c65,
70: #3d4551,
80: #2d2e2f,
90: #1c1d1f,
),
Expand Down