Skip to content

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

Refactor header css/html 

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent a42f4d85
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 153 deletions
app/assets/stylesheets/base/variables.scss
View file @ d4dde374
...@@ -5,6 +5,7 @@ $gl-link-color: #446e9b; ...@@ -5,6 +5,7 @@ $gl-link-color: #446e9b;
$nprogress-color: #c0392b; $nprogress-color: #c0392b;
$gl-font-size: 14px; $gl-font-size: 14px;
$list-font-size: 15px; $list-font-size: 15px;
$sidebar_collapsed_width: 52px;
$sidebar_width: 230px; $sidebar_width: 230px;
$avatar_radius: 50%; $avatar_radius: 50%;
$code_font_size: 13px; $code_font_size: 13px;
......
app/assets/stylesheets/generic/header.scss
View file @ d4dde374
...@@ -2,7 +2,13 @@ ...@@ -2,7 +2,13 @@
* Application Header * Application Header
* *
*/ */
$header-height: 46px;
header { header {
&.empty-header .container {
border-bottom: 1px solid #EEE;
}
&.navbar-gitlab { &.navbar-gitlab {
z-index: 100; z-index: 100;
margin-bottom: 0; margin-bottom: 0;
...@@ -13,54 +19,9 @@ header { ...@@ -13,54 +19,9 @@ header {
.container { .container {
width: 100% !important; width: 100% !important;
padding: 0; padding: 0;
padding-right: 35px;
background: #FFF; background: #FFF;
border-bottom: 1px solid #EEE;
filter: none; filter: none;
.title {
position: relative;
float: left;
margin: 0;
margin-left: 25px;
font-size: 18px;
line-height: 44px;
font-weight: bold;
color: #444;
@include str-truncated(37%);
a {
color: #444;
&:hover {
text-decoration: underline;
}
}
}
.app_logo {
border-bottom: 1px solid transparent;
margin-bottom: -1px;
a {
padding: 5px 8px;
img {
float: left;
}
h3 {
width: 158px;
float: left;
margin: 0;
margin-left: 20px;
font-size: 18px;
line-height: 34px;
font-weight: normal;
}
}
}
.nav > li > a { .nav > li > a {
color: #888; color: #888;
font-size: 14px; font-size: 14px;
...@@ -80,7 +41,6 @@ header { ...@@ -80,7 +41,6 @@ header {
} }
} }
/** NAV block with links and profile **/
.nav { .nav {
float: right; float: right;
margin-right: 0; margin-right: 0;
...@@ -96,73 +56,68 @@ header { ...@@ -96,73 +56,68 @@ header {
} }
} }
} }
.turbolink-spinner {
font-size: 20px;
margin-right: 10px;
}
@media (max-width: $screen-xs-max) {
border-width: 0;
font-size: 18px;
.title {
@include str-truncated(70%);
}
.navbar-collapse {
margin-top: 47px;
}
.navbar-nav {
margin: 5px 0;
.visible-xs, .visable-sm {
display: table-cell !important;
}
}
li {
display: table-cell;
width: 1%;
a {
text-align: center;
font-size: 18px !important;
}
}
}
} }
/** .header-logo {
* border-bottom: 1px solid transparent;
* Logo holder
*
*/
.app_logo {
float: left; float: left;
margin-right: 9px; height: $header-height;
width: $sidebar_width;
a { a {
float: left; float: left;
height: 46px; height: $header-height;
width: 100%; width: 100%;
padding: 5px 8px;
h3 {
width: 158px;
float: left;
margin: 0;
margin-left: 20px;
font-size: 18px;
line-height: 34px;
font-weight: normal;
}
img { img {
width: 36px; width: 36px;
height: 36px; height: 36px;
float: left;
} }
} }
&:hover { &:hover {
background-color: #EEE; background-color: #EEE;
} }
} }
/** .header-content {
* border-bottom: 1px solid #EEE;
* Search box padding-right: 35px;
* height: $header-height;
*/
.title {
position: relative;
float: left;
margin: 0;
margin-left: 35px;
font-size: 18px;
line-height: 44px;
font-weight: bold;
color: #444;
@include str-truncated(37%);
a {
color: #444;
&:hover {
text-decoration: underline;
}
}
}
}
.search { .search {
margin-right: 10px; margin-right: 10px;
margin-left: 10px; margin-left: 10px;
...@@ -198,6 +153,22 @@ header { ...@@ -198,6 +153,22 @@ header {
width: 300px; width: 300px;
} }
@mixin collapsed-header {
.header-logo {
width: $sidebar_collapsed_width;
h3 {
display: none;
}
}
.header-content {
.title {
margin-left: 30px;
}
}
}
@media (max-width: 1200px) { @media (max-width: 1200px) {
.search .search-input { .search .search-input {
width: 200px; width: 200px;
...@@ -212,23 +183,48 @@ header { ...@@ -212,23 +183,48 @@ header {
@media (max-width: $screen-md-max) { @media (max-width: $screen-md-max) {
.header-collapsed, .header-expanded { .header-collapsed, .header-expanded {
width: 52px; @include collapsed-header;
h3 {
display: none;
}
} }
} }
@media(min-width: $screen-md-max) { @media(min-width: $screen-md-max) {
.header-collapsed { .header-collapsed {
width: 52px; @include collapsed-header;
h3 {
display: none;
}
} }
.header-expanded { .header-expanded {
} }
} }
@media (max-width: $screen-xs-max) {
header .container {
border-width: 0;
font-size: 18px;
.title {
@include str-truncated(70%);
}
.navbar-collapse {
margin-top: 47px;
}
.navbar-nav {
margin: 5px 0;
.visible-xs, .visable-sm {
display: table-cell !important;
}
}
li {
display: table-cell;
width: 1%;
a {
text-align: center;
font-size: 18px !important;
}
}
}
}
app/assets/stylesheets/generic/sidebar.scss
View file @ d4dde374
...@@ -102,13 +102,13 @@ ...@@ -102,13 +102,13 @@
padding-left: 50px; padding-left: 50px;
.sidebar-wrapper { .sidebar-wrapper {
width: 52px; width: $sidebar_collapsed_width;
.nav-sidebar { .nav-sidebar {
margin-top: 29px; margin-top: 29px;
position: fixed; position: fixed;
top: 45px; top: 45px;
width: 52px; width: $sidebar_collapsed_width;
li a { li a {
padding-left: 18px; padding-left: 18px;
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
.collapse-nav a { .collapse-nav a {
left: 0px; left: 0px;
width: 52px; width: $sidebar_collapsed_width;
} }
.sidebar-user { .sidebar-user {
......
app/assets/stylesheets/themes/gitlab-theme.scss
View file @ d4dde374
@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 {
.app_logo { .header-logo {
background-color: $color-darker; background-color: $color-darker;
border-color: $color-darker;
a { a {
color: $color-light; color: $color-light;
......
app/views/layouts/_empty_head_panel.html.haml
View file @ d4dde374
%header.navbar.navbar-fixed-top.navbar-gitlab %header.navbar.navbar-fixed-top.navbar-gitlab.empty-header
.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 @ d4dde374
%header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class } %header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class }
.container .container
%div.app_logo .header-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 .header-content
= 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 fw')
%li
= link_to explore_root_path, title: 'Explore', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('globe fw')
%li
= link_to user_snippets_path(current_user), title: 'Your snippets', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('clipboard fw')
- if current_user.is_admin?
%li %li
= link_to admin_root_path, title: 'Admin area', data: {toggle: 'tooltip', placement: 'bottom'} do = link_to help_path, title: 'Help', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('wrench fw') = icon('question-circle fw')
- if current_user.can_create_project?
%li %li
= link_to new_project_path, title: 'New project', data: {toggle: 'tooltip', placement: 'bottom'} do = link_to explore_root_path, title: 'Explore', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('plus fw') = icon('globe fw')
%li %li
= link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do = link_to user_snippets_path(current_user), title: 'Your snippets', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('cog fw') = icon('clipboard fw')
- if current_user.is_admin?
%li
= link_to admin_root_path, title: 'Admin area', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('wrench fw')
- if current_user.can_create_project?
%li
= link_to new_project_path, title: 'New project', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('plus fw')
%li
= link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('cog fw')
= render 'shared/outdated_browser' = render 'shared/outdated_browser'
app/views/layouts/_public_head_panel.html.haml
View file @ d4dde374
%header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class } %header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class }
.container .container
%div.app_logo .header-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 .header-content
%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