Revert "Merge branch '27934-left-align-nav' into 'master'"
This reverts merge request !9338
This commit is contained in:
Annabel Dunstone Gray
parent
51546e26d7
commit
5331225005
7 changed files with 105 additions and 84 deletions
|
|
@ -148,11 +148,16 @@ header {
|
|||
}
|
||||
|
||||
.header-logo {
|
||||
display: inline-block;
|
||||
margin: 0 8px 0 3px;
|
||||
position: relative;
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
top: 7px;
|
||||
transition-duration: .3s;
|
||||
z-index: 999;
|
||||
|
||||
#logo {
|
||||
position: relative;
|
||||
left: -50%;
|
||||
}
|
||||
|
||||
svg,
|
||||
img {
|
||||
|
|
@ -162,6 +167,15 @@ header {
|
|||
&:hover {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
@media (max-width: $screen-xs-max) {
|
||||
right: 20px;
|
||||
left: auto;
|
||||
|
||||
#logo {
|
||||
left: auto;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.title {
|
||||
|
|
@ -169,7 +183,7 @@ header {
|
|||
padding-right: 20px;
|
||||
margin: 0;
|
||||
font-size: 18px;
|
||||
max-width: 450px;
|
||||
max-width: 385px;
|
||||
display: inline-block;
|
||||
line-height: $header-height;
|
||||
font-weight: normal;
|
||||
|
|
@ -179,6 +193,10 @@ header {
|
|||
vertical-align: top;
|
||||
white-space: nowrap;
|
||||
|
||||
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
|
||||
max-width: 300px;
|
||||
}
|
||||
|
||||
@media (max-width: $screen-xs-max) {
|
||||
max-width: 190px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
@mixin fade($gradient-direction, $gradient-color) {
|
||||
visibility: hidden;
|
||||
opacity: 0;
|
||||
z-index: 1;
|
||||
z-index: 2;
|
||||
position: absolute;
|
||||
bottom: 12px;
|
||||
width: 43px;
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
.fa {
|
||||
position: relative;
|
||||
top: 6px;
|
||||
top: 5px;
|
||||
font-size: 18px;
|
||||
}
|
||||
}
|
||||
|
|
@ -79,6 +79,7 @@
|
|||
}
|
||||
|
||||
&.sub-nav {
|
||||
text-align: center;
|
||||
background-color: $gray-normal;
|
||||
|
||||
.container-fluid {
|
||||
|
|
@ -286,6 +287,7 @@
|
|||
background: $gray-light;
|
||||
border-bottom: 1px solid $border-color;
|
||||
transition: padding $sidebar-transition-duration;
|
||||
text-align: center;
|
||||
|
||||
.container-fluid {
|
||||
position: relative;
|
||||
|
|
@ -351,7 +353,7 @@
|
|||
right: -5px;
|
||||
|
||||
.fa {
|
||||
right: -28px;
|
||||
right: -7px;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -381,7 +383,7 @@
|
|||
left: 0;
|
||||
|
||||
.fa {
|
||||
left: -4px;
|
||||
left: 10px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -652,24 +652,30 @@ pre.light-well {
|
|||
}
|
||||
}
|
||||
|
||||
.container-fluid.project-stats-container {
|
||||
@media (max-width: $screen-xs-max) {
|
||||
padding: 12px 0;
|
||||
}
|
||||
}
|
||||
|
||||
.project-last-commit {
|
||||
background-color: $gray-light;
|
||||
padding: 12px $gl-padding;
|
||||
border: 1px solid $border-color;
|
||||
|
||||
@media (min-width: $screen-sm-min) {
|
||||
margin-top: $gl-padding;
|
||||
}
|
||||
|
||||
&.container-fluid {
|
||||
padding-top: 12px;
|
||||
padding-bottom: 12px;
|
||||
background-color: $gray-light;
|
||||
border: 1px solid $border-color;
|
||||
border-right-width: 0;
|
||||
border-left-width: 0;
|
||||
|
||||
@media (min-width: $screen-sm-min) {
|
||||
border-right-width: 1px;
|
||||
border-left-width: 1px;
|
||||
}
|
||||
}
|
||||
|
||||
&.container-limited {
|
||||
@media (min-width: 1281px) {
|
||||
border-radius: $border-radius-base;
|
||||
}
|
||||
}
|
||||
|
||||
.ci-status {
|
||||
margin-right: $gl-padding;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.page-with-sidebar{ class: page_gutter_class }
|
||||
- if defined?(nav) && nav
|
||||
.layout-nav
|
||||
%div{ class: container_class }
|
||||
.container-fluid
|
||||
= render "layouts/nav/#{nav}"
|
||||
.content-wrapper{ class: "#{layout_nav_class}" }
|
||||
= yield :sub_nav
|
||||
|
|
|
|||
|
|
@ -61,12 +61,12 @@
|
|||
%div
|
||||
= link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-success'
|
||||
|
||||
%h1.title= title
|
||||
|
||||
.header-logo
|
||||
= link_to root_path, class: 'home', title: 'Dashboard', id: 'logo' do
|
||||
= brand_header_logo
|
||||
|
||||
%h1.title= title
|
||||
|
||||
= yield :header_content
|
||||
|
||||
= render 'shared/outdated_browser'
|
||||
|
|
|
|||
|
|
@ -13,8 +13,7 @@
|
|||
= render "home_panel"
|
||||
|
||||
- if current_user && can?(current_user, :download_code, @project)
|
||||
.project-stats-container{ class: container_class }
|
||||
%nav.project-stats
|
||||
%nav.project-stats{ class: container_class }
|
||||
%ul.nav
|
||||
%li
|
||||
= link_to project_files_path(@project) do
|
||||
|
|
@ -75,7 +74,7 @@
|
|||
Set up auto deploy
|
||||
|
||||
- if @repository.commit
|
||||
.project-last-commit
|
||||
.project-last-commit{ class: container_class }
|
||||
= render 'projects/last_commit', commit: @repository.commit, ref: current_ref, project: @project
|
||||
|
||||
%div{ class: container_class }
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
---
|
||||
title: Left align navigation
|
||||
merge_request:
|
||||
author:
|
||||
Loading…
Reference in a new issue