deac
/
gitlabhq
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reduce size of nav panel. Fixed nav background for IE. Refactored mars theme

5-0-stable
Dmitriy Zaporozhets 2013-02-16 21:24:51 +02:00
parent fa3cc1dd24
commit 18a496142b
5 changed files with 32 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
View File

@ -63,7 +63,7 @@
color: $style_color; color: $style_color;
text-shadow: 0 1px 1px #FFF; text-shadow: 0 1px 1px #FFF;
font-family: 'Yanone', sans-serif; font-family: 'Yanone', sans-serif;
font-size: 26px; font-size: 24px;
line-height: 42px; line-height: 36px;
font-weight: normal; font-weight: normal;
} }

27
app/assets/stylesheets/sections/commits.scss
View File

@ -29,7 +29,7 @@
a{ a{
color: $style_color; color: $style_color;
} }
> span { > span {
font-family: $monospace_font; font-family: $monospace_font;
font-size: 14px; font-size: 14px;
@ -124,7 +124,7 @@
.wrap{ .wrap{
display: inline-block; display: inline-block;
} }
.frame { .frame {
display: inline-block; display: inline-block;
background-color: #fff; background-color: #fff;
@ -149,7 +149,7 @@
.view.swipe{ .view.swipe{
position: relative; position: relative;
.swipe-frame{ .swipe-frame{
display: block; display: block;
margin: auto; margin: auto;
@ -228,7 +228,7 @@
bottom: 0px; bottom: 0px;
left: 50%; left: 50%;
margin-left: -150px; margin-left: -150px;
.drag-track{ .drag-track{
display: block; display: block;
position: absolute; position: absolute;
@ -237,7 +237,7 @@
width: 276px; width: 276px;
background: url('onion_skin_sprites.gif') -4px -20px repeat-x; background: url('onion_skin_sprites.gif') -4px -20px repeat-x;
} }
.dragger { .dragger {
display: block; display: block;
position: absolute; position: absolute;
@ -248,7 +248,7 @@
background: url('onion_skin_sprites.gif') 0px -34px repeat-x; background: url('onion_skin_sprites.gif') 0px -34px repeat-x;
cursor: pointer; cursor: pointer;
} }
.transparent { .transparent {
display: block; display: block;
position: absolute; position: absolute;
@ -258,7 +258,7 @@
width: 10px; width: 10px;
background: url('onion_skin_sprites.gif') -2px 0px no-repeat; background: url('onion_skin_sprites.gif') -2px 0px no-repeat;
} }
.opaque { .opaque {
display: block; display: block;
position: absolute; position: absolute;
@ -275,19 +275,19 @@
padding: 10px; padding: 10px;
text-align: center; text-align: center;
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
ul, li{ ul, li{
list-style: none; list-style: none;
margin: 0; margin: 0;
padding: 0; padding: 0;
display: inline-block; display: inline-block;
} }
li{ li{
color: grey; color: grey;
border-left: 1px solid #c1c1c1; border-left: 1px solid #c1c1c1;
@ -322,12 +322,12 @@
} }
.commit-author, .commit-committer{ .commit-author, .commit-committer{
display: block; display: block;
color: #999; color: #999;
font-weight: normal; font-weight: normal;
font-style: italic; font-style: italic;
} }
.commit-author strong, .commit-committer strong{ .commit-author strong, .commit-committer strong{
font-weight: bold; font-weight: bold;
font-style: normal; font-style: normal;
} }
@ -337,7 +337,6 @@
*/ */
.commit { .commit {
.browse_code_link_holder { .browse_code_link_holder {
@extend .span2;
float: right; float: right;
} }

25
app/assets/stylesheets/sections/header.scss
View File

@ -5,15 +5,16 @@
header { header {
&.navbar-gitlab { &.navbar-gitlab {
.navbar-inner { .navbar-inner {
height: 45px; height: 40px;
padding: 5px; padding: 3px;
background: #F1F1F1; background: #F1F1F1;
filter: none;
.nav > li > a { .nav > li > a {
color: $style_color; color: $style_color;
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
font-size: 18px; font-size: 16px;
padding: 12px; padding: 10px;
} }
/** NAV block with links and profile **/ /** NAV block with links and profile **/
@ -25,7 +26,6 @@ header {
} }
z-index: 10; z-index: 10;
/*height: 60px;*/
/** /**
* *
@ -34,7 +34,7 @@ header {
*/ */
.app_logo { .app_logo {
float: left; float: left;
margin-right: 15px; margin-right: 9px;
position: relative; position: relative;
top: -5px; top: -5px;
padding-top: 5px; padding-top: 5px;
@ -42,10 +42,10 @@ header {
a { a {
float: left; float: left;
padding: 0px; padding: 0px;
margin: 0 10px; margin: 0 6px;
h1 { h1 {
background: url('logo_dark.png') no-repeat 0px 2px; background: url('logo_dark.png') no-repeat 0px 1px;
float: left; float: left;
height: 40px; height: 40px;
width: 40px; width: 40px;
@ -79,7 +79,6 @@ header {
.search { .search {
margin-right: 45px; margin-right: 45px;
margin-left: 10px; margin-left: 10px;
margin-top: 2px;
.search-input { .search-input {
@extend .span2; @extend .span2;
@ -105,7 +104,7 @@ header {
.account-box { .account-box {
position: absolute; position: absolute;
right: 0; right: 0;
top: 6px; top: 4px;
z-index: 10000; z-index: 10000;
width: 128px; width: 128px;
font-size: 11px; font-size: 11px;
@ -240,7 +239,7 @@ header {
.app_logo { .app_logo {
a { a {
h1 { h1 {
background: url('logo_white.png') no-repeat center center; background: url('logo_white.png') no-repeat center 1px;
color: #fff; color: #fff;
text-shadow: 0 1px 1px #111; text-shadow: 0 1px 1px #111;
} }
@ -261,11 +260,11 @@ header {
.separator { .separator {
float: left; float: left;
height: 60px; height: 46px;
width: 1px; width: 1px;
background: white; background: white;
border-left: 1px solid #DDD; border-left: 1px solid #DDD;
margin-top: -10px; margin-top: -3px;
margin-left: 10px; margin-left: 10px;
margin-right: 10px; margin-right: 10px;
} }

38
app/assets/stylesheets/themes/ui_mars.scss
View File

@ -8,28 +8,20 @@
* *
*/ */
.ui_mars { .ui_mars {
/* /*
* Application Header * Application Header
* *
*/ */
header { header {
@extend .header-dark;
&.navbar-gitlab { &.navbar-gitlab {
.navbar-inner { .navbar-inner {
background: #474D57 url('bg-header.png') repeat-x bottom; background: #474D57 url('bg-header.png') repeat-x bottom;
border-bottom: 1px solid #444; border-bottom: 1px solid #444;
.nav > li > a {
color: #eee;
text-shadow: 0 1px 0 #444;
}
} }
} }
.search { .search {
float: right;
margin-right: 45px;
.search-input { .search-input {
border: 1px solid rgba(0, 0, 0, 0.7); border: 1px solid rgba(0, 0, 0, 0.7);
background-color: #D2D5DA; background-color: #D2D5DA;
@ -43,31 +35,9 @@
.search-input::-webkit-input-placeholder { .search-input::-webkit-input-placeholder {
color: #666; color: #666;
} }
.app_logo { .separator {
a { background: #31363E;
h1 { border-left: 1px solid #666;
background: url('logo_white.png') no-repeat center center;
color: #eee;
text-shadow: 0 1px 1px #111;
}
}
&:hover {
background-color: #41464e;
}
}
.project_name {
color: #eee;
text-shadow: 0 1px 1px #111;
} }
} }
.separator {
background: #31363E;
border-left: 1px solid #666;
}
/*
* End of Application Header
*
*/
} }

2
app/views/commits/_commit.html.haml
View File

@ -6,7 +6,7 @@
= link_to commit.short_id(8), project_commit_path(@project, commit), class: "commit_short_id" = link_to commit.short_id(8), project_commit_path(@project, commit), class: "commit_short_id"
= commit.author_link avatar: true, size: 24 = commit.author_link avatar: true, size: 24
   
= link_to_gfm truncate(commit.title, length: 50), project_commit_path(@project, commit.id), class: "row_title" = link_to_gfm truncate(commit.title, length: 70), project_commit_path(@project, commit.id), class: "row_title"
%span.committed_ago %span.committed_ago
= time_ago_in_words(commit.committed_date) = time_ago_in_words(commit.committed_date)