Skip to content

Changes to masthead and vertical nav based on ux designs #2030

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

Merged
merged 1 commit into from
Sep 7, 2017
Merged

Changes to masthead and vertical nav based on ux designs #2030

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
2 changes: 1 addition & 1 deletion app/styles/_navbar-vertical.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}

.navbar-pf-vertical {
background-color: @navbar-os-bg-color;
background-color: @navbar-pf-bg-color;
border-bottom: 1px solid @project-bar-border-color;
border-top: none;
min-height: 0;
Expand Down
16 changes: 8 additions & 8 deletions app/styles/_project-bar.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
.add-to-project {
align-items: center;
color: @color-pf-black-300;
color: @navbar-pf-vertical-color;
display: flex;
flex: 0 0 35px;
font-weight: 300;
Expand All @@ -42,7 +42,7 @@
}
> a {
align-items: center;
color: @color-pf-black-300;
color: @navbar-os-project-menu-color;
display: flex;
padding: 5px 0;
flex: 1 1 auto;
Expand Down Expand Up @@ -145,15 +145,15 @@
}
.dropdown-menu {
background-color: @navbar-os-project-menu-active-bg;
border-color: @navbar-os-project-border-color;
border-color: @navbar-os-project-menu-border-color;
border-radius: 0;
color: @navbar-os-project-menu-color;
margin-top: 0;
padding: 0;
li {
background-color: @navbar-os-project-menu-active-bg;
&.selected a {
background-color: @navbar-os-project-bg !important;
background-color: @navbar-os-project-menu-hover-bg !important;
border-color: transparent !important;
color: @navbar-os-project-menu-active-color;
&:after {
Expand All @@ -164,7 +164,7 @@
top:0;
display: block;
position: absolute;
background-color: @sidebar-os-active;
background-color: @navbar-os-project-menu-active-bar;
}
}
&.divider {
Expand All @@ -173,10 +173,10 @@
margin: 0 !important;
}
&:last-child > a { // "View all projects"
color: @sidebar-os-active !important;
color: @color-pf-blue-300 !important;
}
a {
color: @sidebar-os-color;
color: @navbar-os-project-menu-color;
font-weight: 300;
padding: 3px 5px 3px 16px;
@media(min-width: @screen-sm-min) {
Expand All @@ -186,7 +186,7 @@
&:hover, &:focus {
background-color: @navbar-os-project-menu-hover-bg;
border-color: transparent;
color: @sidebar-os-active-color;
color: @navbar-os-project-menu-active-color;
}
@media (max-width: @screen-xs-max) {
span.text {
Expand Down
48 changes: 12 additions & 36 deletions app/styles/_variables.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,14 @@
// Patternfly overrides
@dropdown-divider-margin: 4px 0;
@list-view-hover-bg: #fafafa;
@nav-pf-vertical-bg-color: #30363d;
@nav-pf-vertical-active-bg-color: #383f47; // #383f47 “very slightly tweaked from pf-black-800” ~ jhaines
@nav-pf-vertical-bg-color: @color-pf-black-900; // #292e34 vertical nav
@nav-pf-vertical-border-color: @project-bar-border-color;
@nav-pf-vertical-border-inset-color: @project-bar-border-inset-color;
@nav-pf-vertical-secondary-bg-color: @project-bar-bg;
@nav-pf-vertical-secondary-hover-color: lighten(@nav-pf-vertical-secondary-bg-color, 8%);
@nav-pf-vertical-secondary-hover-color: lighten(@nav-pf-vertical-active-bg-color, 8%);
@nav-pf-vertical-secondary-active-bg-color: @nav-pf-vertical-secondary-hover-color;
@nav-pf-vertical-width: 220px;
@navbar-pf-vertical-navbar-brand-padding: 20px 0;
@navbar-pf-bg-color: @navbar-os-bg-color;
@sidebar-pf-bg: @body-bg;
@navbar-pf-bg-color: @color-pf-black; // #030303 navbar
@table-cell-padding-bottom: 8px;
@table-cell-padding-top: 8px;

Expand All @@ -39,8 +37,6 @@
@btn-flat-border-color: #e7e7e7;
@component-label: 11px;
@console-panel-color: #fff;
@console-bright-blue: #00a8e1;
@console-dark-blue: #006e9c;
@console-text-color-default: @gray-dark;
@easeInCubic: cubic-bezier(0.55, 0.055, 0.675, 0.19);
@easeOutCubic: cubic-bezier(0.215, 0.61, 0.355, 1);
Expand All @@ -57,50 +53,30 @@
@middle-content-bottom-margin: @grid-gutter-width;
@middle-content-container-padding: floor((@grid-gutter-width / 2)); // 20px bootstrap default
@middle-content-container-padding-lg: (@middle-content-container-padding + 10px);
@navbar-header-offset: 2px;
@navbar-header-right-margin: 10px;
@navbar-os-header-height-desktop: 59px;
@navbar-os-header-height-mobile: 41px;
@navbar-os-bg-color: #1c2127;
@navbar-os-label-filter-bg: @navbar-os-project-menu-bg;
@navbar-os-project-bg: @navbar-os-bg-color;
@navbar-os-project-menu-active-bg: darken(@navbar-os-bg-color, 8%);
@navbar-os-project-menu-active-color: @sidebar-os-active-color;
@navbar-os-project-border-color: @navbar-os-project-menu-border;
@navbar-os-project-menu-bg: @navbar-os-bg-color;
@navbar-os-project-menu-border: #000;
@navbar-os-project-menu-border-inset: rgba(255,255,255,.1);
@navbar-os-project-menu-color: @sidebar-os-color;
@navbar-os-project-menu-hover-bg: @sidebar-os-active-bg;
@navbar-project-label-color: @sidebar-os-color;
@navbar-os-project-menu-active-bar: @nav-pf-vertical-active-icon-color;
@navbar-os-project-menu-active-bg: #000;
@navbar-os-project-menu-active-color: @nav-pf-vertical-active-color;
@navbar-os-project-menu-border-color: #000;
@navbar-os-project-menu-border-inset: @project-bar-border-inset-color;
@navbar-os-project-menu-color: @navbar-pf-vertical-color;
@navbar-os-project-menu-hover-bg: lighten(@project-bar-bg, 8%);
@panel-light: @body-bg;
@panel-shaded: #f2f2f2;
@project-bar-bg: #383f47;
@project-bar-bg: @color-pf-black-900; // #292e34 project bar
@project-bar-border-color: #050505;
@project-bar-border-inset-color: rgba(255,255,255,.04);
@project-bar-height-mobile: 28px;
@project-bar-height-desktop: 40px;
@project-bar-select-bg: darken(@project-bar-bg, 8%);
@scroll-shadows-bg-color: rgba(255, 255, 255, 1);
@scroll-shadows-bg-color-transparent: rgba(255, 255, 255, 0);
@sidebar-os-bg: #30363d;
@sidebar-os-color: #dbdada;
@sidebar-os-active-bg: #383f47;
@sidebar-os-active-color: lighten(@sidebar-os-color, 13%);
@sidebar-os-icon-hover-color: rgba(255,255,255, .7);
// @sidebar-os-border-color: #050505;
// @sidebar-os-border-inset-color: rgba(255,255,255,.04);
// @sidebar-os-hover-bg: #3f4750; // primary hover
// @sidebar-os-padding-x-secondary: 37px;
@sidebar-os-active: @console-bright-blue;
@sidebar-left-mobile: 250px;
@sidebar-left-width-lg: 210px;
@sidebar-left-width-md: 145px;
@sidebar-right-width-xlg: 480px;
@sidebar-right-width-lg: 400px;
@sidebar-right-width-md: 310px;
@sidebar-right-width-sm: 210px;
@screen-height-sm: 600px;
@scrollbar-thumb: rgba(0,0,0,.08);
@scrollbar-thumb-inverse: rgba(255,255,255,.25);
@scrollbar-thumb-hover: rgba(0,0,0,.18);
Expand Down
9 changes: 5 additions & 4 deletions app/styles/_vertical-nav.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
&.active > a,
&:focus > a,
&:hover > a {
background-color: @nav-pf-vertical-secondary-bg-color;
background-color: @nav-pf-vertical-active-bg-color;
font-weight: 300;
}
&:focus > a,
&:hover > a {
.pficon,
.fa {
color: @sidebar-os-icon-hover-color;
color: @nav-pf-vertical-active-color;
}
}
&.active > a {
Expand All @@ -58,6 +58,7 @@
padding: 10px 15px;
}
.fa, .pficon {
color: @nav-pf-vertical-icon-color;
font-size: (@font-size-base + 2);
@media(min-width: @screen-sm-min) {
font-size: (@font-size-base + 5);
Expand Down Expand Up @@ -96,15 +97,15 @@
}
.list-group-item.secondary-nav-item-pf {
&:hover > a:after {
color: @sidebar-os-icon-hover-color;
color: @nav-pf-vertical-active-color;
}
// right arrow alignment
> a:after {
font-size: 14px;
}
}
.nav-pf-secondary-nav {
background: @nav-pf-vertical-secondary-bg-color;
background: @nav-pf-vertical-active-bg-color;
border-left: 0;
border-right: 1px solid @nav-pf-vertical-border-color;
top:(@project-bar-height-mobile + @navbar-os-header-height-mobile);
Expand Down
Loading