Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Tab colors with its own variables #3274

Merged
merged 1 commit into from
Jul 18, 2019
Merged

Update Tab colors with its own variables #3274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions backend/app/assets/stylesheets/spree/backend/components/_tabs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.tabs {
display: flex;
margin: 1em 0;
border-bottom: 1px solid $color-border;
border-bottom: 1px solid $color-tab-border;
white-space: nowrap;

&,
Expand All @@ -26,9 +26,9 @@
top: 2px;

> a {
color: $color-navbar-submenu;
color: $color-tab;
display: block;
border: 1px solid $color-border;
border: 1px solid $color-tab-border;
border-radius: 4px 4px 0 0;
line-height: 1;
}
Expand All @@ -38,19 +38,19 @@
}

&:not(.active) > a {
background: $color-tbl-thead;
background: $color-tab-bg;
}

&.active > a,
&.active:hover {
background: white;
border-bottom-color: white;
color: $color-navbar-active;
background: $color-tab-active-bg;
border-bottom-color: $color-tab-active-border;
color: $color-tab-active;
font-weight: $font-weight-bold;
}

&:not(.active):hover > a {
color: $color-navbar-active;
color: $color-tab-active;
}
}

Expand All @@ -70,7 +70,7 @@

> a {
position: relative;
background: white;
background: $color-tab-active-bg;
z-index: 1;

&:before {
Expand All @@ -81,7 +81,7 @@
}

&:hover > a {
background: white;
background: $color-tab-active-bg;
}

&:not(:hover) ul {
Expand All @@ -99,7 +99,7 @@
.tabs li.in-dropdown {
a {
display: block;
border: 1px solid $color-border;
border: 1px solid $color-tab-border;
background: white;
}

Expand Down
8 changes: 8 additions & 0 deletions backend/app/assets/stylesheets/spree/backend/globals/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@ $color-navbar-footer-bg: $color-light !default;
$color-navbar-footer-active: $color-primary !default;
$color-icon-navbar: $color-dark-light !default;

// Basic Tabs colors
$color-tab: $color-dark-light !default;
$color-tab-bg: very-light($color-dark-light, 4) !default;
$color-tab-border: $color-border !default;
$color-tab-active: $color-primary !default;
$color-tab-active-bg: $color-white !default;
$color-tab-active-border: $color-white !default;

// Basic flash colors
@include bs-deprecated-variable("color-success", "brand-success");
$color-success: $color-green !default;
Expand Down