From b4a7dbfb2093e7f682585a991f966f57f665af6c Mon Sep 17 00:00:00 2001 From: Nejc Zdovc Date: Wed, 21 Sep 2016 19:57:04 +0200 Subject: [PATCH] Keymap clone highlight color (#112) Adding global styles. Closes #110 --- src/components/keymap/header/keymap-header.component.scss | 4 +++- .../macro-action-editor/macro-action-editor.component.scss | 4 +++- src/components/macro/macro.component.scss | 4 +++- src/components/popover/tab/mouse/mouse-tab.component.scss | 4 +++- src/components/popover/widgets/icon/icon.component.scss | 4 +++- src/main-app/global-styles.scss | 1 + 6 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 src/main-app/global-styles.scss diff --git a/src/components/keymap/header/keymap-header.component.scss b/src/components/keymap/header/keymap-header.component.scss index 5620f0bc..2b40e36a 100644 --- a/src/components/keymap/header/keymap-header.component.scss +++ b/src/components/keymap/header/keymap-header.component.scss @@ -1,3 +1,5 @@ +@import '../../../main-app/global-styles'; + .keymap { &__is-default { @@ -28,7 +30,7 @@ &:hover { cursor: pointer; - color: #900; + color: $icon-hover; } } } diff --git a/src/components/macro/macro-action-editor/macro-action-editor.component.scss b/src/components/macro/macro-action-editor/macro-action-editor.component.scss index cc7983a1..1ea3c272 100644 --- a/src/components/macro/macro-action-editor/macro-action-editor.component.scss +++ b/src/components/macro/macro-action-editor/macro-action-editor.component.scss @@ -1,3 +1,5 @@ +@import '../../../main-app/global-styles'; + .action--editor { padding-top: 0; padding-bottom: 0; @@ -38,7 +40,7 @@ height: 0; top: 0; right: -4rem; - border-color: transparent transparent transparent #337ab7; + border-color: transparent transparent transparent $icon-hover; border-style: solid; border-width: 2rem; } diff --git a/src/components/macro/macro.component.scss b/src/components/macro/macro.component.scss index 22d016cc..8e86418b 100644 --- a/src/components/macro/macro.component.scss +++ b/src/components/macro/macro.component.scss @@ -1,3 +1,5 @@ +@import '../../main-app/global-styles'; + :host { display: flex; flex-direction: column; @@ -111,7 +113,7 @@ h1 { &--link:active, &--link:hover { text-decoration: none; - color: #337ab7; + color: $icon-hover; } } diff --git a/src/components/popover/tab/mouse/mouse-tab.component.scss b/src/components/popover/tab/mouse/mouse-tab.component.scss index d403358e..2afeee7f 100644 --- a/src/components/popover/tab/mouse/mouse-tab.component.scss +++ b/src/components/popover/tab/mouse/mouse-tab.component.scss @@ -1,3 +1,5 @@ +@import '../../../../main-app/global-styles'; + :host { display: flex; @@ -35,7 +37,7 @@ height: 0; top: 0; right: -4rem; - border-color: transparent transparent transparent #337ab7; + border-color: transparent transparent transparent $icon-hover; border-style: solid; border-width: 2rem; } diff --git a/src/components/popover/widgets/icon/icon.component.scss b/src/components/popover/widgets/icon/icon.component.scss index fc014389..0a084a3d 100644 --- a/src/components/popover/widgets/icon/icon.component.scss +++ b/src/components/popover/widgets/icon/icon.component.scss @@ -1,3 +1,5 @@ +@import '../../../../main-app/global-styles'; + :host { display: flex; align-items: center; @@ -7,7 +9,7 @@ &--edit { &:hover { - color: #337ab7; + color: $icon-hover; cursor: pointer; } } diff --git a/src/main-app/global-styles.scss b/src/main-app/global-styles.scss new file mode 100644 index 00000000..6a864db8 --- /dev/null +++ b/src/main-app/global-styles.scss @@ -0,0 +1 @@ +$icon-hover: #337ab7;