Commit 9793c346 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Make project page and header more compact

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent ac6dfbd9
...@@ -12,7 +12,7 @@ $code_font_size: 13px; ...@@ -12,7 +12,7 @@ $code_font_size: 13px;
$code_line_height: 1.5; $code_line_height: 1.5;
$border-color: #E7E9ED; $border-color: #E7E9ED;
$background-color: #F8FAFC; $background-color: #F8FAFC;
$header-height: 61px; $header-height: 58px;
$fixed-layout-width: 1200px; $fixed-layout-width: 1200px;
$gl-gray: #7f8fa4; $gl-gray: #7f8fa4;
$gl-padding: 16px; $gl-padding: 16px;
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
&.s24 { width: 24px; height: 24px; margin-right: 8px; } &.s24 { width: 24px; height: 24px; margin-right: 8px; }
&.s26 { width: 26px; height: 26px; margin-right: 8px; } &.s26 { width: 26px; height: 26px; margin-right: 8px; }
&.s32 { width: 32px; height: 32px; margin-right: 10px; } &.s32 { width: 32px; height: 32px; margin-right: 10px; }
&.s36 { width: 36px; height: 36px; margin-right: 10px; }
&.s46 { width: 46px; height: 46px; margin-right: 15px; } &.s46 { width: 46px; height: 46px; margin-right: 15px; }
&.s48 { width: 48px; height: 48px; margin-right: 10px; } &.s48 { width: 48px; height: 48px; margin-right: 10px; }
&.s60 { width: 60px; height: 60px; margin-right: 12px; } &.s60 { width: 60px; height: 60px; margin-right: 12px; }
......
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
width: $sidebar_collapsed_width; width: $sidebar_collapsed_width;
a { a {
padding-left: 10px; padding-left: 12px;
.gitlab-text-container { .gitlab-text-container {
display: none; display: none;
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
} }
.sidebar-user { .sidebar-user {
padding-left: 10px; padding-left: 12px;
width: $sidebar_collapsed_width; width: $sidebar_collapsed_width;
.username { .username {
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
margin-left: 10px; margin-left: 10px;
width: $sidebar_width - 2 * 10px; width: $sidebar_width - 2 * 10px;
font-size: 16px; font-size: 16px;
line-height: 36px; line-height: 34px;
} }
} }
...@@ -235,8 +235,8 @@ ...@@ -235,8 +235,8 @@
overflow: hidden; overflow: hidden;
img { img {
width: 40px; width: 36px;
height: 40px; height: 36px;
float: left; float: left;
} }
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
.project-home-desc { .project-home-desc {
h1 { h1 {
margin: 0; margin: 0;
margin-bottom: 5px; margin-bottom: 10px;
font-size: 23px; font-size: 23px;
font-weight: normal; font-weight: normal;
} }
...@@ -55,6 +55,10 @@ ...@@ -55,6 +55,10 @@
.git-clone-holder { .git-clone-holder {
max-width: 600px; max-width: 600px;
margin: 20px auto; margin: 20px auto;
.form-control {
background: #FFF;
}
} }
.visibility-level-label { .visibility-level-label {
...@@ -65,7 +69,7 @@ ...@@ -65,7 +69,7 @@
} }
.project-repo-buttons { .project-repo-buttons {
margin-top: 25px; margin-top: $gl-padding;
margin-bottom: 25px; margin-bottom: 25px;
.btn { .btn {
...@@ -74,7 +78,7 @@ ...@@ -74,7 +78,7 @@
text-transform: uppercase; text-transform: uppercase;
font-size: 15px; font-size: 15px;
line-height: 20px; line-height: 20px;
padding: 10px 16px; padding: 8px 14px;
border-radius: 3px; border-radius: 3px;
margin-left: 10px; margin-left: 10px;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
= render partial: 'layouts/collapse_button' = render partial: 'layouts/collapse_button'
- if current_user - if current_user
= link_to current_user, class: 'sidebar-user' do = link_to current_user, class: 'sidebar-user' do
= image_tag avatar_icon(current_user.email, 60), alt: 'User activity', class: 'avatar avatar s40' = image_tag avatar_icon(current_user.email, 60), alt: 'User activity', class: 'avatar avatar s36'
.username .username
= current_user.username = current_user.username
.content-wrapper .content-wrapper
......
- empty_repo = @project.empty_repo? - empty_repo = @project.empty_repo?
.project-home-panel.clearfix{:class => ("empty-project" if empty_repo)} .project-home-panel.clearfix{:class => ("empty-project" if empty_repo)}
.project-identicon-holder .project-identicon-holder
= project_icon(@project, alt: '', class: 'project-avatar avatar s140') = project_icon(@project, alt: '', class: 'project-avatar avatar s90')
.project-home-desc .project-home-desc
%h1= @project.name %h1= @project.name
- if @project.description.present? - if @project.description.present?
......
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