From 9791a7f30635c35cc885f64fc151e10f711994ec Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Thu, 14 May 2020 13:53:54 +0200 Subject: [PATCH 01/15] feat: add color white and remove purple (breaking change) Signed-off-by: peterpeterparker --- .../components/color/deckdeckgo-color.scss | 10 ++- .../src/components/color/deckdeckgo-color.tsx | 11 ++- webcomponents/color/src/index.html | 30 ++++---- .../color/src/utils/deckdeckgo-palette.ts | 70 +++++++++++-------- 4 files changed, 69 insertions(+), 52 deletions(-) diff --git a/webcomponents/color/src/components/color/deckdeckgo-color.scss b/webcomponents/color/src/components/color/deckdeckgo-color.scss index 5f34e4929..668224472 100644 --- a/webcomponents/color/src/components/color/deckdeckgo-color.scss +++ b/webcomponents/color/src/components/color/deckdeckgo-color.scss @@ -22,22 +22,22 @@ div.color-container { padding: 0; outline: var(--deckgo-button-outline, none); - border: var(--deckgo-button-border, none); } button { cursor: pointer; + border: 1px solid var(--deckdeckgo-palette-border-color, var(--deckdeckgo-palette-color-hex)); border-radius: var(--deckgo-button-border-radius, 50%); background: var(--deckdeckgo-palette-color-hex); &.selected { - box-shadow: 0 0 8px 4px rgba(var(--deckdeckgo-palette-color-rgb), 0.4); + box-shadow: 0 0 8px 4px rgba(var(--deckdeckgo-palette-box-shadow-color, var(--deckdeckgo-palette-color-rgb)), 0.4); } &:not(.selected):hover { - box-shadow: 0 0 8px 2px rgba(var(--deckdeckgo-palette-color-rgb), 0.4); + box-shadow: 0 0 8px 2px rgba(var(--deckdeckgo-palette-box-shadow-color, var(--deckdeckgo-palette-color-rgb)), 0.4); } } @@ -65,6 +65,10 @@ div.color-container { outline: var(--deckgo-button-more-outline, none); border: var(--deckgo-button-more-border, none); + &.selected { + border: 1px solid var(--deckdeckgo-palette-color-hex, var(--deckgo-button-more-border)); + } + background: var(--deckgo-button-more-background, transparent); } diff --git a/webcomponents/color/src/components/color/deckdeckgo-color.tsx b/webcomponents/color/src/components/color/deckdeckgo-color.tsx index 4d0762a31..04ee06555 100644 --- a/webcomponents/color/src/components/color/deckdeckgo-color.tsx +++ b/webcomponents/color/src/components/color/deckdeckgo-color.tsx @@ -7,7 +7,7 @@ import {DeckdeckgoPalette, DeckdeckgoPaletteColor, DEFAULT_PALETTE} from '../../ @Component({ tag: 'deckgo-color', styleUrl: 'deckdeckgo-color.scss', - shadow: true + shadow: true, }) export class DeckdeckgoColor { @Element() el: HTMLElement; @@ -151,7 +151,7 @@ export class DeckdeckgoColor { const color: DeckdeckgoPaletteColor = { hex: selectedColor, - rgb: rgb + rgb: rgb, }; this.applyColorHexChange(selectedColor, rgb); @@ -228,9 +228,14 @@ export class DeckdeckgoColor { return this.palette.map((element: DeckdeckgoPalette) => { const style = { '--deckdeckgo-palette-color-hex': `${element.color.hex}`, - '--deckdeckgo-palette-color-rgb': `${element.color.rgb}` + '--deckdeckgo-palette-color-rgb': `${element.color.rgb}`, }; + if (element.display) { + style['--deckdeckgo-palette-border-color'] = element.display.borderColor; + style['--deckdeckgo-palette-box-shadow-color'] = element.display.boxShadowColor; + } + return (