From 79f454584e55f3c6997b61a21e74c82683a13f7f Mon Sep 17 00:00:00 2001 From: Michael Dinh Date: Thu, 28 Mar 2019 11:50:04 -0400 Subject: [PATCH 1/2] add styling --- src/components/toolbar.scss | 16 ++++++++++++++++ src/styles.scss | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/components/toolbar.scss b/src/components/toolbar.scss index 66c293b..83277eb 100644 --- a/src/components/toolbar.scss +++ b/src/components/toolbar.scss @@ -1,9 +1,11 @@ +@import '../common/variables.scss'; .dw-toolbar { @apply bg-navy-blue p-0 !important; .v-toolbar__content{ @apply p-0 !important; } + .theme--light.v-btn:not(.v-btn--icon):not(.v-btn--flat), .theme--dark.v-btn:not(.v-btn--icon):not(.v-btn--flat){ @apply border-white text-white border-solid; @@ -11,6 +13,20 @@ height: 34px !important; border-radius: 4px; } + .theme--light.v-btn.v-btn--disabled { + @apply text-white !important; + opacity: 0.4; + .v-icon { + @apply text-white !important; + } + } + .split-button { + .v-menu__activator { + .theme--light.v-btn.v-btn--disabled:not(.v-btn--icon):not(.v-btn--flat):not(.v-btn--outline) { + background-color: $dude-red !important; + } + } + } .v-select{ @apply p-0 self-center; height: 34px; diff --git a/src/styles.scss b/src/styles.scss index b9d8b58..261f3e1 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -18,6 +18,6 @@ .v-btn { @apply rounded !important; &.v-btn--disabled .v-btn__content { - opacity: 0.2; + opacity: 0.4; } } \ No newline at end of file From 31dd9b9511da3dbd91d973f5e856c4c19e856aba Mon Sep 17 00:00:00 2001 From: Michael Dinh Date: Thu, 28 Mar 2019 15:31:11 -0400 Subject: [PATCH 2/2] fix styling --- src/components/toolbar.scss | 10 +++++++--- src/styles.scss | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/components/toolbar.scss b/src/components/toolbar.scss index 83277eb..2d55610 100644 --- a/src/components/toolbar.scss +++ b/src/components/toolbar.scss @@ -1,4 +1,3 @@ -@import '../common/variables.scss'; .dw-toolbar { @apply bg-navy-blue p-0 !important; @@ -15,7 +14,6 @@ } .theme--light.v-btn.v-btn--disabled { @apply text-white !important; - opacity: 0.4; .v-icon { @apply text-white !important; } @@ -23,7 +21,7 @@ .split-button { .v-menu__activator { .theme--light.v-btn.v-btn--disabled:not(.v-btn--icon):not(.v-btn--flat):not(.v-btn--outline) { - background-color: $dude-red !important; + @apply bg-dude-red !important; } } } @@ -58,5 +56,11 @@ @apply border-dude-blue !important; } } + .theme--light.v-btn.v-btn--disabled { + @apply text-dude-blue !important; + .v-icon { + @apply text-dude-blue !important; + } + } } } \ No newline at end of file diff --git a/src/styles.scss b/src/styles.scss index 261f3e1..42d1aee 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -17,7 +17,7 @@ .v-btn { @apply rounded !important; - &.v-btn--disabled .v-btn__content { + &.v-btn--disabled { opacity: 0.4; } } \ No newline at end of file