From c0a396c22e47469da7bb9fd348b78914096c84f1 Mon Sep 17 00:00:00 2001 From: Erik Moldovan Date: Tue, 6 Mar 2018 18:26:57 -0500 Subject: [PATCH] The avatar colors are wrong. In fact, all the colors are wrong, but I'm scoping this fix to just the avatar colors. They are hard-coded into an array. The other colors are untouched. (#101) --- CHANGELOG.md | 4 ++++ VERSION | 2 +- app/public/components.css | 16 ++++++++-------- dist/component-avatar.css | 16 ++++++++-------- package-lock.json | 2 +- package.json | 2 +- quartz-js/components/avatar/styles/avatar.scss | 2 +- 7 files changed, 24 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a03cd17..12ea8ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### 1.6.14 +**2018-03-06** +* Fixed minor avatar coloring issues + ### 1.6.13 **2018-03-05** * Fixed default avatar styles that did not carry over diff --git a/VERSION b/VERSION index d4ca915..5577648 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.6.13 +1.6.14 diff --git a/app/public/components.css b/app/public/components.css index 078d46e..bcd0332 100644 --- a/app/public/components.css +++ b/app/public/components.css @@ -128,28 +128,28 @@ padding-top: 0px; } .avatar.color-blue, .new-avatar.color-blue { - background-color: #0F4E7B; } + background-color: #144f79; } .avatar.color-purple, .new-avatar.color-purple { - background-color: #783479; } + background-color: #8a3b7f; } .avatar.color-pink, .new-avatar.color-pink { - background-color: #fde5ec; } + background-color: #d1184d; } .avatar.color-orange, .new-avatar.color-orange { - background-color: #D06B5E; } + background-color: #da7868; } .avatar.color-green, .new-avatar.color-green { - background-color: #fafcf4; } + background-color: #9eba41; } .avatar.color-forest, .new-avatar.color-forest { - background-color: #9DBB36; } + background-color: #226657; } .avatar.color-light-blue, .new-avatar.color-light-blue { - background-color: #2b8eff; } + background-color: #30909d; } .avatar.color-gray, .new-avatar.color-gray { - background-color: #233741; } + background-color: #999999; } .avatar.color-teal, .new-avatar.color-teal { background-color: #22B9B0; } diff --git a/dist/component-avatar.css b/dist/component-avatar.css index 16df213..84f8969 100644 --- a/dist/component-avatar.css +++ b/dist/component-avatar.css @@ -55,28 +55,28 @@ padding-top: 0px; } .avatar.color-blue, .new-avatar.color-blue { - background-color: #0F4E7B; } + background-color: #144f79; } .avatar.color-purple, .new-avatar.color-purple { - background-color: #783479; } + background-color: #8a3b7f; } .avatar.color-pink, .new-avatar.color-pink { - background-color: #fde5ec; } + background-color: #d1184d; } .avatar.color-orange, .new-avatar.color-orange { - background-color: #D06B5E; } + background-color: #da7868; } .avatar.color-green, .new-avatar.color-green { - background-color: #fafcf4; } + background-color: #9eba41; } .avatar.color-forest, .new-avatar.color-forest { - background-color: #9DBB36; } + background-color: #226657; } .avatar.color-light-blue, .new-avatar.color-light-blue { - background-color: #2b8eff; } + background-color: #30909d; } .avatar.color-gray, .new-avatar.color-gray { - background-color: #233741; } + background-color: #999999; } .avatar.color-teal, .new-avatar.color-teal { background-color: #22B9B0; } diff --git a/package-lock.json b/package-lock.json index 2e7d8d1..539f672 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@vhx/quartz", - "version": "1.6.13", + "version": "1.6.14", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 36cac8a..2887c54 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@vhx/quartz", - "version": "1.6.13", + "version": "1.6.14", "description": "VHX Style Guide and JS Components.", "homepage": "https://github.com/vhx/quartz", "author": "VHX", diff --git a/quartz-js/components/avatar/styles/avatar.scss b/quartz-js/components/avatar/styles/avatar.scss index f07d475..8a2aa85 100644 --- a/quartz-js/components/avatar/styles/avatar.scss +++ b/quartz-js/components/avatar/styles/avatar.scss @@ -15,7 +15,7 @@ } } $avatar-colors-name: "blue", "purple", "pink", "orange", "green", "forest", "light-blue", "gray", "teal"; -$avatar-colors-hex: $vhx-blue, $vhx-purple, lighten($red, 50%), $vhx-orange, lighten($vhx-green, 50%), $vhx-green, lighten($navy, 50%), $gray-8, $teal-2; +$avatar-colors-hex: #144f79, #8a3b7f, #d1184d, #da7868, #9eba41, #226657, #30909d, #999999, #22B9B0; /*.....................................