Merge branch '27934-left-align-nav' into 'master'

Resolve "Left align nav items"

Closes #27934

See merge request !9338

app/assets/stylesheets/framework/header.scss

@@ -148,16 +148,11 @@ header {
     }
 
     .header-logo {
-      position: absolute;
+      display: inline-block;
-      left: 50%;
+      margin: 0 8px 0 3px;
+      position: relative;
       top: 7px;
       transition-duration: .3s;
-      z-index: 999;
-
-      #logo {
-        position: relative;
-        left: -50%;
-      }
 
       svg,
       img {
@@ -167,15 +162,6 @@ header {
       &:hover {
         cursor: pointer;
       }
-
-      @media (max-width: $screen-xs-max) {
-        right: 20px;
-        left: auto;
-
-        #logo {
-          left: auto;
-        }
-      }
     }
 
     .title {
@@ -183,7 +169,7 @@ header {
       padding-right: 20px;
       margin: 0;
       font-size: 18px;
-      max-width: 385px;
+      max-width: 450px;
       display: inline-block;
       line-height: $header-height;
       font-weight: normal;
@@ -193,10 +179,6 @@ 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;
       }

app/assets/stylesheets/framework/nav.scss

@@ -1,7 +1,7 @@
 @mixin fade($gradient-direction, $gradient-color) {
   visibility: hidden;
   opacity: 0;
-  z-index: 2;
+  z-index: 1;
   position: absolute;
   bottom: 12px;
   width: 43px;
@@ -18,7 +18,7 @@
 
   .fa {
     position: relative;
-    top: 5px;
+    top: 6px;
     font-size: 18px;
   }
 }
@@ -79,7 +79,6 @@
   }
 
   &.sub-nav {
-    text-align: center;
     background-color: $gray-normal;
 
     .container-fluid {
@@ -287,7 +286,6 @@
   background: $gray-light;
   border-bottom: 1px solid $border-color;
   transition: padding $sidebar-transition-duration;
-  text-align: center;
 
   .container-fluid {
     position: relative;
@@ -353,7 +351,7 @@
     right: -5px;
 
     .fa {
-      right: -7px;
+      right: -28px;
     }
   }
 
@@ -383,7 +381,7 @@
       left: 0;
 
       .fa {
-        left: 10px;
+        left: -4px;
       }
     }
   }

app/assets/stylesheets/pages/projects.scss

