Skip to content

G
gitlab-ce
Commit ac5f9ff4 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

Merge branch 'container-class-reloaded' of... 

Merge branch 'container-class-reloaded' of https://github.com/Soullivaneuh/gitlabhq into Soullivaneuh-container-class-reloaded
parents 8d3eaf5f 2b0a1ca0
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 80 deletions
app/assets/stylesheets/generic/header.scss
View file @ ac5f9ff4
...@@ -10,7 +10,10 @@ header { ...@@ -10,7 +10,10 @@ header {
border: none; border: none;
width: 100%; width: 100%;
.navbar-inner { .container {
width: 100% !important;
padding: 0;
background: #FFF; background: #FFF;
border-bottom: 1px solid #DDD; border-bottom: 1px solid #DDD;
filter: none; filter: none;
...@@ -123,11 +126,6 @@ header { ...@@ -123,11 +126,6 @@ header {
} }
} }
.container {
width: 100% !important;
padding: 0px;
}
/** /**
* *
* Logo holder * Logo holder
......
app/assets/stylesheets/generic/mobile.scss
View file @ ac5f9ff4
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
} }
} }
.navbar-inner .title { .container .title {
margin-left: 6px !important; margin-left: 6px !important;
max-width: 70% !important; max-width: 70% !important;
} }
......
app/assets/stylesheets/themes/gitlab-theme.scss
View file @ ac5f9ff4
@mixin gitlab-theme($color-light, $color, $color-darker, $color-dark) { @mixin gitlab-theme($color-light, $color, $color-darker, $color-dark) {
header { header {
&.navbar-gitlab { &.navbar-gitlab {
.navbar-inner { .app_logo {
.app_logo { background-color: $color-darker;
background-color: $color-darker;
a { a {
color: $color-light; color: $color-light;
} }
&:hover { &:hover {
background-color: $color-dark; background-color: $color-dark;
a { a {
color: #FFF; color: #FFF;
}
} }
} }
} }
......
app/views/layouts/_empty_head_panel.html.haml
View file @ ac5f9ff4
%header.navbar.navbar-fixed-top.navbar-gitlab %header.navbar.navbar-fixed-top.navbar-gitlab
.navbar-inner .container
.container %h4.center
%h4.center = image_tag 'logo-white.png', width: 32, height: 32
= image_tag 'logo-white.png', width: 32, height: 32
app/views/layouts/_head_panel.html.haml
View file @ ac5f9ff4
%header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class } %header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class }
.navbar-inner .container
.container %div.app_logo
%div.app_logo = link_to root_path, class: 'home', title: 'Dashboard', id: 'js-shortcuts-home', data: {toggle: 'tooltip', placement: 'bottom'} do
= link_to root_path, class: 'home', title: 'Dashboard', id: 'js-shortcuts-home', data: {toggle: 'tooltip', placement: 'bottom'} do = brand_header_logo
= brand_header_logo %h3 GitLab
%h3 GitLab %h1.title= title
%h1.title= title
%button.navbar-toggle{type: 'button', data: {target: '.navbar-collapse', toggle: 'collapse'}} %button.navbar-toggle{type: 'button', data: {target: '.navbar-collapse', toggle: 'collapse'}}
%span.sr-only Toggle navigation %span.sr-only Toggle navigation
= icon('bars') = icon('bars')
.navbar-collapse.collapse .navbar-collapse.collapse
%ul.nav.navbar-nav %ul.nav.navbar-nav
%li.hidden-sm.hidden-xs %li.hidden-sm.hidden-xs
= render 'layouts/search' = render 'layouts/search'
%li.visible-sm.visible-xs %li.visible-sm.visible-xs
= link_to search_path, title: 'Search', data: {toggle: 'tooltip', placement: 'bottom'} do = link_to search_path, title: 'Search', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('search') = icon('search')
%li
= link_to help_path, title: 'Help', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('question-circle')
%li
= link_to explore_root_path, title: 'Explore', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('globe')
%li
= link_to user_snippets_path(current_user), title: 'Your snippets', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('clipboard')
- if current_user.is_admin?
%li %li
= link_to help_path, title: 'Help', data: {toggle: 'tooltip', placement: 'bottom'} do = link_to admin_root_path, title: 'Admin area', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('question-circle') = icon('cogs')
- if current_user.can_create_project?
%li %li
= link_to explore_root_path, title: 'Explore', data: {toggle: 'tooltip', placement: 'bottom'} do = link_to new_project_path, title: 'New project', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('globe') = icon('plus')
%li %li
= link_to user_snippets_path(current_user), title: 'Your snippets', data: {toggle: 'tooltip', placement: 'bottom'} do = link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('clipboard') = icon('user')
- if current_user.is_admin? %li
%li = link_to destroy_user_session_path, class: 'logout', method: :delete, title: 'Sign out', data: {toggle: 'tooltip', placement: 'bottom'} do
= link_to admin_root_path, title: 'Admin area', data: {toggle: 'tooltip', placement: 'bottom'} do = icon('sign-out')
= icon('cogs') %li.hidden-xs
- if current_user.can_create_project? = link_to current_user, class: 'profile-pic', id: 'profile-pic', data: {toggle: 'tooltip', placement: 'bottom'} do
%li = image_tag avatar_icon(current_user.email, 60), alt: 'User activity'
= link_to new_project_path, title: 'New project', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('plus')
%li
= link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('user')
%li
= link_to destroy_user_session_path, class: 'logout', method: :delete, title: 'Sign out', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('sign-out')
%li.hidden-xs
= link_to current_user, class: 'profile-pic', id: 'profile-pic', data: {toggle: 'tooltip', placement: 'bottom'} do
= image_tag avatar_icon(current_user.email, 60), alt: 'User activity'
= render 'shared/outdated_browser' = render 'shared/outdated_browser'
app/views/layouts/_public_head_panel.html.haml
View file @ ac5f9ff4
%header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class } %header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class }
.navbar-inner .container
.container %div.app_logo
%div.app_logo = link_to explore_root_path, class: "home" do
= link_to explore_root_path, class: "home" do = brand_header_logo
= brand_header_logo %h3 GitLab
%h3 GitLab %h1.title= title
%h1.title= title
%button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", type: "button"} %button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", type: "button"}
%span.sr-only Toggle navigation %span.sr-only Toggle navigation
%i.fa.fa-bars %i.fa.fa-bars
- unless current_controller?('sessions') - unless current_controller?('sessions')
.pull-right.hidden-xs .pull-right.hidden-xs
= link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-new append-right-10' = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-new append-right-10'
.navbar-collapse.collapse .navbar-collapse.collapse
%ul.nav.navbar-nav %ul.nav.navbar-nav
%li.visible-xs %li.visible-xs
= link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes') = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes')
= render 'shared/outdated_browser' = render 'shared/outdated_browser'
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