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

Recolor admin nav #603

Merged
merged 5 commits into from
Jan 14, 2016
+85 −18
Merged

Recolor admin nav #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
022daea
Add $border-sidebar variable
Sinetheta Dec 22, 2015
af94952
Add navbar footer variables
Sinetheta Dec 22, 2015
d56c1a1
Prepare variables for admin recolor
Sinetheta Dec 22, 2015
1134c1e
Adjust navbar spacing
Sinetheta Dec 18, 2015
ea22dff
Dark admin navbar
Sinetheta Dec 22, 2015
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
for more information and instructions on upgrading.
* [Solidus_auth_devise](https://github.com/solidusio/solidus_auth_devise)
should be updated to '~> 1.3' to support the new menu.
* Added optional styles to the admin area to advance [admin rebrand](https://github.com/solidusio/solidus/issues/520).
To use the new colors, add `@import 'spree/backend/themes/blue_steel/globals/_variables_override';`
to your `spree/backend/globals/variables_override`.

* Removed deface requirement from core

Expand Down
56 changes: 42 additions & 14 deletions backend/app/assets/stylesheets/spree/backend/components/_navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
$padding-x-navbar: 26px;
$padding-y-navbar: 13px;
$padding-y-navbar-submenu: 9px;

nav.menu {
ul {
list-style: none;
Expand All @@ -24,14 +28,12 @@ nav.menu {
}

.admin-nav {
border-right: 1px solid $color-sidebar-border;
border-right: $border-sidebar;
background: $color-sidebar-bg;
z-index: $z-index-navbar-flyout;
}

.admin-nav-menu {
text-transform: uppercase;

ul {
margin: 0;
padding: 0;
Expand All @@ -41,9 +43,20 @@ nav.menu {
li {
background: $color-navbar-bg;

&:hover,
&:hover {
background: $color-navbar-active-bg;

> a {
color: $color-navbar-active;
}
}

&.selected {
background: $color-navbar-active-bg;

> a {
color: $color-navbar-active;
}
}

&.selected li {
Expand All @@ -64,24 +77,23 @@ nav.menu {
left: 100%;
width: $width-sidebar-flyout;
margin-left: 0;
padding: 1em 0;
border: 1px solid $color-sidebar-border;
border: $border-sidebar;
background: $color-navbar-submenu-bg;
box-shadow: $box-shadow;
@include caret($direction: left, $color-caret: $color-navbar-submenu-bg);

&:before {
z-index: 1;
top: 2em;
top: 1.5em;
}
}
}
}

a {
display: block;
padding: 1.5em 2em;
color: $color-navbar-text;
padding: $padding-y-navbar $padding-x-navbar;
color: $color-navbar;
font-weight: normal;
}

Expand All @@ -103,32 +115,48 @@ nav.menu {
}

.admin-subnav {
background: $color-navbar-submenu-bg;
@include padding($padding-y-navbar - $padding-y-navbar-submenu null);

li {
background: $color-navbar-submenu-bg;
}

a {
color: $color-navbar-bg;
@include padding(1em null);
color: $color-navbar-submenu;
@include padding($padding-y-navbar-submenu null);

&:hover {
color: $color-navbar-active-bg;
color: $color-navbar-submenu-active;
}
}

.selected {
a {
color: $color-navbar-active-bg;
color: $color-navbar-submenu-active;
}
}
}
}

.admin-nav-footer {
background-color: $color-navbar-footer-bg;

a {
color: $color-navbar-footer;

&:hover {
color: $color-navbar-footer-active;
}
}
}

.admin-nav.fits .admin-nav-footer {
position: fixed;
bottom: 0;
width: $width-sidebar;
border-top: 1px solid $color-sidebar-border;
border-top: $border-sidebar;
border-right: $border-sidebar;
}

.admin-login-nav {
Expand Down
19 changes: 15 additions & 4 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 @@ -19,7 +19,7 @@ $color-6: #FF9300 !default; // Yellow
$color-7: #F4F4F4 !default; // Light Gray

// Basic accents for admin
$box-shadow: 0px 3px 3px -2px hsla(0, 0%, 0%, 0.2);
$box-shadow: 0px 3px 3px -2px hsla(0, 0%, 0%, 0.2) !default;

// Body base colors
$color-body-bg: $color-1 !default;
Expand All @@ -34,11 +34,18 @@ $color-border: very-light($color-3, 12) !default;

// Basic navigation colors
$color-sidebar-bg: $color-body-bg !default;
$color-sidebar-border: $color-border !default;
$color-sidebar-border: $color-border !default;
$color-navbar: $color-1 !default;
$color-navbar-bg: $color-3 !default;
$color-navbar-active: $color-1 !default;
$color-navbar-active-bg: $color-2 !default;
$color-navbar-submenu: $color-3 !default;
$color-navbar-submenu-bg: very-light($color-navbar-bg, 4) !default;
$color-navbar-text: $color-1 !default;
$color-navbar-submenu-active: $color-2 !default;
$color-navbar-submenu-active-bg: $color-navbar-submenu-bg !default;
$color-navbar-footer: $color-3 !default;
$color-navbar-footer-bg: $color-sidebar-bg !default;
$color-navbar-footer-active: $color-2 !default;

// Basic flash colors
$color-success: $color-2 !default;
Expand Down Expand Up @@ -194,4 +201,8 @@ $width-sidebar-flyout: 225px !default;

// Stacking
//--------------------------------------------------------------
$z-index-navbar-flyout: 1000;
$z-index-navbar-flyout: 1000 !default;

// Sidebar
//--------------------------------------------------------------
$border-sidebar: 1px solid $color-sidebar-border !default;
25 changes: 25 additions & 0 deletions ...d/app/assets/stylesheets/spree/backend/themes/blue_steel/globals/_variables_override.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
$cerulean: hsl(216, 57, 47);

$white: hsl(220, 0, 100);
$gray-light: hsl(220, 9, 71);
$gray: hsl(220, 8, 23);
$gray-dark: hsl(220, 12, 18);
$black: hsl(220, 19, 13);

$color-primary: $cerulean;

$color-sidebar-bg: $gray;
$color-sidebar-border: very-light(#5498DA, 12); // $color-border
$color-navbar: $gray-light;
$color-navbar-bg: $gray;
$color-navbar-active: $white;
$color-navbar-active-bg: $color-primary;
$color-navbar-submenu: tint($gray-light, 40%);
$color-navbar-submenu-bg: $gray-dark;
$color-navbar-submenu-active: tint($color-primary, 20%);
$color-navbar-footer: $color-navbar;
$color-navbar-footer-active: $color-navbar-active;

// Sidebar
//--------------------------------------------------------------
$border-sidebar: none;