@@ -645,29 +645,23 @@ 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 {
+  @media (min-width: $screen-sm-min) {
-    padding-top: 12px;
+    border-radius: $border-radius-base;
-    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 {

app/views/layouts/_page.html.haml

@@ -1,7 +1,7 @@
 .page-with-sidebar{ class: page_gutter_class }
   - if defined?(nav) && nav
     .layout-nav
-      .container-fluid
+      %div{ class: container_class }
         = render "layouts/nav/#{nav}"
   .content-wrapper{ class: "#{layout_nav_class}" }
     = yield :sub_nav

app/views/layouts/header/_default.html.haml

@@ -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'

app/views/projects/show.html.haml

@@ -13,69 +13,70 @@
 = render "home_panel"
 
 - if current_user && can?(current_user, :download_code, @project)
-  %nav.project-stats{ class: container_class }
+  .project-stats-container{ class: container_class }
-    %ul.nav
+    %nav.project-stats
-      %li
+      %ul.nav
-        = link_to project_files_path(@project) do
-          Files (#{storage_counter(@project.statistics.total_repository_size)})
-      %li
-        = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
-          #{'Commit'.pluralize(@project.statistics.commit_count)} (#{number_with_delimiter(@project.statistics.commit_count)})
-      %li
-        = link_to namespace_project_branches_path(@project.namespace, @project) do
-          #{'Branch'.pluralize(@repository.branch_count)} (#{number_with_delimiter(@repository.branch_count)})
-      %li
-        = link_to namespace_project_tags_path(@project.namespace, @project) do
-          #{'Tag'.pluralize(@repository.tag_count)} (#{number_with_delimiter(@repository.tag_count)})
-
-      - if default_project_view != 'readme' && @repository.readme
         %li
-          = link_to 'Readme', readme_path(@project)
+          = link_to project_files_path(@project) do
-
+            Files (#{storage_counter(@project.statistics.total_repository_size)})
-      - if @repository.changelog
         %li
-          = link_to 'Changelog', changelog_path(@project)
+          = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
-
+            #{'Commit'.pluralize(@project.statistics.commit_count)} (#{number_with_delimiter(@project.statistics.commit_count)})
-      - if @repository.license_blob
         %li
-          = link_to license_short_name(@project), license_path(@project)
+          = link_to namespace_project_branches_path(@project.namespace, @project) do
-
+            #{'Branch'.pluralize(@repository.branch_count)} (#{number_with_delimiter(@repository.branch_count)})
-      - if @repository.contribution_guide
         %li
-          = link_to 'Contribution guide', contribution_guide_path(@project)
+          = link_to namespace_project_tags_path(@project.namespace, @project) do
+            #{'Tag'.pluralize(@repository.tag_count)} (#{number_with_delimiter(@repository.tag_count)})
 
-      - if @repository.gitlab_ci_yml
+        - if default_project_view != 'readme' && @repository.readme
-        %li
+          %li
-          = link_to 'CI configuration', ci_configuration_path(@project)
+            = link_to 'Readme', readme_path(@project)
 
-      - if current_user && can_push_branch?(@project, @project.default_branch)
+        - if @repository.changelog
-        - unless @repository.changelog
+          %li
-          %li.missing
+            = link_to 'Changelog', changelog_path(@project)
-            = link_to add_special_file_path(@project, file_name: 'CHANGELOG') do
-              Add Changelog
-        - unless @repository.license_blob
-          %li.missing
-            = link_to add_special_file_path(@project, file_name: 'LICENSE') do
-              Add License
-        - unless @repository.contribution_guide
-          %li.missing
-            = link_to add_special_file_path(@project, file_name: 'CONTRIBUTING.md', commit_message: 'Add contribution guide') do
-              Add Contribution guide
-        - unless @repository.gitlab_ci_yml
-          %li.missing
-            = link_to add_special_file_path(@project, file_name: '.gitlab-ci.yml') do
-              Set up CI
-        - if koding_enabled? && @repository.koding_yml.blank?
-          %li.missing
-            = link_to 'Set up Koding', add_koding_stack_path(@project)
-        - if @repository.gitlab_ci_yml.blank? && @project.deployment_service.present?
-          %li.missing
-            = link_to add_special_file_path(@project, file_name: '.gitlab-ci.yml', commit_message: 'Set up auto deploy', target_branch: 'auto-deploy', context: 'autodeploy') do
-              Set up auto deploy
 
-  - if @repository.commit
+        - if @repository.license_blob
-    .project-last-commit{ class: container_class }
+          %li
-      = render 'projects/last_commit', commit: @repository.commit, ref: current_ref, project: @project
+            = link_to license_short_name(@project), license_path(@project)
+
+        - if @repository.contribution_guide
+          %li
+            = link_to 'Contribution guide', contribution_guide_path(@project)
+
+        - if @repository.gitlab_ci_yml
+          %li
+            = link_to 'CI configuration', ci_configuration_path(@project)
+
+        - if current_user && can_push_branch?(@project, @project.default_branch)
+          - unless @repository.changelog
+            %li.missing
+              = link_to add_special_file_path(@project, file_name: 'CHANGELOG') do
+                Add Changelog
+          - unless @repository.license_blob
+            %li.missing
+              = link_to add_special_file_path(@project, file_name: 'LICENSE') do
+                Add License
+          - unless @repository.contribution_guide
+            %li.missing
+              = link_to add_special_file_path(@project, file_name: 'CONTRIBUTING.md', commit_message: 'Add contribution guide') do
+                Add Contribution guide
+          - unless @repository.gitlab_ci_yml
+            %li.missing
+              = link_to add_special_file_path(@project, file_name: '.gitlab-ci.yml') do
+                Set up CI
+          - if koding_enabled? && @repository.koding_yml.blank?
+            %li.missing
+              = link_to 'Set up Koding', add_koding_stack_path(@project)
+          - if @repository.gitlab_ci_yml.blank? && @project.deployment_service.present?
+            %li.missing
+              = link_to add_special_file_path(@project, file_name: '.gitlab-ci.yml', commit_message: 'Set up auto deploy', target_branch: 'auto-deploy', context: 'autodeploy') do
+                Set up auto deploy
+
+    - if @repository.commit
+      .project-last-commit
+        = render 'projects/last_commit', commit: @repository.commit, ref: current_ref, project: @project
 
 %div{ class: container_class }
   - if @project.archived?

changelogs/unreleased/27934-left-align-nav.yml

@@ -0,0 +1,4 @@
+---
+title: Left align navigation
+merge_request:
+author: