diff --git a/app/components/vertical_ellipsis_menu/component.scss b/app/components/vertical_ellipsis_menu/component.scss index 9434a94bc4..03b5cb39d8 100644 --- a/app/components/vertical_ellipsis_menu/component.scss +++ b/app/components/vertical_ellipsis_menu/component.scss @@ -20,7 +20,7 @@ padding-top: 5px; padding-bottom: 5px; background-color: white; - @include defaultBoxShadow; + box-shadow: $box-shadow; border-radius: 3px; min-width: 80px; display: none; diff --git a/app/webpacker/css/admin_v3/components/navigation.scss b/app/webpacker/css/admin_v3/components/navigation.scss index e5d448f2d4..3b2c568646 100644 --- a/app/webpacker/css/admin_v3/components/navigation.scss +++ b/app/webpacker/css/admin_v3/components/navigation.scss @@ -61,7 +61,7 @@ nav.menu { } #admin-menu { - @include defaultBoxShadow; + box-shadow: $box-shadow; li { .dropdown { diff --git a/app/webpacker/css/admin_v3/components/pagination.scss b/app/webpacker/css/admin_v3/components/pagination.scss index 82642f54a6..98df96f06e 100644 --- a/app/webpacker/css/admin_v3/components/pagination.scss +++ b/app/webpacker/css/admin_v3/components/pagination.scss @@ -20,7 +20,7 @@ display: inline-block; text-align: center; background-color: $color-1; - @include defaultBoxShadow; + box-shadow: $box-shadow; border-radius: 4px; border: none; color: $color-8; @@ -77,7 +77,7 @@ background-color: $white; color: $near-black; - box-shadow: $color-btn-shadow; + box-shadow: $box-shadow; &.active { color: $white; diff --git a/app/webpacker/css/admin_v3/globals/variables.scss b/app/webpacker/css/admin_v3/globals/variables.scss index 7eecf26ea8..7a682d895d 100644 --- a/app/webpacker/css/admin_v3/globals/variables.scss +++ b/app/webpacker/css/admin_v3/globals/variables.scss @@ -40,7 +40,6 @@ $padding-tbl-cell-relaxed: 12px 12px; // Button colors $color-btn-bg: $teal !default; $color-btn-text: $white !default; -$color-btn-shadow: 0px 1px 0px rgba(0, 0, 0, 0.05), 0px 2px 2px rgba(0, 0, 0, 0.07) !default; $color-btn-hover-bg: $orient !default; $color-btn-hover-text: $white !default; $color-btn-hover-border: $dark-blue !default; @@ -161,6 +160,7 @@ $h2-size: $h3-size + 2 !default; $h1-size: $h2-size + 2 !default; $border-radius: 4px !default; +$box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.05), 0px 2px 2px rgba(0, 0, 0, 0.07) !default; $font-weight-bold: 600 !default; $font-weight-normal: 400 !default; diff --git a/app/webpacker/css/admin_v3/mixins.scss b/app/webpacker/css/admin_v3/mixins.scss index 5301558d32..c2471a52ba 100644 --- a/app/webpacker/css/admin_v3/mixins.scss +++ b/app/webpacker/css/admin_v3/mixins.scss @@ -1,7 +1,3 @@ -@mixin defaultBoxShadow { - box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.05), 0px 2px 2px rgba(0, 0, 0, 0.07); -} - @mixin arrowDown { content: " "; display: block; diff --git a/app/webpacker/css/admin_v3/shared/forms.scss b/app/webpacker/css/admin_v3/shared/forms.scss index 8a37545a29..601fad9bde 100644 --- a/app/webpacker/css/admin_v3/shared/forms.scss +++ b/app/webpacker/css/admin_v3/shared/forms.scss @@ -266,7 +266,7 @@ fieldset { } .form-actions { - @include defaultBoxShadow; + box-shadow: $box-shadow; background-color: $fair-pink; border: none; border-left: 4px solid $red;