From ea5f42a21fb58c452dd2d4021a42dff8db97b8a1 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Thu, 28 Sep 2017 15:54:16 -0700 Subject: [PATCH 01/10] Remove nav images; remove old nav styles; create new file for other navigation elements --- app/assets/images/new_nav.png | Bin 14322 -> 0 bytes app/assets/images/old_nav.png | Bin 25617 -> 0 bytes app/assets/stylesheets/framework.scss | 1 + app/assets/stylesheets/framework/blocks.scss | 4 + app/assets/stylesheets/framework/layout.scss | 4 - app/assets/stylesheets/framework/nav.scss | 542 ------------------ app/assets/stylesheets/framework/new-nav.scss | 5 - .../secondary-navigation-elements.scss | 337 +++++++++++ app/views/users/show.html.haml | 2 +- 9 files changed, 343 insertions(+), 552 deletions(-) delete mode 100644 app/assets/images/new_nav.png delete mode 100644 app/assets/images/old_nav.png create mode 100644 app/assets/stylesheets/framework/secondary-navigation-elements.scss diff --git a/app/assets/images/new_nav.png b/app/assets/images/new_nav.png deleted file mode 100644 index f98ca15d787ff70863a5aa44babab172ba0ad648..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14322 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 diff --git a/app/assets/images/old_nav.png b/app/assets/images/old_nav.png deleted file mode 100644 index 23fae7aa19e9f20fd8d258bcea1196844b3b3f08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25617 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 .btn, - > .btn-container, - > .dropdown, - > input, - > form { - margin-right: $gl-padding-top; - display: inline-block; - vertical-align: top; - - &:last-child { - margin-right: 0; - float: right; - } - } - - &.nav-controls-new-nav { - > .dropdown { - margin-right: 0; - } - } - - > .btn-grouped { - float: none; - } - - .icon-label { - display: none; - } - - input { - display: inline-block; - position: relative; - - /* Medium devices (desktops, 992px and up) */ - @media (min-width: $screen-md-min) { width: 200px; } - - /* Large devices (large desktops, 1200px and up) */ - @media (min-width: $screen-lg-min) { width: 250px; } - - &.input-short { - /* Medium devices (desktops, 992px and up) */ - @media (min-width: $screen-md-min) { width: 170px; } - - /* Large devices (large desktops, 1200px and up) */ - @media (min-width: $screen-lg-min) { width: 210px; } - } - } - - @media (max-width: $screen-xs-max) { - padding-bottom: 0; - width: 100%; - - .btn, - form, - .dropdown, - .dropdown-toggle, - .dropdown-menu-toggle, - .form-control { - margin: 0 0 10px; - display: block; - width: 100%; - } - - form { - display: block; - height: auto; - margin-bottom: 14px; - - input { - width: 100%; - margin: 0 0 10px; - } - } - - .input-short { - width: 100%; - } - - .icon-label { - display: inline-block; - } - - // Applies on /dashboard/issues - .project-item-select-holder { - margin: 0; - } - - &.inline { - display: flex; - flex-flow: row wrap; - justify-content: space-between; - - > .btn, - > .btn-container, - > .dropdown, - > input, - > form { - flex: 1 1 auto; - margin: 0 0 10px; - margin-left: $gl-padding-top; - width: auto; - - &:first-child { - margin-left: 0; - float: none; - } - } - - .btn-full { - flex: 1 1 100%; - margin-left: 0; - } - } - } - } - - &.adjust { - .nav-text, - .nav-controls { - width: auto; - - @media (max-width: $screen-xs-max) { - width: 100%; - } - } - } - - &.multi-line { - .nav-text { - line-height: 20px; - } - - .nav-controls { - padding: 17px 0; - } - } - - pre { - width: 100%; - } -} - .project-item-select-holder.btn-group { display: flex; max-width: 350px; @@ -307,272 +28,9 @@ @media(max-width: $screen-xs-max) { max-width: 250px; } - } } .new-project-item-select-button .fa-caret-down { margin-left: 2px; } - -.layout-nav { - width: 100%; - background: $gray-light; - border-bottom: 1px solid $border-color; - transition: padding $sidebar-transition-duration; - text-align: center; - margin-top: $new-navbar-height; - - .container-fluid { - position: relative; - - .nav-control { - @media (max-width: $screen-sm-max) { - margin-right: 2px; - } - } - } - - .controls { - float: right; - padding: 7px 0 0; - - i { - color: $layout-link-gray; - } - - .fa-rss, - .fa-cog { - font-size: 16px; - } - - .fa-caret-down { - margin-left: 5px; - color: $gl-text-color-secondary; - } - - .dropdown { - position: absolute; - top: 7px; - right: 15px; - z-index: 300; - - li.active { - font-weight: $gl-font-weight-bold; - } - } - } - - .nav-links { - border-bottom: none; - height: 51px; - - @media (min-width: $screen-sm-min) { - justify-content: center; - } - - li { - a { - padding-top: 10px; - } - } - } -} - -.with-performance-bar .layout-nav { - margin-top: $header-height + $performance-bar-height; -} - -.scrolling-tabs-container { - position: relative; - - .merge-request-tabs-container & { - overflow: hidden; - } - - .nav-links { - @include scrolling-links(); - } - - .fade-right { - @include fade(left, $gray-light); - right: -5px; - - .fa { - right: -7px; - } - } - - .fade-left { - @include fade(right, $gray-light); - left: -5px; - text-align: center; - - .fa { - left: -7px; - } - } - - &.sub-nav-scroll { - - .fade-right { - @include fade(left, $gray-normal); - right: 0; - - .fa { - right: -23px; - } - } - - .fade-left { - @include fade(right, $gray-normal); - left: 0; - - .fa { - left: 10px; - } - } - } -} - -.nav-block { - position: relative; - - .nav-links { - @include scrolling-links(); - - .fade-right { - @include fade(left, $white-light); - right: -5px; - - .fa { - right: -7px; - } - } - - .fade-left { - @include fade(right, $white-light); - left: -5px; - - .fa { - left: -7px; - } - } - } -} - -.page-with-layout-nav { - .right-sidebar { - top: ($header-height + 1) * 2; - } - - &.page-with-sub-nav { - .right-sidebar { - top: ($header-height + 1) * 3; - - &.affix { - top: $header-height; - } - } - } -} - -.with-performance-bar .page-with-layout-nav { - .right-sidebar { - top: ($header-height + 1) * 2 + $performance-bar-height; - } - - &.page-with-sub-nav { - .right-sidebar { - top: ($header-height + 1) * 3 + $performance-bar-height; - - &.affix { - top: $header-height + $performance-bar-height; - } - } - } -} - -.nav-block { - &.activities { - border-bottom: 1px solid $border-color; - - .nav-links { - border-bottom: none; - } - } -} - -@media (max-width: $screen-xs-max) { - .top-area { - flex-flow: row wrap; - - .nav-controls { - $controls-margin: $btn-xs-side-margin - 2px; - flex: 0 0 100%; - - &.controls-flex { - display: flex; - flex-flow: row wrap; - align-items: center; - justify-content: center; - padding: 0 0 $gl-padding-top; - } - - .controls-item, - .controls-item-full, - .controls-item:last-child { - flex: 1 1 35%; - display: block; - width: 100%; - margin: $controls-margin; - - .btn, - .dropdown { - margin: 0; - } - } - - .controls-item-full { - flex: 1 1 100%; - } - } - } -} - -.inner-page-scroll-tabs { - position: relative; - - .fade-right { - @include fade(left, $white-light); - right: 0; - text-align: right; - - .fa { - right: 5px; - } - } - - .fade-left { - @include fade(right, $white-light); - left: 0; - text-align: left; - - .fa { - left: 5px; - } - } - - .fade-right, - .fade-left { - top: 16px; - bottom: auto; - } - - &.is-smaller { - .fade-right, - .fade-left { - top: 11px; - } - } -} diff --git a/app/assets/stylesheets/framework/new-nav.scss b/app/assets/stylesheets/framework/new-nav.scss index 3abf3e4ac7d9..0cbbae26bdda 100644 --- a/app/assets/stylesheets/framework/new-nav.scss +++ b/app/assets/stylesheets/framework/new-nav.scss @@ -1,8 +1,3 @@ -@import "framework/variables"; -@import 'framework/tw_bootstrap_variables'; -@import "bootstrap/variables"; -@import "framework/mixins"; - .content-wrapper.page-with-new-nav { margin-top: $new-navbar-height; } diff --git a/app/assets/stylesheets/framework/secondary-navigation-elements.scss b/app/assets/stylesheets/framework/secondary-navigation-elements.scss new file mode 100644 index 000000000000..1b9a26512b41 --- /dev/null +++ b/app/assets/stylesheets/framework/secondary-navigation-elements.scss @@ -0,0 +1,337 @@ +// For tabbed navigation links, scrolling tabs, etc. For all top/main navigation, +// please check nav.scss +.nav-links { + display: flex; + padding: 0; + margin: 0; + list-style: none; + height: auto; + + li { + display: flex; + + a { + font-size: 14px; + line-height: 28px; + color: $gl-text-color-secondary; + border-bottom: 2px solid transparent; + white-space: nowrap; + + &:hover, + &:active, + &:focus { + text-decoration: none; + color: $black; + + .badge { + color: $black; + } + } + } + + &.active a { + color: $black; + font-weight: $gl-font-weight-bold; + + .badge { + color: $black; + } + } + } +} + +.top-area { + @include clearfix; + border-bottom: 1px solid $border-color; + + .nav-text { + padding-top: 16px; + padding-bottom: 11px; + display: inline-block; + line-height: 28px; + white-space: normal; + + /* Small devices (phones, tablets, 768px and lower) */ + @media (max-width: $screen-xs-max) { + width: 100%; + } + } + + .nav-links { + margin-bottom: 0; + border-bottom: none; + float: left; + + &.wide { + width: 100%; + display: block; + } + + &.scrolling-tabs { + float: left; + } + + li a { + padding: 16px 15px 11px; + } + + /* Small devices (phones, tablets, 768px and lower) */ + @media (max-width: $screen-xs-max) { + width: 100%; + } + } + + .nav-controls { + @include new-style-dropdown; + + display: inline-block; + float: right; + text-align: right; + padding: 11px 0; + margin-bottom: 0; + + > .btn, + > .btn-container, + > .dropdown, + > input, + > form { + margin-right: $gl-padding-top; + display: inline-block; + vertical-align: top; + + &:last-child { + margin-right: 0; + float: right; + } + } + + > .btn-grouped { + float: none; + } + + .icon-label { + display: none; + } + + input { + display: inline-block; + position: relative; + + /* Medium devices (desktops, 992px and up) */ + @media (min-width: $screen-md-min) { width: 200px; } + + /* Large devices (large desktops, 1200px and up) */ + @media (min-width: $screen-lg-min) { width: 250px; } + + &.input-short { + /* Medium devices (desktops, 992px and up) */ + @media (min-width: $screen-md-min) { width: 170px; } + + /* Large devices (large desktops, 1200px and up) */ + @media (min-width: $screen-lg-min) { width: 210px; } + } + } + + @media (max-width: $screen-xs-max) { + padding-bottom: 0; + width: 100%; + + .btn, + form, + .dropdown, + .dropdown-toggle, + .dropdown-menu-toggle, + .form-control { + margin: 0 0 10px; + display: block; + width: 100%; + } + + form { + display: block; + height: auto; + margin-bottom: 14px; + + input { + width: 100%; + margin: 0 0 10px; + } + } + + .input-short { + width: 100%; + } + + .icon-label { + display: inline-block; + } + + // Applies on /dashboard/issues + .project-item-select-holder { + margin: 0; + } + } + } + + &.adjust { + .nav-text, + .nav-controls { + width: auto; + + @media (max-width: $screen-xs-max) { + width: 100%; + } + } + } + + &.multi-line { + .nav-text { + line-height: 20px; + } + + .nav-controls { + padding: 17px 0; + } + } + + pre { + width: 100%; + } + + @media (max-width: $screen-xs-max) { + flex-flow: row wrap; + + .nav-controls { + $controls-margin: $btn-xs-side-margin - 2px; + flex: 0 0 100%; + + &.controls-flex { + display: flex; + flex-flow: row wrap; + align-items: center; + justify-content: center; + padding: 0 0 $gl-padding-top; + } + + .controls-item, + .controls-item-full, + .controls-item:last-child { + flex: 1 1 35%; + display: block; + width: 100%; + margin: $controls-margin; + + .btn, + .dropdown { + margin: 0; + } + } + + .controls-item-full { + flex: 1 1 100%; + } + } + } +} + +.scrolling-tabs-container { + position: relative; + + .merge-request-tabs-container & { + overflow: hidden; + } + + .nav-links { + @include scrolling-links(); + } + + .fade-right { + @include fade(left, $gray-light); + right: -5px; + + .fa { + right: -7px; + } + } + + .fade-left { + @include fade(right, $gray-light); + left: -5px; + text-align: center; + + .fa { + left: -7px; + } + } +} + +.inner-page-scroll-tabs { + position: relative; + + .fade-right { + @include fade(left, $white-light); + right: 0; + text-align: right; + + .fa { + right: 5px; + } + } + + .fade-left { + @include fade(right, $white-light); + left: 0; + text-align: left; + + .fa { + left: 5px; + } + } + + .fade-right, + .fade-left { + top: 16px; + bottom: auto; + } + + &.is-smaller { + .fade-right, + .fade-left { + top: 11px; + } + } +} + +.nav-block { + position: relative; + + .nav-links { + @include scrolling-links(); + + .fade-right { + @include fade(left, $white-light); + right: -5px; + + .fa { + right: -7px; + } + } + + .fade-left { + @include fade(right, $white-light); + left: -5px; + + .fa { + left: -7px; + } + } + } + + &.activities { + border-bottom: 1px solid $border-color; + + .nav-links { + border-bottom: none; + } + } +} diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index d0ffcc88d432..6c3cd6ecefe7 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -9,7 +9,7 @@ = auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity") .user-profile - .cover-block.user-cover-block.layout-nav + .cover-block.user-cover-block.top-area .cover-controls - if @user == current_user = link_to profile_path, class: 'btn btn-gray has-tooltip', title: 'Edit profile', 'aria-label': 'Edit profile' do -- GitLab From df06a576ae84e05fa58a74bbed5bc2416a665019 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Thu, 28 Sep 2017 16:17:04 -0700 Subject: [PATCH 02/10] Fix scrolling tabs --- app/assets/stylesheets/framework/blocks.scss | 6 ++++++ .../framework/secondary-navigation-elements.scss | 2 ++ 2 files changed, 8 insertions(+) diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index d63145771c91..dbd990f84c18 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -210,6 +210,12 @@ .nav-links { justify-content: center; + width: 100%; + float: none; + + &.scrolling-tabs { + float: none; + } } } diff --git a/app/assets/stylesheets/framework/secondary-navigation-elements.scss b/app/assets/stylesheets/framework/secondary-navigation-elements.scss index 1b9a26512b41..5be6bae33683 100644 --- a/app/assets/stylesheets/framework/secondary-navigation-elements.scss +++ b/app/assets/stylesheets/framework/secondary-navigation-elements.scss @@ -11,6 +11,8 @@ display: flex; a { + padding: $gl-btn-padding; + padding-bottom: 11px; font-size: 14px; line-height: 28px; color: $gl-text-color-secondary; -- GitLab From 90ccd30d33fe28d5e7d55c2a766fd18b96866822 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Thu, 28 Sep 2017 16:51:29 -0700 Subject: [PATCH 03/10] Fixes --- app/assets/stylesheets/framework/header.scss | 98 ------------------- app/assets/stylesheets/framework/nav.scss | 35 ------- app/assets/stylesheets/framework/new-nav.scss | 92 +++++++++++++++++ .../secondary-navigation-elements.scss | 37 +++++++ app/assets/stylesheets/pages/search.scss | 1 + 5 files changed, 130 insertions(+), 133 deletions(-) diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index d5fc0ee1918a..63eed636476c 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -6,8 +6,6 @@ header { @include new-style-dropdown; - transition: padding $sidebar-transition-duration; - &.navbar-empty { height: $header-height; background: $white-light; @@ -313,99 +311,3 @@ header { color: $red-500; } } - -.with-performance-bar header.navbar-gitlab { - top: $performance-bar-height; -} - -.with-performance-bar header.navbar-gitlab { - top: $performance-bar-height; -} - -.navbar-nav { - li { - .badge { - position: inherit; - font-weight: $gl-font-weight-normal; - margin-left: -6px; - font-size: 11px; - color: $white-light; - padding: 0 5px; - line-height: 12px; - border-radius: 7px; - box-shadow: 0 1px 0 rgba($gl-header-color, .2); - - &.issues-count { - background-color: $green-500; - } - - &.merge-requests-count { - background-color: $orange-600; - } - - &.todos-count { - background-color: $blue-500; - } - } - } -} - -@media (max-width: $screen-xs-max) { - header .container-fluid { - font-size: 18px; - - .navbar-nav { - display: table; - table-layout: fixed; - width: 100%; - margin: 0; - text-align: right; - } - - .navbar-collapse { - padding-left: 5px; - - .nav > li:not(.hidden-xs) { - display: table-cell !important; - width: 25%; - - a { - margin-right: 8px; - } - } - } - } - - .header-user-dropdown-toggle { - text-align: center; - } - - .header-user-avatar { - float: none; - } -} - -.header-user { - .dropdown-menu-nav { - width: auto; - min-width: 140px; - margin-top: -5px; - color: $gl-text-color; - left: auto; - - .current-user { - padding: 5px 18px; - - .user-name { - display: block; - } - } - } -} - -.header-user-avatar { - float: left; - margin-right: 5px; - border-radius: 50%; - border: 1px solid $avatar-border; -} diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index ca206ce818f7..8b137891791f 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -1,36 +1 @@ -.project-item-select-holder.btn-group { - display: flex; - max-width: 350px; - overflow: hidden; - float: right; - .new-project-item-link { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - - .new-project-item-select-button { - width: 32px; - } -} - -.empty-state .project-item-select-holder.btn-group { - float: none; - display: inline-block; - - .btn { - // overrides styles applied to plain `.empty-state .btn` - margin: 10px 0; - max-width: 300px; - width: auto; - - @media(max-width: $screen-xs-max) { - max-width: 250px; - } - } -} - -.new-project-item-select-button .fa-caret-down { - margin-left: 2px; -} diff --git a/app/assets/stylesheets/framework/new-nav.scss b/app/assets/stylesheets/framework/new-nav.scss index 0cbbae26bdda..03d3a97b9b2a 100644 --- a/app/assets/stylesheets/framework/new-nav.scss +++ b/app/assets/stylesheets/framework/new-nav.scss @@ -397,3 +397,95 @@ header.navbar-gitlab-new { background-color: $white-light; } } + +.navbar-nav { + li { + .badge { + position: inherit; + font-weight: $gl-font-weight-normal; + margin-left: -6px; + font-size: 11px; + color: $white-light; + padding: 0 5px; + line-height: 12px; + border-radius: 7px; + box-shadow: 0 1px 0 rgba($gl-header-color, .2); + + &.issues-count { + background-color: $green-500; + } + + &.merge-requests-count { + background-color: $orange-600; + } + + &.todos-count { + background-color: $blue-500; + } + } + } +} + +@media (max-width: $screen-xs-max) { + header .container-fluid { + font-size: 18px; + + .navbar-nav { + display: table; + table-layout: fixed; + width: 100%; + margin: 0; + text-align: right; + } + + .navbar-collapse { + padding-left: 5px; + + .nav > li:not(.hidden-xs) { + display: table-cell !important; + width: 25%; + + a { + margin-right: 8px; + } + } + } + } + + .header-user-dropdown-toggle { + text-align: center; + } + + .header-user-avatar { + float: none; + } +} + +.header-user { + .dropdown-menu-nav { + width: auto; + min-width: 140px; + margin-top: -5px; + color: $gl-text-color; + left: auto; + + .current-user { + padding: 5px 18px; + + .user-name { + display: block; + } + } + } +} + +.header-user-avatar { + float: left; + margin-right: 5px; + border-radius: 50%; + border: 1px solid $avatar-border; +} + +.with-performance-bar header.navbar-gitlab { + top: $performance-bar-height; +} diff --git a/app/assets/stylesheets/framework/secondary-navigation-elements.scss b/app/assets/stylesheets/framework/secondary-navigation-elements.scss index 5be6bae33683..5c96b3b78e74 100644 --- a/app/assets/stylesheets/framework/secondary-navigation-elements.scss +++ b/app/assets/stylesheets/framework/secondary-navigation-elements.scss @@ -337,3 +337,40 @@ } } } + +.project-item-select-holder.btn-group { + display: flex; + max-width: 350px; + overflow: hidden; + float: right; + + .new-project-item-link { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + .new-project-item-select-button { + width: 32px; + } +} + +.empty-state .project-item-select-holder.btn-group { + float: none; + display: inline-block; + + .btn { + // overrides styles applied to plain `.empty-state .btn` + margin: 10px 0; + max-width: 300px; + width: auto; + + @media(max-width: $screen-xs-max) { + max-width: 250px; + } + } +} + +.new-project-item-select-button .fa-caret-down { + margin-left: 2px; +} diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss index 89ebe3f99175..db0a04a5eb3f 100644 --- a/app/assets/stylesheets/pages/search.scss +++ b/app/assets/stylesheets/pages/search.scss @@ -47,6 +47,7 @@ input[type="checkbox"]:hover { } .location-badge { + height: 32px; font-size: 12px; margin: -4px 4px -4px -4px; line-height: 25px; -- GitLab From bd352f3006b7b8575d32a0d7070ff29c89c852b8 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Fri, 29 Sep 2017 14:03:50 -0700 Subject: [PATCH 04/10] Start moving new nav styles into header.scss --- app/assets/javascripts/shortcuts.js | 15 -- .../stylesheets/framework/animations.scss | 3 +- .../stylesheets/framework/dropdowns.scss | 2 +- .../stylesheets/framework/gitlab-theme.scss | 4 +- app/assets/stylesheets/framework/header.scss | 195 +++++------------- app/assets/stylesheets/framework/new-nav.scss | 86 +------- .../stylesheets/framework/new-sidebar.scss | 10 +- app/assets/stylesheets/framework/sidebar.scss | 6 +- .../stylesheets/framework/variables.scss | 3 +- app/assets/stylesheets/pages/builds.scss | 8 +- app/assets/stylesheets/pages/issuable.scss | 6 +- .../stylesheets/pages/merge_requests.scss | 4 +- app/views/layouts/header/_default.html.haml | 2 +- 13 files changed, 76 insertions(+), 268 deletions(-) diff --git a/app/assets/javascripts/shortcuts.js b/app/assets/javascripts/shortcuts.js index e754f6c44602..f63b99ba1c5b 100644 --- a/app/assets/javascripts/shortcuts.js +++ b/app/assets/javascripts/shortcuts.js @@ -18,23 +18,8 @@ import findAndFollowLink from './shortcuts_dashboard_navigation'; Mousetrap.bind('f', (e => this.focusFilter(e))); Mousetrap.bind('p b', this.onTogglePerfBar); - const $globalDropdownMenu = $('.global-dropdown-menu'); - const $globalDropdownToggle = $('.global-dropdown-toggle'); const findFileURL = document.body.dataset.findFile; - $('.global-dropdown').on('hide.bs.dropdown', () => { - $globalDropdownMenu.removeClass('shortcuts'); - }); - - Mousetrap.bind('n', () => { - $globalDropdownMenu.toggleClass('shortcuts'); - $globalDropdownToggle.trigger('click'); - - if (!$globalDropdownMenu.is(':visible')) { - $globalDropdownToggle.blur(); - } - }); - Mousetrap.bind('shift+t', () => findAndFollowLink('.shortcuts-todos')); Mousetrap.bind('shift+a', () => findAndFollowLink('.dashboard-shortcuts-activity')); Mousetrap.bind('shift+i', () => findAndFollowLink('.dashboard-shortcuts-issues')); diff --git a/app/assets/stylesheets/framework/animations.scss b/app/assets/stylesheets/framework/animations.scss index 667b73e150dd..f0e6b23757fc 100644 --- a/app/assets/stylesheets/framework/animations.scss +++ b/app/assets/stylesheets/framework/animations.scss @@ -115,8 +115,7 @@ @return $unfoldedTransition; } -.btn, -.global-dropdown-toggle { +.btn { @include transition(background-color, border-color, color, box-shadow); } diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index c0d8e6c328ce..112b939adbf5 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -878,7 +878,7 @@ @include new-style-dropdown('.breadcrumbs-list .dropdown '); @include new-style-dropdown('.js-namespace-select + '); -header.navbar-gitlab-new .header-content .dropdown-menu.projects-dropdown-menu { +header.header-content .dropdown-menu.projects-dropdown-menu { padding: 0; } diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss index 6b69e8018be7..a886cf5e9549 100644 --- a/app/assets/stylesheets/framework/gitlab-theme.scss +++ b/app/assets/stylesheets/framework/gitlab-theme.scss @@ -5,7 +5,7 @@ @mixin gitlab-theme($color-100, $color-200, $color-500, $color-700, $color-800, $color-900, $color-alternate) { // Header - header.navbar-gitlab-new { + header { background-color: $color-900; .navbar-collapse { @@ -200,7 +200,7 @@ body { &.ui_light { @include gitlab-theme($theme-gray-900, $theme-gray-700, $theme-gray-800, $theme-gray-700, $theme-gray-700, $theme-gray-100, $theme-gray-700); - header.navbar-gitlab-new { + header { background-color: $theme-gray-100; box-shadow: 0 2px 0 0 $border-color; diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 63eed636476c..c10e3467bef9 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -27,84 +27,28 @@ header { z-index: 1000; margin-bottom: 0; min-height: $header-height; - background-color: $gray-light; border: none; border-bottom: 1px solid $border-color; position: fixed; top: 0; left: 0; right: 0; - color: $gl-text-color-secondary; border-radius: 0; - @media (max-width: $screen-xs-min) { - padding: 0 16px; - } - - &.with-horizontal-nav { - border-bottom: 0; + .logo-text { + line-height: initial; - .navbar-border { - height: 1px; - position: absolute; - right: 0; - left: 0; - bottom: -1px; - background-color: $border-color; - opacity: 0; + svg { + width: 55px; + height: 14px; + margin: 0; + fill: $white-light; } } .container-fluid { - width: 100% !important; - filter: none; padding: 0; - .nav > li > a { - color: currentColor; - font-size: 18px; - padding: 0; - margin: (($header-height - 28) / 2) 3px; - margin-left: 8px; - height: 28px; - min-width: 32px; - line-height: 28px; - text-align: center; - - &.header-user-dropdown-toggle { - margin-left: 14px; - - &:hover, - &:focus, - &:active { - .header-user-avatar { - border-color: rgba($avatar-border, .2); - } - } - } - - &:hover, - &:focus, - &:active { - background-color: transparent; - color: $gl-text-color; - - svg { - fill: $gl-text-color; - } - } - - .fa-caret-down { - font-size: 14px; - } - - .fa-chevron-down { - position: relative; - top: -3px; - font-size: 10px; - } - } - .user-counter { svg { margin-right: 3px; @@ -112,36 +56,34 @@ header { } .navbar-toggle { - color: $nav-toggle-gray; - margin: 5px 0; - border-radius: 0; - right: -10px; - padding: 6px 10px; - - &:hover { - background-color: $white-normal; - } + min-width: 45px; + padding: 4px $gl-padding; + margin-right: -7px; + font-size: 14px; + text-align: center; + color: currentColor; + &:hover, + &:focus, &.active { - color: $gl-text-color-secondary; + color: currentColor; + background-color: transparent; } } } } - &.navbar-gitlab-new { - .close-icon { + .fa-times { + display: none; + } + + .menu-expanded { + .fa-ellipsis-v { display: none; } - .menu-expanded { - .more-icon { - display: none; - } - - .close-icon { - display: block; - } + .fa-times { + display: block; } } @@ -160,29 +102,11 @@ header { } } - .global-dropdown-toggle { - margin: 7px 0; - font-size: 18px; - padding: 6px 10px; - border: none; - background-color: $gray-light; - - &:hover { - background-color: $white-normal; - } - - &:focus { - outline: none; - background-color: $white-normal; - } - } - .header-content { display: flex; - justify-content: space-between; position: relative; min-height: $header-height; - padding-left: 30px; + padding-left: 0; &.menu-expanded { @media (max-width: $screen-xs-max) { @@ -218,38 +142,32 @@ header { } } - .group-name-toggle { - margin: 3px 5px; - } - - .group-title { - &.is-hidden { - .hidable:not(:last-of-type) { - display: none; - } - } - } - .title-container { display: flex; - align-items: flex-start; + -webkit-align-items: stretch; + align-items: stretch; + -webkit-flex: 1 1 auto; flex: 1 1 auto; - padding-top: 14px; - overflow: hidden; + padding-top: 0; + overflow: visible; } .title { + padding-right: 0; + color: currentColor; + display: -webkit-flex; + display: flex; position: relative; - padding-right: 20px; margin: 0; font-size: 18px; - line-height: 22px; - display: inline-block; - font-weight: $gl-font-weight-normal; - color: $gl-text-color; vertical-align: top; white-space: nowrap; + img { + height: 28px; + margin-right: 8px; + } + &.wrap { white-space: normal; } @@ -259,30 +177,17 @@ header { } a { - color: currentColor; + display: -webkit-flex; + display: flex; + align-items: center; + padding: 2px 8px; + margin: 5px 2px 5px -8px; + border-radius: $border-radius-default; - &:hover { - text-decoration: underline; - color: $gl-header-nav-hover-color; - } - } - - .dropdown-toggle-caret { - color: $gl-text-color; - border: transparent; - background: transparent; - position: absolute; - top: 2px; - right: 3px; - width: 12px; - line-height: 19px; - padding: 0; - font-size: 10px; - text-align: center; - cursor: pointer; - - &:hover { - color: $gl-header-nav-hover-color; + svg { + @media (min-width: $screen-sm-min) { + margin-right: 8px; + } } } diff --git a/app/assets/stylesheets/framework/new-nav.scss b/app/assets/stylesheets/framework/new-nav.scss index 03d3a97b9b2a..4eec18111587 100644 --- a/app/assets/stylesheets/framework/new-nav.scss +++ b/app/assets/stylesheets/framework/new-nav.scss @@ -1,67 +1,9 @@ .content-wrapper.page-with-new-nav { - margin-top: $new-navbar-height; + margin-top: $header-height; } -header.navbar-gitlab-new { - color: $white-light; - border-bottom: 0; - min-height: $new-navbar-height; - - .logo-text { - line-height: initial; - - svg { - width: 55px; - height: 14px; - margin: 0; - fill: $white-light; - } - } - +header { .header-content { - display: -webkit-flex; - display: flex; - padding-left: 0; - min-height: $new-navbar-height; - - .title-container { - display: -webkit-flex; - display: flex; - -webkit-align-items: stretch; - align-items: stretch; - -webkit-flex: 1 1 auto; - flex: 1 1 auto; - padding-top: 0; - overflow: visible; - } - - .title { - display: -webkit-flex; - display: flex; - padding-right: 0; - color: currentColor; - - img { - height: 28px; - margin-right: 8px; - } - - a { - display: -webkit-flex; - display: flex; - align-items: center; - padding: 2px 8px; - margin: 5px 2px 5px -8px; - border-radius: $border-radius-default; - - svg { - @media (min-width: $screen-sm-min) { - margin-right: 8px; - } - } - } - } - .dropdown.open { > a { border-bottom-color: $white-light; @@ -113,28 +55,6 @@ header.navbar-gitlab-new { } .container-fluid { - .navbar-toggle { - min-width: 45px; - padding: 0 $gl-padding; - margin-right: -7px; - text-align: center; - color: currentColor; - - svg { - fill: currentColor; - } - - &:hover, - &:focus, - &.active { - color: currentColor; - background-color: transparent; - - svg { - fill: currentColor; - } - } - } .navbar-nav { @media (max-width: $screen-xs-max) { @@ -242,7 +162,7 @@ header.navbar-gitlab-new { } } -.navbar-gitlab-new { +header { .navbar-sub-nav, .navbar-nav { > li { diff --git a/app/assets/stylesheets/framework/new-sidebar.scss b/app/assets/stylesheets/framework/new-sidebar.scss index 8332cec2962e..caf4c7a40b1d 100644 --- a/app/assets/stylesheets/framework/new-sidebar.scss +++ b/app/assets/stylesheets/framework/new-sidebar.scss @@ -24,7 +24,7 @@ $new-sidebar-collapsed-width: 50px; // Override position: absolute .right-sidebar { position: fixed; - height: calc(100% - #{$new-navbar-height}); + height: calc(100% - #{$header-height}); } .issues-bulk-update.right-sidebar.right-sidebar-expanded .issuable-sidebar-header { @@ -87,7 +87,7 @@ $new-sidebar-collapsed-width: 50px; z-index: 400; width: $new-sidebar-width; transition: left $sidebar-transition-duration; - top: $new-navbar-height; + top: $header-height; bottom: 0; left: 0; background-color: $gray-normal; @@ -197,7 +197,7 @@ $new-sidebar-collapsed-width: 50px; } .with-performance-bar .nav-sidebar { - top: $new-navbar-height + $performance-bar-height; + top: $header-height + $performance-bar-height; } .sidebar-sub-level-items { @@ -495,7 +495,7 @@ $new-sidebar-collapsed-width: 50px; // Make issue boards full-height now that sub-nav is gone .boards-list { - height: calc(100vh - #{$new-navbar-height}); + height: calc(100vh - #{$header-height}); @media (min-width: $screen-sm-min) { height: 475px; // Needed for PhantomJS @@ -506,5 +506,5 @@ $new-sidebar-collapsed-width: 50px; } .with-performance-bar .boards-list { - height: calc(100vh - #{$new-navbar-height} - #{$performance-bar-height}); + height: calc(100vh - #{$header-height} - #{$performance-bar-height}); } diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 48dc25d343b3..ef58382ba41f 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -78,16 +78,16 @@ .right-sidebar { border-left: 1px solid $border-color; - height: calc(100% - #{$new-navbar-height}); + height: calc(100% - #{$header-height}); &.affix { position: fixed; - top: $new-navbar-height; + top: $header-height; } } .with-performance-bar .right-sidebar.affix { - top: $new-navbar-height + $performance-bar-height; + top: $header-height + $performance-bar-height; } @mixin maintain-sidebar-dimensions { diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 2c34852300bd..8e43f5bc8f1d 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -220,8 +220,7 @@ $gl-sidebar-padding: 22px; $row-hover: $blue-50; $row-hover-border: $blue-200; $progress-color: #c0392b; -$header-height: 50px; -$new-navbar-height: 40px; +$header-height: 40px; $fixed-layout-width: 1280px; $limited-layout-width: 990px; $limited-layout-width-sm: 790px; diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss index 359dd388d053..50ec5110bf14 100644 --- a/app/assets/stylesheets/pages/builds.scss +++ b/app/assets/stylesheets/pages/builds.scss @@ -64,10 +64,10 @@ color: $gl-text-color; position: sticky; position: -webkit-sticky; - top: $new-navbar-height; + top: $header-height; &.affix { - top: $new-navbar-height; + top: $header-height; } // with sidebar @@ -174,10 +174,10 @@ .with-performance-bar .build-page { .top-bar { - top: $new-navbar-height + $performance-bar-height; + top: $header-height + $performance-bar-height; &.affix { - top: $new-navbar-height + $performance-bar-height; + top: $header-height + $performance-bar-height; } } } diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index d8d5fb48e677..ff7e6a75493f 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -218,7 +218,7 @@ .right-sidebar { position: absolute; - top: $new-navbar-height; + top: $header-height; bottom: 0; right: 0; transition: width $right-sidebar-transition-duration; @@ -483,10 +483,10 @@ } .with-performance-bar .right-sidebar { - top: $new-navbar-height + $performance-bar-height; + top: $header-height + $performance-bar-height; .issuable-sidebar { - height: calc(100% - #{$new-navbar-height} - #{$performance-bar-height}); + height: calc(100% - #{$header-height} - #{$performance-bar-height}); } } diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 9b5698b828d3..4ade931a8bda 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -639,7 +639,7 @@ } .merge-request-tabs-holder { - top: $new-navbar-height; + top: $header-height; z-index: 200; background-color: $white-light; border-bottom: 1px solid $border-color; @@ -669,7 +669,7 @@ } .with-performance-bar .merge-request-tabs-holder { - top: $new-navbar-height + $performance-bar-height; + top: $header-height + $performance-bar-height; } .merge-request-tabs { diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 9f8700cf3a4a..0f819c243ab8 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -1,6 +1,6 @@ = render "layouts/header/ee_license_banner" -%header.navbar.navbar-gitlab.navbar-gitlab-new +%header.navbar.navbar-gitlab %a.sr-only.gl-accessibility{ href: "#content-body", tabindex: "1" } Skip to content .container-fluid .header-content -- GitLab From bed2176e03af849e6d038e4a56bfcad63dbf811e Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Mon, 2 Oct 2017 07:57:15 -0700 Subject: [PATCH 05/10] Conflict fixes --- app/assets/stylesheets/framework/header.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index c10e3467bef9..32cf2f6aa3e0 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -57,7 +57,7 @@ header { .navbar-toggle { min-width: 45px; - padding: 4px $gl-padding; + padding: 0 $gl-padding; margin-right: -7px; font-size: 14px; text-align: center; @@ -73,16 +73,16 @@ header { } } - .fa-times { + .close-icon { display: none; } .menu-expanded { - .fa-ellipsis-v { + .more-icon { display: none; } - .fa-times { + .close-icon { display: block; } } -- GitLab From 75f0d0ee64f1f7f35fc5ff9a3af6ddbec0f2b540 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Mon, 2 Oct 2017 08:32:13 -0700 Subject: [PATCH 06/10] Fix specs --- app/assets/stylesheets/framework/header.scss | 2 ++ app/assets/stylesheets/framework/new-nav.scss | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 32cf2f6aa3e0..cd71d3c1dd9c 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -103,6 +103,7 @@ header { } .header-content { + display: -webkit-flex; display: flex; position: relative; min-height: $header-height; @@ -143,6 +144,7 @@ header { } .title-container { + display: -webkit-flex; display: flex; -webkit-align-items: stretch; align-items: stretch; diff --git a/app/assets/stylesheets/framework/new-nav.scss b/app/assets/stylesheets/framework/new-nav.scss index 4eec18111587..b75f008475d0 100644 --- a/app/assets/stylesheets/framework/new-nav.scss +++ b/app/assets/stylesheets/framework/new-nav.scss @@ -58,6 +58,7 @@ header { .navbar-nav { @media (max-width: $screen-xs-max) { + display: -webkit-flex; display: flex; padding-right: 10px; } @@ -178,6 +179,7 @@ header { } > a { + display: -webkit-flex; display: flex; align-items: center; justify-content: center; @@ -214,6 +216,7 @@ header { } .breadcrumbs { + display: -webkit-flex; display: flex; min-height: 48px; color: $gl-text-color; @@ -293,6 +296,7 @@ header { } .breadcrumbs-extra { + display: -webkit-flex; display: flex; flex: 0 0 auto; margin-left: auto; -- GitLab From aabc4ac24fa0ef703498e99b8e107db19f4995cb Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Fri, 6 Oct 2017 18:27:18 +0530 Subject: [PATCH 07/10] Remove unnecessary test --- spec/features/explore/new_menu_spec.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/spec/features/explore/new_menu_spec.rb b/spec/features/explore/new_menu_spec.rb index e1c74a24890a..c5ec495a4189 100644 --- a/spec/features/explore/new_menu_spec.rb +++ b/spec/features/explore/new_menu_spec.rb @@ -128,12 +128,6 @@ expect(find('.header-new.dropdown')).not_to have_selector('.header-new-project-snippet') end - scenario 'public project has no New Issue Button' do - visit project_path(public_project) - - hasnot_topmenuitem("New issue") - end - scenario 'public project has no New merge request menu item' do visit project_path(public_project) -- GitLab From 2584b97193c63b151481c31d1e8057743b18524b Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Fri, 6 Oct 2017 15:37:26 -0700 Subject: [PATCH 08/10] Finish combining nav styles --- app/assets/stylesheets/framework.scss | 3 - app/assets/stylesheets/framework/header.scss | 470 +++++++++++++++--- app/assets/stylesheets/framework/images.scss | 1 + app/assets/stylesheets/framework/nav.scss | 1 - app/assets/stylesheets/framework/new-nav.scss | 415 ---------------- .../stylesheets/framework/variables.scss | 1 + app/views/layouts/header/_default.html.haml | 4 +- 7 files changed, 415 insertions(+), 480 deletions(-) delete mode 100644 app/assets/stylesheets/framework/nav.scss delete mode 100644 app/assets/stylesheets/framework/new-nav.scss diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index 75e66b6f3303..0f612a69ae37 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -29,9 +29,6 @@ @import "framework/media_object"; @import "framework/mobile"; @import "framework/modal"; -@import "framework/media_object"; -@import "framework/nav"; -@import "framework/new-nav"; @import "framework/pagination"; @import "framework/panels"; @import "framework/secondary-navigation-elements"; diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index cd71d3c1dd9c..4693b4a18d7b 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -1,7 +1,6 @@ -/* - * Application Header - * - */ +.content-wrapper.page-with-new-nav { + margin-top: $header-height; +} header { @include new-style-dropdown; @@ -56,8 +55,10 @@ header { } .navbar-toggle { + right: -10px; + border-radius: 0; min-width: 45px; - padding: 0 $gl-padding; + padding: 0; margin-right: -7px; font-size: 14px; text-align: center; @@ -69,6 +70,12 @@ header { color: currentColor; background-color: transparent; } + + .more-icon, + .close-icon { + fill: $white-light; + margin: auto; + } } } } @@ -87,62 +94,14 @@ header { } } - .global-dropdown { - position: absolute; - left: -10px; - - .badge { - font-size: 11px; - } - - li { - &.active a { - font-weight: $gl-font-weight-bold; - } - } - } - .header-content { display: -webkit-flex; display: flex; + justify-content: space-between; position: relative; min-height: $header-height; padding-left: 0; - &.menu-expanded { - @media (max-width: $screen-xs-max) { - .header-logo, - .title-container { - display: none; - } - - .navbar-collapse { - display: block; - } - } - } - - .dropdown-menu { - margin-top: -5px; - } - - .header-logo { - display: inline-block; - margin: 0 12px 0 2px; - position: relative; - top: 10px; - transition-duration: .3s; - - svg, - img { - height: 28px; - } - - &:hover { - cursor: pointer; - } - } - .title-container { display: -webkit-flex; display: flex; @@ -199,15 +158,197 @@ header { } } - .navbar-collapse { - flex: 0 0 auto; - border-top: none; - padding: 0; + .dropdown.open { + > a { + border-bottom-color: $white-light; + } + } + + &.menu-expanded { + @media (max-width: $screen-xs-max) { + .title-container { + display: none; + } + + .navbar-collapse { + display: block; + } + } + } + } + + .dropdown-bold-header { + color: $gl-text-color-secondary; + font-size: 12px; + } + + .navbar-collapse { + flex: 0 0 auto; + border-top: none; + padding: 0; + + @media (max-width: $screen-xs-max) { + flex: 1 1 auto; + } + + .nav { + > li:not(.hidden-xs) a { + @media (max-width: $screen-xs-max) { + margin-left: 0; + min-width: 100%; + } + } + } + } + + .container-fluid { + .navbar-nav { @media (max-width: $screen-xs-max) { - flex: 1 1 auto; + display: -webkit-flex; + display: flex; + padding-right: 10px; + } + + li { + .badge { + box-shadow: none; + font-weight: $gl-font-weight-bold; + } + } + } + + .nav > li { + &.header-user { + @media (max-width: $screen-xs-max) { + padding-left: 10px; + } + } + + > a { + will-change: color; + margin: 4px 2px; + padding: 6px 8px; + height: 32px; + + @media (max-width: $screen-xs-max) { + padding: 0; + } + + &.header-user-dropdown-toggle { + margin-left: 2px; + + .header-user-avatar { + margin-right: 0; + } + } + + &:hover, + &:focus { + text-decoration: none; + outline: 0; + opacity: 1; + color: $white-light; + + svg { + fill: currentColor; + } + + &.header-user-dropdown-toggle { + .header-user-avatar { + border-color: $white-light; + } + } + } + } + + .header-new-dropdown-toggle { + margin-right: 0; + } + + .impersonated-user, + .impersonated-user:hover { + margin-right: 1px; + background-color: $white-light; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } + + .impersonation-btn, + .impersonation-btn:hover { + background-color: $white-light; + margin-left: 0; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + + i { + color: $orange-500; + font-size: 20px; + } + } + + &.active > a, + &.dropdown.open > a { + + svg { + fill: currentColor; + } + } + } + } +} + +.navbar-sub-nav, +.navbar-nav { + > li { + > a:hover, + > a:focus { + text-decoration: none; + outline: 0; + color: $white-light; + + svg { + fill: currentColor; + } + } + + > a { + display: -webkit-flex; + display: flex; + align-items: center; + justify-content: center; + padding: 6px 8px; + margin: 4px 2px; + font-size: 12px; + color: currentColor; + border-radius: $border-radius-default; + height: 32px; + font-weight: $gl-font-weight-bold; + + svg { + fill: currentColor; } } + + &.line-separator { + margin: 8px; + } + } +} + +.navbar-sub-nav { + display: -webkit-flex; + display: flex; + margin: 0 0 0 6px; + + .projects-dropdown-menu { + padding: 0; + } + + .dropdown-chevron { + position: relative; + top: -1px; + font-size: 10px; } .project-item-select-holder { @@ -218,3 +359,214 @@ header { color: $red-500; } } + +.caret-down { + height: 11px; + width: 11px; + margin-left: 4px; + fill: currentColor; +} + +.header-user .dropdown-menu-nav, +.header-new .dropdown-menu-nav { + margin-top: $dropdown-vertical-offset; +} + +.breadcrumbs { + display: -webkit-flex; + display: flex; + min-height: 48px; + color: $gl-text-color; +} + +.breadcrumbs-container { + display: -webkit-flex; + display: flex; + width: 100%; + position: relative; + padding-top: $gl-padding / 2; + padding-bottom: $gl-padding / 2; + align-items: center; + border-bottom: 1px solid $border-color; +} + +.breadcrumbs-links { + -webkit-flex: 1; + flex: 1; + min-width: 0; + align-self: center; + color: $gl-text-color-secondary; + + .avatar-tile { + margin-right: 4px; + border: 1px solid $border-color; + border-radius: 50%; + vertical-align: sub; + } + + .text-expander { + margin-left: 0; + margin-right: 2px; + + > i { + position: relative; + top: 1px; + } + } +} + +.breadcrumbs-list { + display: -webkit-flex; + display: flex; + flex-wrap: wrap; + margin-bottom: 0; + line-height: 16px; + + > li { + display: flex; + align-items: center; + position: relative; + padding: 2px 0; + + &:not(:last-child) { + margin-right: 20px; + } + + > a { + font-size: 12px; + color: currentColor; + } + } +} + +.breadcrumb-item-text { + @include str-truncated(128px); + text-decoration: inherit; +} + +.breadcrumbs-list-angle { + position: absolute; + right: -12px; + top: 50%; + color: $gl-text-color-tertiary; + transform: translateY(-50%); +} + +.breadcrumbs-extra { + display: -webkit-flex; + display: flex; + flex: 0 0 auto; + margin-left: auto; +} + +.breadcrumbs-sub-title { + margin: 0; + font-size: 12px; + font-weight: 600; + line-height: 16px; + + a { + color: $gl-text-color; + } +} + +.btn-sign-in { + margin-top: 3px; + font-weight: $gl-font-weight-bold; + + &:hover { + background-color: $white-light; + } +} + +.navbar-nav { + li { + .badge { + position: inherit; + font-weight: $gl-font-weight-normal; + margin-left: -6px; + font-size: 11px; + color: $white-light; + padding: 0 5px; + line-height: 12px; + border-radius: 7px; + box-shadow: 0 1px 0 rgba($gl-header-color, .2); + + &.issues-count { + background-color: $green-500; + } + + &.merge-requests-count { + background-color: $orange-600; + } + + &.todos-count { + background-color: $blue-500; + } + } + } +} + +@media (max-width: $screen-xs-max) { + header .container-fluid { + font-size: 18px; + + .navbar-nav { + table-layout: fixed; + width: 100%; + margin: 0; + text-align: right; + } + + .navbar-collapse { + margin-left: -8px; + margin-right: -10px; + + .nav > li:not(.hidden-xs) { + display: table-cell !important; + width: 25%; + + a { + margin-right: 8px; + } + } + } + } + + .header-user-dropdown-toggle { + text-align: center; + } + + .header-user-avatar { + float: none; + } +} + +.header-user { + .dropdown-menu-nav { + width: auto; + min-width: 140px; + margin-top: 4px; + color: $gl-text-color; + left: auto; + + .current-user { + padding: 5px 18px; + + .user-name { + display: block; + } + } + } +} + +.header-user-avatar { + float: left; + margin-right: 5px; + border-radius: 50%; + border: 1px solid $avatar-border; +} + +.with-performance-bar header.navbar-gitlab { + top: $performance-bar-height; +} diff --git a/app/assets/stylesheets/framework/images.scss b/app/assets/stylesheets/framework/images.scss index 59bfc5a8d77c..6819fd88b7f3 100644 --- a/app/assets/stylesheets/framework/images.scss +++ b/app/assets/stylesheets/framework/images.scss @@ -28,6 +28,7 @@ svg { &.s8 { @include svg-size(8px); } + &.s12 { @include svg-size(12px); } &.s16 { @include svg-size(16px); } &.s18 { @include svg-size(18px); } &.s24 { @include svg-size(24px); } diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss deleted file mode 100644 index 8b137891791f..000000000000 --- a/app/assets/stylesheets/framework/nav.scss +++ /dev/null @@ -1 +0,0 @@ - diff --git a/app/assets/stylesheets/framework/new-nav.scss b/app/assets/stylesheets/framework/new-nav.scss deleted file mode 100644 index b75f008475d0..000000000000 --- a/app/assets/stylesheets/framework/new-nav.scss +++ /dev/null @@ -1,415 +0,0 @@ -.content-wrapper.page-with-new-nav { - margin-top: $header-height; -} - -header { - .header-content { - .dropdown.open { - > a { - border-bottom-color: $white-light; - } - } - - .dropdown-menu { - margin-top: 4px; - min-width: 130px; - - @media (max-width: $screen-xs-max) { - left: auto; - right: 0; - } - } - - &.menu-expanded { - @media (max-width: $screen-xs-max) { - .title-container, - .header-logo, { - display: none; - } - } - } - } - - .dropdown-bold-header { - color: $gl-text-color-secondary; - font-size: 12px; - } - - .navbar-collapse { - padding-left: 0; - box-shadow: 0; - - @media (max-width: $screen-xs-max) { - margin-left: -8px; - margin-right: -10px; - } - - .nav { - > li:not(.hidden-xs) a { - @media (max-width: $screen-xs-max) { - margin-left: 0; - min-width: 100%; - } - } - } - } - - .container-fluid { - - .navbar-nav { - @media (max-width: $screen-xs-max) { - display: -webkit-flex; - display: flex; - padding-right: 10px; - } - - li { - .badge { - box-shadow: none; - font-weight: $gl-font-weight-bold; - } - } - } - - .nav > li { - &.header-user { - @media (max-width: $screen-xs-max) { - padding-left: 10px; - } - } - - > a { - will-change: color; - margin: 4px 2px; - padding: 6px 8px; - height: 32px; - - @media (max-width: $screen-xs-max) { - padding: 0; - } - - &.header-user-dropdown-toggle { - margin-left: 2px; - - .header-user-avatar { - margin-right: 0; - } - } - - &:hover, - &:focus { - text-decoration: none; - outline: 0; - opacity: 1; - color: $white-light; - - svg { - fill: currentColor; - } - - &.header-user-dropdown-toggle { - .header-user-avatar { - border-color: $white-light; - } - } - } - } - - .header-new-dropdown-toggle { - margin-right: 0; - } - - .impersonated-user, - .impersonated-user:hover { - margin-right: 1px; - background-color: $white-light; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - } - - .impersonation-btn, - .impersonation-btn:hover { - background-color: $white-light; - margin-left: 0; - border-top-left-radius: 0; - border-bottom-left-radius: 0; - - i { - color: $orange-500; - font-size: 20px; - } - } - - &.active > a, - &.dropdown.open > a { - - svg { - fill: currentColor; - } - } - } - } -} - -.navbar-sub-nav { - display: -webkit-flex; - display: flex; - margin: 0 0 0 6px; - - .dropdown-chevron { - position: relative; - top: -1px; - font-size: 10px; - } -} - -header { - .navbar-sub-nav, - .navbar-nav { - > li { - > a:hover, - > a:focus { - text-decoration: none; - outline: 0; - color: $white-light; - - svg { - fill: currentColor; - } - } - - > a { - display: -webkit-flex; - display: flex; - align-items: center; - justify-content: center; - padding: 6px 8px; - margin: 4px 2px; - font-size: 12px; - color: currentColor; - border-radius: $border-radius-default; - height: 32px; - font-weight: $gl-font-weight-bold; - - svg { - fill: currentColor; - } - } - - &.line-separator { - margin: 8px; - } - } - } -} - -.caret-down { - height: 11px; - width: 11px; - margin-left: 4px; - fill: currentColor; -} - -.header-user .dropdown-menu-nav, -.header-new .dropdown-menu-nav { - margin-top: 4px; -} - -.breadcrumbs { - display: -webkit-flex; - display: flex; - min-height: 48px; - color: $gl-text-color; -} - -.breadcrumbs-container { - display: -webkit-flex; - display: flex; - width: 100%; - position: relative; - padding-top: $gl-padding / 2; - padding-bottom: $gl-padding / 2; - align-items: center; - border-bottom: 1px solid $border-color; -} - -.breadcrumbs-links { - -webkit-flex: 1; - flex: 1; - min-width: 0; - align-self: center; - color: $gl-text-color-secondary; - - .avatar-tile { - margin-right: 4px; - border: 1px solid $border-color; - border-radius: 50%; - vertical-align: sub; - } - - .text-expander { - margin-left: 0; - margin-right: 2px; - - > i { - position: relative; - top: 1px; - } - } -} - -.breadcrumbs-list { - display: -webkit-flex; - display: flex; - flex-wrap: wrap; - margin-bottom: 0; - line-height: 16px; - - > li { - display: flex; - align-items: center; - position: relative; - padding: 2px 0; - - &:not(:last-child) { - margin-right: 20px; - } - - > a { - font-size: 12px; - color: currentColor; - } - } -} - -.breadcrumb-item-text { - @include str-truncated(128px); - text-decoration: inherit; -} - -.breadcrumbs-list-angle { - position: absolute; - right: -12px; - top: 50%; - color: $gl-text-color-tertiary; - transform: translateY(-50%); -} - -.breadcrumbs-extra { - display: -webkit-flex; - display: flex; - flex: 0 0 auto; - margin-left: auto; -} - -.breadcrumbs-sub-title { - margin: 0; - font-size: 12px; - font-weight: 600; - line-height: 16px; - - a { - color: $gl-text-color; - } -} - -.btn-sign-in { - margin-top: 3px; - font-weight: $gl-font-weight-bold; - - &:hover { - background-color: $white-light; - } -} - -.navbar-nav { - li { - .badge { - position: inherit; - font-weight: $gl-font-weight-normal; - margin-left: -6px; - font-size: 11px; - color: $white-light; - padding: 0 5px; - line-height: 12px; - border-radius: 7px; - box-shadow: 0 1px 0 rgba($gl-header-color, .2); - - &.issues-count { - background-color: $green-500; - } - - &.merge-requests-count { - background-color: $orange-600; - } - - &.todos-count { - background-color: $blue-500; - } - } - } -} - -@media (max-width: $screen-xs-max) { - header .container-fluid { - font-size: 18px; - - .navbar-nav { - display: table; - table-layout: fixed; - width: 100%; - margin: 0; - text-align: right; - } - - .navbar-collapse { - padding-left: 5px; - - .nav > li:not(.hidden-xs) { - display: table-cell !important; - width: 25%; - - a { - margin-right: 8px; - } - } - } - } - - .header-user-dropdown-toggle { - text-align: center; - } - - .header-user-avatar { - float: none; - } -} - -.header-user { - .dropdown-menu-nav { - width: auto; - min-width: 140px; - margin-top: -5px; - color: $gl-text-color; - left: auto; - - .current-user { - padding: 5px 18px; - - .user-name { - display: block; - } - } - } -} - -.header-user-avatar { - float: left; - margin-right: 5px; - border-radius: 50%; - border: 1px solid $avatar-border; -} - -.with-performance-bar header.navbar-gitlab { - top: $performance-bar-height; -} diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 8e43f5bc8f1d..186f505df8a8 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -333,6 +333,7 @@ $regular_font: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-San * Dropdowns */ $dropdown-width: 300px; +$dropdown-vertical-offset: 4px; $dropdown-link-color: #555; $dropdown-link-hover-bg: $row-hover; $dropdown-empty-row-bg: rgba(#000, .04); diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 0f819c243ab8..6f24594fee77 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -75,7 +75,7 @@ %button.navbar-toggle.hidden-sm.hidden-md.hidden-lg{ type: 'button' } %span.sr-only Toggle navigation - = sprite_icon('more', size: 16, css_class: 'more-icon js-navbar-toggle-right') - = sprite_icon('close', size: 16, css_class: 'close-icon js-navbar-toggle-left') + = sprite_icon('more', size: 12, css_class: 'more-icon js-navbar-toggle-right') + = sprite_icon('close', size: 12, css_class: 'close-icon js-navbar-toggle-left') = render 'shared/outdated_browser' -- GitLab From 12523ee1a96bce75cf8d330bc4b50ff80eba2c07 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Fri, 6 Oct 2017 16:44:54 -0700 Subject: [PATCH 09/10] Specify gitlab nav --- app/assets/stylesheets/framework/gitlab-theme.scss | 6 +++--- app/assets/stylesheets/framework/header.scss | 6 +++--- app/assets/stylesheets/pages/boards.scss | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss index a886cf5e9549..3b8cf70810a7 100644 --- a/app/assets/stylesheets/framework/gitlab-theme.scss +++ b/app/assets/stylesheets/framework/gitlab-theme.scss @@ -5,7 +5,7 @@ @mixin gitlab-theme($color-100, $color-200, $color-500, $color-700, $color-800, $color-900, $color-alternate) { // Header - header { + .navbar-gitlab { background-color: $color-900; .navbar-collapse { @@ -200,9 +200,9 @@ body { &.ui_light { @include gitlab-theme($theme-gray-900, $theme-gray-700, $theme-gray-800, $theme-gray-700, $theme-gray-700, $theme-gray-100, $theme-gray-700); - header { + .navbar-gitlab { background-color: $theme-gray-100; - box-shadow: 0 2px 0 0 $border-color; + box-shadow: 0 1px 0 0 $border-color; .logo-text svg { fill: $theme-gray-900; diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 4693b4a18d7b..9b4bfae1144a 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -2,7 +2,7 @@ margin-top: $header-height; } -header { +.navbar-gitlab { @include new-style-dropdown; &.navbar-empty { @@ -508,7 +508,7 @@ header { } @media (max-width: $screen-xs-max) { - header .container-fluid { + .navbar-gitlab .container-fluid { font-size: 18px; .navbar-nav { @@ -567,6 +567,6 @@ header { border: 1px solid $avatar-border; } -.with-performance-bar header.navbar-gitlab { +.with-performance-bar .navbar-gitlab { top: $performance-bar-height; } diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss index cfb8f1ea64eb..86fcd429ba48 100644 --- a/app/assets/stylesheets/pages/boards.scss +++ b/app/assets/stylesheets/pages/boards.scss @@ -476,7 +476,6 @@ border-top: 1px solid $border-color; } -.page-with-layout-nav.page-with-sub-nav .issue-boards-sidebar, .page-with-new-sidebar.page-with-sidebar .issue-boards-sidebar { .issuable-sidebar-header { position: relative; -- GitLab From fe36889aef38f6bf4c4b297e3a4b6e00b1f49b52 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Sat, 7 Oct 2017 07:52:28 -0700 Subject: [PATCH 10/10] Fix dropdown header alignment; empty navbar positioning --- .../stylesheets/framework/dropdowns.scss | 6 +++- app/assets/stylesheets/framework/header.scss | 34 +++++++++---------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 112b939adbf5..69d56dfe304c 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -745,7 +745,11 @@ #{$selector}.dropdown-menu-nav { margin-bottom: 24px; - li { + &.dropdown-open-top { + margin-bottom: $dropdown-vertical-offset; + } + + li:not(.dropdown-bold-header) { display: block; padding: 0 1px; diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 9b4bfae1144a..22945e935ef0 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -5,22 +5,6 @@ .navbar-gitlab { @include new-style-dropdown; - &.navbar-empty { - height: $header-height; - background: $white-light; - border-bottom: 1px solid $white-normal; - - .center-logo { - margin: 8px 0; - text-align: center; - - .tanuki-logo, - img { - height: 36px; - } - } - } - &.navbar-gitlab { padding: 0 16px; z-index: 1000; @@ -550,7 +534,7 @@ color: $gl-text-color; left: auto; - .current-user { + li.current-user { padding: 5px 18px; .user-name { @@ -570,3 +554,19 @@ .with-performance-bar .navbar-gitlab { top: $performance-bar-height; } + +.navbar-empty { + height: $header-height; + background: $white-light; + border-bottom: 1px solid $white-normal; + + .center-logo { + margin: 8px 0; + text-align: center; + + .tanuki-logo, + img { + height: 36px; + } + } +} -- GitLab