Skip to content

G
gitlab-ce
Commit 4c020c8c authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files
Options

Merge branch 'cleanup_old_nav_stuff' into 'master' 

Remove old navigation CSS

See merge request gitlab-org/gitlab-ce!14573
parents 2ef28db9 b352462d
Hide whitespace changes
Inline Side-by-side
Showing with 501 additions and 932 deletions
app/assets/javascripts/shortcuts.js
View file @ 4c020c8c
...@@ -18,23 +18,8 @@ import findAndFollowLink from './shortcuts_dashboard_navigation'; ...@@ -18,23 +18,8 @@ import findAndFollowLink from './shortcuts_dashboard_navigation';
Mousetrap.bind('f', (e => this.focusFilter(e))); Mousetrap.bind('f', (e => this.focusFilter(e)));
Mousetrap.bind('p b', this.onTogglePerfBar); Mousetrap.bind('p b', this.onTogglePerfBar);
const $globalDropdownMenu = $('.global-dropdown-menu');
const $globalDropdownToggle = $('.global-dropdown-toggle');
const findFileURL = document.body.dataset.findFile; 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+t', () => findAndFollowLink('.shortcuts-todos'));
Mousetrap.bind('shift+a', () => findAndFollowLink('.dashboard-shortcuts-activity')); Mousetrap.bind('shift+a', () => findAndFollowLink('.dashboard-shortcuts-activity'));
Mousetrap.bind('shift+i', () => findAndFollowLink('.dashboard-shortcuts-issues')); Mousetrap.bind('shift+i', () => findAndFollowLink('.dashboard-shortcuts-issues'));
......
app/assets/stylesheets/framework.scss
View file @ 4c020c8c
...@@ -30,10 +30,9 @@ ...@@ -30,10 +30,9 @@
@import "framework/media_object"; @import "framework/media_object";
@import "framework/mobile"; @import "framework/mobile";
@import "framework/modal"; @import "framework/modal";
@import "framework/nav";
@import "framework/new-nav";
@import "framework/pagination"; @import "framework/pagination";
@import "framework/panels"; @import "framework/panels";
@import "framework/secondary-navigation-elements";
@import "framework/selects"; @import "framework/selects";
@import "framework/sidebar"; @import "framework/sidebar";
@import "framework/new-sidebar"; @import "framework/new-sidebar";
......
app/assets/stylesheets/framework/animations.scss
View file @ 4c020c8c
...@@ -115,8 +115,7 @@ ...@@ -115,8 +115,7 @@
@return $unfoldedTransition; @return $unfoldedTransition;
} }
.btn, .btn {
.global-dropdown-toggle {
@include transition(background-color, border-color, color, box-shadow); @include transition(background-color, border-color, color, box-shadow);
} }
......
app/assets/stylesheets/framework/blocks.scss
View file @ 4c020c8c
...@@ -207,6 +207,16 @@ ...@@ -207,6 +207,16 @@
&.user-cover-block { &.user-cover-block {
padding: 24px 0 0; padding: 24px 0 0;
.nav-links {
justify-content: center;
width: 100%;
float: none;
&.scrolling-tabs {
float: none;
}
}
} }
.group-info { .group-info {
......
app/assets/stylesheets/framework/dropdowns.scss
View file @ 4c020c8c
...@@ -749,7 +749,7 @@ ...@@ -749,7 +749,7 @@
margin-bottom: $dropdown-vertical-offset; margin-bottom: $dropdown-vertical-offset;
} }
li { li:not(.dropdown-bold-header) {
display: block; display: block;
padding: 0 1px; padding: 0 1px;
...@@ -889,7 +889,7 @@ ...@@ -889,7 +889,7 @@
@include new-style-dropdown('.breadcrumbs-list .dropdown '); @include new-style-dropdown('.breadcrumbs-list .dropdown ');
@include new-style-dropdown('.js-namespace-select + '); @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; padding: 0;
} }
......
app/assets/stylesheets/framework/gitlab-theme.scss
View file @ 4c020c8c
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
@mixin gitlab-theme($color-100, $color-200, $color-500, $color-700, $color-800, $color-900, $color-alternate) { @mixin gitlab-theme($color-100, $color-200, $color-500, $color-700, $color-800, $color-900, $color-alternate) {
// Header // Header
header.navbar-gitlab-new { .navbar-gitlab {
background-color: $color-900; background-color: $color-900;
.navbar-collapse { .navbar-collapse {
...@@ -200,9 +200,9 @@ body { ...@@ -200,9 +200,9 @@ body {
&.ui_light { &.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); @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 { .navbar-gitlab {
background-color: $theme-gray-100; background-color: $theme-gray-100;
box-shadow: 0 2px 0 0 $border-color; box-shadow: 0 1px 0 0 $border-color;
.logo-text svg { .logo-text svg {
fill: $theme-gray-900; fill: $theme-gray-900;
......
app/assets/stylesheets/framework/header.scss
View file @ 4c020c8c
/* .content-wrapper.page-with-new-nav {
* Application Header margin-top: $header-height;
* }
*/
header { .navbar-gitlab {
@include new-style-dropdown; @include new-style-dropdown;
transition: padding $sidebar-transition-duration;
&.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 { &.navbar-gitlab {
padding: 0 16px; padding: 0 16px;
z-index: 1000; z-index: 1000;
margin-bottom: 0; margin-bottom: 0;
min-height: $header-height; min-height: $header-height;
background-color: $gray-light;
border: none; border: none;
border-bottom: 1px solid $border-color; border-bottom: 1px solid $border-color;
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
right: 0; right: 0;
color: $gl-text-color-secondary;
border-radius: 0; border-radius: 0;
@media (max-width: $screen-xs-min) { .logo-text {
padding: 0 16px; line-height: initial;
}
&.with-horizontal-nav {
border-bottom: 0;
.navbar-border { svg {
height: 1px; width: 55px;
position: absolute; height: 14px;
right: 0; margin: 0;
left: 0; fill: $white-light;
bottom: -1px;
background-color: $border-color;
opacity: 0;
} }
} }
.container-fluid { .container-fluid {
width: 100% !important;
filter: none;
padding: 0; 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 { .user-counter {
svg { svg {
margin-right: 3px; margin-right: 3px;
...@@ -114,81 +39,117 @@ header { ...@@ -114,81 +39,117 @@ header {
} }
.navbar-toggle { .navbar-toggle {
color: $nav-toggle-gray;
margin: 5px 0;
border-radius: 0;
right: -10px; right: -10px;
padding: 6px 10px; border-radius: 0;
min-width: 45px;
padding: 0;
margin-right: -7px;
font-size: 14px;
text-align: center;
color: currentColor;
&:hover { &:hover,
background-color: $white-normal; &:focus,
&.active {
color: currentColor;
background-color: transparent;
} }
&.active { .more-icon,
color: $gl-text-color-secondary; .close-icon {
fill: $white-light;
margin: auto;
} }
} }
} }
} }
&.navbar-gitlab-new { .close-icon {
.close-icon { display: none;
}
.menu-expanded {
.more-icon {
display: none; display: none;
} }
.menu-expanded { .close-icon {
.more-icon { display: block;
display: none;
}
.close-icon {
display: block;
}
} }
} }
.global-dropdown { .header-content {
position: absolute; display: -webkit-flex;
left: -10px; display: flex;
justify-content: space-between;
position: relative;
min-height: $header-height;
padding-left: 0;
.badge { .title-container {
font-size: 11px; 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;
} }
li { .title {
&.active a { padding-right: 0;
font-weight: $gl-font-weight-bold; color: currentColor;
display: -webkit-flex;
display: flex;
position: relative;
margin: 0;
font-size: 18px;
vertical-align: top;
white-space: nowrap;
img {
height: 28px;
margin-right: 8px;
} }
}
}
.global-dropdown-toggle { &.wrap {
margin: 7px 0; white-space: normal;
font-size: 18px; }
padding: 6px 10px;
border: none;
background-color: $gray-light;
&:hover { &.initializing {
background-color: $white-normal; opacity: 0;
} }
a {
display: -webkit-flex;
display: flex;
align-items: center;
padding: 2px 8px;
margin: 5px 2px 5px -8px;
border-radius: $border-radius-default;
&:focus { svg {
outline: none; @media (min-width: $screen-sm-min) {
background-color: $white-normal; margin-right: 8px;
}
}
}
.project-item-select {
right: auto;
left: 0;
}
} }
}
.header-content { .dropdown.open {
display: flex; > a {
justify-content: space-between; border-bottom-color: $white-light;
position: relative; }
min-height: $header-height; }
padding-left: 30px;
&.menu-expanded { &.menu-expanded {
@media (max-width: $screen-xs-max) { @media (max-width: $screen-xs-max) {
.header-logo,
.title-container { .title-container {
display: none; display: none;
} }
...@@ -198,111 +159,180 @@ header { ...@@ -198,111 +159,180 @@ header {
} }
} }
} }
}
.dropdown-menu { .dropdown-bold-header {
margin-top: -5px; color: $gl-text-color-secondary;
} font-size: 12px;
}
.header-logo { .navbar-collapse {
display: inline-block; flex: 0 0 auto;
margin: 0 12px 0 2px; border-top: none;
position: relative; padding: 0;
top: 10px;
transition-duration: .3s;
svg, @media (max-width: $screen-xs-max) {
img { flex: 1 1 auto;
height: 28px; }
}
&:hover { .nav {
cursor: pointer; > li:not(.hidden-xs) a {
@media (max-width: $screen-xs-max) {
margin-left: 0;
min-width: 100%;
}
} }
} }
}
.group-name-toggle { .container-fluid {
margin: 3px 5px;
}
.group-title { .navbar-nav {
&.is-hidden { @media (max-width: $screen-xs-max) {
.hidable:not(:last-of-type) { display: -webkit-flex;
display: none; display: flex;
padding-right: 10px;
}
li {
.badge {
box-shadow: none;
font-weight: $gl-font-weight-bold;
} }
} }
} }
.title-container { .nav > li {
display: flex; &.header-user {
align-items: flex-start; @media (max-width: $screen-xs-max) {
flex: 1 1 auto; padding-left: 10px;
padding-top: 14px; }
overflow: hidden; }
}
.title { > a {
position: relative; will-change: color;
padding-right: 20px; margin: 4px 2px;
margin: 0; padding: 6px 8px;
font-size: 18px; height: 32px;
line-height: 22px;
display: inline-block;
font-weight: $gl-font-weight-normal;
color: $gl-text-color;
vertical-align: top;
white-space: nowrap;
&.wrap { @media (max-width: $screen-xs-max) {
white-space: normal; 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;
}
}
}
} }
&.initializing { .header-new-dropdown-toggle {
opacity: 0; margin-right: 0;
} }
a { .impersonated-user,
color: currentColor; .impersonated-user:hover {
margin-right: 1px;
background-color: $white-light;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
&:hover { .impersonation-btn,
text-decoration: underline; .impersonation-btn:hover {
color: $gl-header-nav-hover-color; background-color: $white-light;
margin-left: 0;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
i {
color: $orange-500;
font-size: 20px;
} }
} }
.dropdown-toggle-caret { &.active > a,
color: $gl-text-color; &.dropdown.open > a {
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 { svg {
color: $gl-header-nav-hover-color; fill: currentColor;
} }
} }
}
}
}
.project-item-select { .navbar-sub-nav,
right: auto; .navbar-nav {
left: 0; > li {
> a:hover,
> a:focus {
text-decoration: none;
outline: 0;
color: $white-light;
svg {
fill: currentColor;
} }
} }
.navbar-collapse { > a {
flex: 0 0 auto; display: -webkit-flex;
border-top: none; display: flex;
padding: 0; align-items: center;
justify-content: center;
@media (max-width: $screen-xs-max) { padding: 6px 8px;
flex: 1 1 auto; 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 { .project-item-select-holder {
...@@ -314,8 +344,123 @@ header { ...@@ -314,8 +344,123 @@ header {
} }
} }
.with-performance-bar header.navbar-gitlab { .caret-down {
top: $performance-bar-height; 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 { .navbar-nav {
...@@ -347,11 +492,10 @@ header { ...@@ -347,11 +492,10 @@ header {
} }
@media (max-width: $screen-xs-max) { @media (max-width: $screen-xs-max) {
header .container-fluid { .navbar-gitlab .container-fluid {
font-size: 18px; font-size: 18px;
.navbar-nav { .navbar-nav {
display: table;
table-layout: fixed; table-layout: fixed;
width: 100%; width: 100%;
margin: 0; margin: 0;
...@@ -359,7 +503,8 @@ header { ...@@ -359,7 +503,8 @@ header {
} }
.navbar-collapse { .navbar-collapse {
padding-left: 5px; margin-left: -8px;
margin-right: -10px;
.nav > li:not(.hidden-xs) { .nav > li:not(.hidden-xs) {
display: table-cell !important; display: table-cell !important;
...@@ -385,11 +530,11 @@ header { ...@@ -385,11 +530,11 @@ header {
.dropdown-menu-nav { .dropdown-menu-nav {
width: auto; width: auto;
min-width: 140px; min-width: 140px;
margin-top: -5px; margin-top: 4px;
color: $gl-text-color; color: $gl-text-color;
left: auto; left: auto;
.current-user { li.current-user {
padding: 5px 18px; padding: 5px 18px;
.user-name { .user-name {
...@@ -405,3 +550,23 @@ header { ...@@ -405,3 +550,23 @@ header {
border-radius: 50%; border-radius: 50%;
border: 1px solid $avatar-border; border: 1px solid $avatar-border;
} }
.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;
}
}
}
app/assets/stylesheets/framework/images.scss
View file @ 4c020c8c
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
svg { svg {
&.s8 { @include svg-size(8px); } &.s8 { @include svg-size(8px); }
&.s12 { @include svg-size(12px); }
&.s16 { @include svg-size(16px); } &.s16 { @include svg-size(16px); }
&.s18 { @include svg-size(18px); } &.s18 { @include svg-size(18px); }
&.s24 { @include svg-size(24px); } &.s24 { @include svg-size(24px); }
......
app/assets/stylesheets/framework/layout.scss
View file @ 4c020c8c
...@@ -25,10 +25,6 @@ body { ...@@ -25,10 +25,6 @@ body {
.content-wrapper { .content-wrapper {
padding-bottom: 100px; padding-bottom: 100px;
&:not(.page-with-layout-nav) {
margin-top: $header-height;
}
} }
.container { .container {
......
app/assets/stylesheets/framework/new-nav.scss
View file @ 4c020c8c
@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;
}
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-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;
}
}
.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-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) {
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;
}
}
.navbar-gitlab-new {
.navbar-sub-nav,
.navbar-nav {
> li {
> a:hover,
> a:focus {
text-decoration: none;
outline: 0;
color: $white-light;
svg {
fill: currentColor;
}
}
> a {
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: $dropdown-vertical-offset;
}
.breadcrumbs {
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: 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;
}
}
app/assets/stylesheets/framework/new-sidebar.scss
View file @ 4c020c8c
...@@ -24,7 +24,7 @@ $new-sidebar-collapsed-width: 50px; ...@@ -24,7 +24,7 @@ $new-sidebar-collapsed-width: 50px;
// Override position: absolute // Override position: absolute
.right-sidebar { .right-sidebar {
position: fixed; position: fixed;
height: calc(100% - #{$new-navbar-height}); height: calc(100% - #{$header-height});
} }
.issues-bulk-update.right-sidebar.right-sidebar-expanded .issuable-sidebar-header { .issues-bulk-update.right-sidebar.right-sidebar-expanded .issuable-sidebar-header {
...@@ -87,7 +87,7 @@ $new-sidebar-collapsed-width: 50px; ...@@ -87,7 +87,7 @@ $new-sidebar-collapsed-width: 50px;
z-index: 400; z-index: 400;
width: $new-sidebar-width; width: $new-sidebar-width;
transition: left $sidebar-transition-duration; transition: left $sidebar-transition-duration;
top: $new-navbar-height; top: $header-height;
bottom: 0; bottom: 0;
left: 0; left: 0;
background-color: $gray-normal; background-color: $gray-normal;
...@@ -197,7 +197,7 @@ $new-sidebar-collapsed-width: 50px; ...@@ -197,7 +197,7 @@ $new-sidebar-collapsed-width: 50px;
} }
.with-performance-bar .nav-sidebar { .with-performance-bar .nav-sidebar {
top: $new-navbar-height + $performance-bar-height; top: $header-height + $performance-bar-height;
} }
.sidebar-sub-level-items { .sidebar-sub-level-items {
...@@ -495,7 +495,7 @@ $new-sidebar-collapsed-width: 50px; ...@@ -495,7 +495,7 @@ $new-sidebar-collapsed-width: 50px;
// Make issue boards full-height now that sub-nav is gone // Make issue boards full-height now that sub-nav is gone
.boards-list { .boards-list {
height: calc(100vh - #{$new-navbar-height}); height: calc(100vh - #{$header-height});
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
height: 475px; // Needed for PhantomJS height: 475px; // Needed for PhantomJS
...@@ -506,5 +506,5 @@ $new-sidebar-collapsed-width: 50px; ...@@ -506,5 +506,5 @@ $new-sidebar-collapsed-width: 50px;
} }
.with-performance-bar .boards-list { .with-performance-bar .boards-list {
height: calc(100vh - #{$new-navbar-height} - #{$performance-bar-height}); height: calc(100vh - #{$header-height} - #{$performance-bar-height});
} }
app/assets/stylesheets/framework/nav.scss → app/assets/stylesheets/framework/secondary-navigation-elements.scss
View file @ 4c020c8c
// For tabbed navigation links, scrolling tabs, etc. For all top/main navigation,
// please check nav.scss
.nav-links { .nav-links {
display: flex; display: flex;
padding: 0; padding: 0;
margin: 0; margin: 0;
list-style: none; list-style: none;
height: auto; height: auto;
border-bottom: 1px solid $border-color;
li { li {
display: flex; display: flex;
...@@ -24,7 +23,6 @@ ...@@ -24,7 +23,6 @@
&:active, &:active,
&:focus { &:focus {
text-decoration: none; text-decoration: none;
border-bottom: 2px solid $gray-darkest;
color: $black; color: $black;
.badge { .badge {
...@@ -34,7 +32,6 @@ ...@@ -34,7 +32,6 @@
} }
&.active a { &.active a {
border-bottom: 2px solid $link-underline-blue;
color: $black; color: $black;
font-weight: $gl-font-weight-bold; font-weight: $gl-font-weight-bold;
...@@ -43,35 +40,6 @@ ...@@ -43,35 +40,6 @@
} }
} }
} }
&.sub-nav {
text-align: center;
background-color: $gray-normal;
.container-fluid {
background-color: $gray-normal;
margin-bottom: 0;
display: flex;
}
li {
&.active a {
border-bottom: none;
color: $link-underline-blue;
}
a {
margin: 0;
padding: 11px 10px 9px;
&:hover,
&:active,
&:focus {
border-color: transparent;
}
}
}
}
} }
.top-area { .top-area {
...@@ -91,17 +59,6 @@ ...@@ -91,17 +59,6 @@
} }
} }
.nav-search {
display: inline-block;
width: 100%;
padding: 11px 0;
/* Small devices (phones, tablets, 768px and lower) */
@media (min-width: $screen-sm-min) {
width: 50%;
}
}
.nav-links { .nav-links {
margin-bottom: 0; margin-bottom: 0;
border-bottom: none; border-bottom: none;
...@@ -150,12 +107,6 @@ ...@@ -150,12 +107,6 @@
} }
} }
&.nav-controls-new-nav {
> .dropdown {
margin-right: 0;
}
}
> .btn-grouped { > .btn-grouped {
float: none; float: none;
} }
...@@ -248,114 +199,43 @@ ...@@ -248,114 +199,43 @@
pre { pre {
width: 100%; width: 100%;
} }
}
.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 { @media (max-width: $screen-xs-max) {
margin-left: 2px; flex-flow: row wrap;
}
.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 { .nav-controls {
position: relative; $controls-margin: $btn-xs-side-margin - 2px;
flex: 0 0 100%;
.nav-control { &.controls-flex {
@media (max-width: $screen-sm-max) { display: flex;
margin-right: 2px; flex-flow: row wrap;
align-items: center;
justify-content: center;
padding: 0 0 $gl-padding-top;
} }
}
}
.controls {
float: right;
padding: 7px 0 0;
i {
color: $layout-link-gray;
}
.fa-rss,
.fa-cog {
font-size: 16px;
}
.fa-caret-down { .controls-item,
margin-left: 5px; .controls-item-full,
color: $gl-text-color-secondary; .controls-item:last-child {
} flex: 1 1 35%;
display: block;
.dropdown { width: 100%;
position: absolute; margin: $controls-margin;
top: 7px;
right: 15px;
z-index: 300;
li.active { .btn,
font-weight: $gl-font-weight-bold; .dropdown {
margin: 0;
}
} }
}
}
.nav-links { .controls-item-full {
border-bottom: none; flex: 1 1 100%;
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 { .scrolling-tabs-container {
position: relative; position: relative;
...@@ -385,25 +265,41 @@ ...@@ -385,25 +265,41 @@
left: -7px; left: -7px;
} }
} }
}
&.sub-nav-scroll { .inner-page-scroll-tabs {
position: relative;
.fade-right { .fade-right {
@include fade(left, $gray-normal); @include fade(left, $white-light);
right: 0; right: 0;
text-align: right;
.fa { .fa {
right: -23px; right: 5px;
}
} }
}
.fade-left { .fade-left {
@include fade(right, $gray-normal); @include fade(right, $white-light);
left: 0; left: 0;
text-align: left;
.fa { .fa {
left: 10px; left: 5px;
} }
}
.fade-right,
.fade-left {
top: 16px;
bottom: auto;
}
&.is-smaller {
.fade-right,
.fade-left {
top: 11px;
} }
} }
} }
...@@ -432,41 +328,7 @@ ...@@ -432,41 +328,7 @@
} }
} }
} }
}
.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 { &.activities {
border-bottom: 1px solid $border-color; border-bottom: 1px solid $border-color;
...@@ -476,76 +338,39 @@ ...@@ -476,76 +338,39 @@
} }
} }
@media (max-width: $screen-xs-max) { .project-item-select-holder.btn-group {
.top-area { display: flex;
flex-flow: row wrap; max-width: 350px;
overflow: hidden;
.nav-controls { float: right;
$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, .new-project-item-link {
.dropdown { white-space: nowrap;
margin: 0; overflow: hidden;
} text-overflow: ellipsis;
} }
.controls-item-full { .new-project-item-select-button {
flex: 1 1 100%; width: 32px;
}
}
} }
} }
.inner-page-scroll-tabs { .empty-state .project-item-select-holder.btn-group {
position: relative; float: none;
display: inline-block;
.fade-right {
@include fade(left, $white-light);
right: 0;
text-align: right;
.fa {
right: 5px;
}
}
.fade-left { .btn {
@include fade(right, $white-light); // overrides styles applied to plain `.empty-state .btn`
left: 0; margin: 10px 0;
text-align: left; max-width: 300px;
width: auto;
.fa { @media(max-width: $screen-xs-max) {
left: 5px; max-width: 250px;
} }
} }
}
.fade-right, .new-project-item-select-button .fa-caret-down {
.fade-left { margin-left: 2px;
top: 16px;
bottom: auto;
}
&.is-smaller {
.fade-right,
.fade-left {
top: 11px;
}
}
} }
app/assets/stylesheets/framework/sidebar.scss
View file @ 4c020c8c
...@@ -78,16 +78,16 @@ ...@@ -78,16 +78,16 @@
.right-sidebar { .right-sidebar {
border-left: 1px solid $border-color; border-left: 1px solid $border-color;
height: calc(100% - #{$new-navbar-height}); height: calc(100% - #{$header-height});
&.affix { &.affix {
position: fixed; position: fixed;
top: $new-navbar-height; top: $header-height;
} }
} }
.with-performance-bar .right-sidebar.affix { .with-performance-bar .right-sidebar.affix {
top: $new-navbar-height + $performance-bar-height; top: $header-height + $performance-bar-height;
} }
@mixin maintain-sidebar-dimensions { @mixin maintain-sidebar-dimensions {
......
app/assets/stylesheets/framework/variables.scss
View file @ 4c020c8c
...@@ -225,8 +225,7 @@ $gl-sidebar-padding: 22px; ...@@ -225,8 +225,7 @@ $gl-sidebar-padding: 22px;
$row-hover: $blue-50; $row-hover: $blue-50;
$row-hover-border: $blue-200; $row-hover-border: $blue-200;
$progress-color: #c0392b; $progress-color: #c0392b;
$header-height: 50px; $header-height: 40px;
$new-navbar-height: 40px;
$fixed-layout-width: 1280px; $fixed-layout-width: 1280px;
$limited-layout-width: 990px; $limited-layout-width: 990px;
$limited-layout-width-sm: 790px; $limited-layout-width-sm: 790px;
......
app/assets/stylesheets/pages/boards.scss
View file @ 4c020c8c
...@@ -414,7 +414,6 @@ ...@@ -414,7 +414,6 @@
margin: 5px; margin: 5px;
} }
.page-with-layout-nav.page-with-sub-nav .issue-boards-sidebar,
.page-with-new-sidebar.page-with-sidebar .issue-boards-sidebar { .page-with-new-sidebar.page-with-sidebar .issue-boards-sidebar {
.issuable-sidebar-header { .issuable-sidebar-header {
position: relative; position: relative;
......
app/assets/stylesheets/pages/builds.scss
View file @ 4c020c8c
...@@ -64,10 +64,10 @@ ...@@ -64,10 +64,10 @@
color: $gl-text-color; color: $gl-text-color;
position: sticky; position: sticky;
position: -webkit-sticky; position: -webkit-sticky;
top: $new-navbar-height; top: $header-height;
&.affix { &.affix {
top: $new-navbar-height; top: $header-height;
} }
// with sidebar // with sidebar
...@@ -174,10 +174,10 @@ ...@@ -174,10 +174,10 @@
.with-performance-bar .build-page { .with-performance-bar .build-page {
.top-bar { .top-bar {
top: $new-navbar-height + $performance-bar-height; top: $header-height + $performance-bar-height;
&.affix { &.affix {
top: $new-navbar-height + $performance-bar-height; top: $header-height + $performance-bar-height;
} }
} }
} }
......
app/assets/stylesheets/pages/issuable.scss
View file @ 4c020c8c
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
.right-sidebar { .right-sidebar {
position: absolute; position: absolute;
top: $new-navbar-height; top: $header-height;
bottom: 0; bottom: 0;
right: 0; right: 0;
transition: width $right-sidebar-transition-duration; transition: width $right-sidebar-transition-duration;
...@@ -487,10 +487,10 @@ ...@@ -487,10 +487,10 @@
} }
.with-performance-bar .right-sidebar { .with-performance-bar .right-sidebar {
top: $new-navbar-height + $performance-bar-height; top: $header-height + $performance-bar-height;
.issuable-sidebar { .issuable-sidebar {
height: calc(100% - #{$new-navbar-height} - #{$performance-bar-height}); height: calc(100% - #{$header-height} - #{$performance-bar-height});
} }
} }
......
app/assets/stylesheets/pages/merge_requests.scss
View file @ 4c020c8c
...@@ -649,7 +649,7 @@ ...@@ -649,7 +649,7 @@
} }
.merge-request-tabs-holder { .merge-request-tabs-holder {
top: $new-navbar-height; top: $header-height;
z-index: 200; z-index: 200;
background-color: $white-light; background-color: $white-light;
border-bottom: 1px solid $border-color; border-bottom: 1px solid $border-color;
...@@ -679,7 +679,7 @@ ...@@ -679,7 +679,7 @@
} }
.with-performance-bar .merge-request-tabs-holder { .with-performance-bar .merge-request-tabs-holder {
top: $new-navbar-height + $performance-bar-height; top: $header-height + $performance-bar-height;
} }
.merge-request-tabs { .merge-request-tabs {
......
app/assets/stylesheets/pages/search.scss
View file @ 4c020c8c
...@@ -47,6 +47,7 @@ input[type="checkbox"]:hover { ...@@ -47,6 +47,7 @@ input[type="checkbox"]:hover {
} }
.location-badge { .location-badge {
height: 32px;
font-size: 12px; font-size: 12px;
margin: -4px 4px -4px -4px; margin: -4px 4px -4px -4px;
line-height: 25px; line-height: 25px;
......
app/views/layouts/header/_default.html.haml
View file @ 4c020c8c
%header.navbar.navbar-gitlab.navbar-gitlab-new %header.navbar.navbar-gitlab
%a.sr-only.gl-accessibility{ href: "#content-body", tabindex: "1" } Skip to content %a.sr-only.gl-accessibility{ href: "#content-body", tabindex: "1" } Skip to content
.container-fluid .container-fluid
.header-content .header-content
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
%button.navbar-toggle.hidden-sm.hidden-md.hidden-lg{ type: 'button' } %button.navbar-toggle.hidden-sm.hidden-md.hidden-lg{ type: 'button' }
%span.sr-only Toggle navigation %span.sr-only Toggle navigation
= sprite_icon('more', size: 16, css_class: 'more-icon js-navbar-toggle-right') = sprite_icon('more', size: 12, css_class: 'more-icon js-navbar-toggle-right')
= sprite_icon('close', size: 16, css_class: 'close-icon js-navbar-toggle-left') = sprite_icon('close', size: 12, css_class: 'close-icon js-navbar-toggle-left')
= render 'shared/outdated_browser' = render 'shared/outdated_browser'
app/views/users/show.html.haml
View file @ 4c020c8c
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
= auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity") = auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity")
.user-profile .user-profile
.cover-block.user-cover-block.layout-nav .cover-block.user-cover-block.top-area
.cover-controls .cover-controls
- if @user == current_user - if @user == current_user
= link_to profile_path, class: 'btn btn-gray has-tooltip', title: 'Edit profile', 'aria-label': 'Edit profile' do = link_to profile_path, class: 'btn btn-gray has-tooltip', title: 'Edit profile', 'aria-label': 'Edit profile' do
......
spec/features/explore/new_menu_spec.rb
View file @ 4c020c8c
...@@ -128,12 +128,6 @@ feature 'Top Plus Menu', :js do ...@@ -128,12 +128,6 @@ feature 'Top Plus Menu', :js do
expect(find('.header-new.dropdown')).not_to have_selector('.header-new-project-snippet') expect(find('.header-new.dropdown')).not_to have_selector('.header-new-project-snippet')
end 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 scenario 'public project has no New merge request menu item' do
visit project_path(public_project) visit project_path(public_project)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7