Commit 781f5aa6fb25b4aed91f711daefdae4bce8d968b
1 parent
0fe36374
Exists in
master
and in
4 other branches
classic theme improved, images refactored
Showing
18 changed files
with
45 additions
and
36 deletions
Show diff stats
app/assets/images/Arrow-Left-UI.PNG
568 Bytes
app/assets/images/Arrow-Right-UI.PNG
561 Bytes
app/assets/images/add_new.png
333 Bytes
app/assets/images/ajax-loader-tree.gif
2.55 KB
app/assets/images/blueprint_add.png
177 Bytes
app/assets/images/blueprint_delete.png
295 Bytes
app/assets/images/blueprint_info.png
749 Bytes
177 Bytes
295 Bytes
749 Bytes
302 Bytes
app/assets/images/logo_tr.png
2.01 KB
app/assets/images/rails.png
6.49 KB
app/assets/stylesheets/ui_basic.scss
| @@ -43,11 +43,14 @@ | @@ -43,11 +43,14 @@ | ||
| 43 | .app_logo { | 43 | .app_logo { |
| 44 | width:230px; | 44 | width:230px; |
| 45 | float:left; | 45 | float:left; |
| 46 | + position:relative; | ||
| 47 | + top:-5px; | ||
| 46 | 48 | ||
| 47 | a { | 49 | a { |
| 48 | float:left; | 50 | float:left; |
| 49 | 51 | ||
| 50 | h1 { | 52 | h1 { |
| 53 | + background: url('logo_tr.png') no-repeat -3px -4px; | ||
| 51 | float:left; | 54 | float:left; |
| 52 | margin-left:5px; | 55 | margin-left:5px; |
| 53 | font-size:20px; | 56 | font-size:20px; |
| @@ -55,16 +58,8 @@ | @@ -55,16 +58,8 @@ | ||
| 55 | font-weight:bold; | 58 | font-weight:bold; |
| 56 | color:#aaa; | 59 | color:#aaa; |
| 57 | text-shadow: 0 1px 1px #FFF; | 60 | text-shadow: 0 1px 1px #FFF; |
| 58 | - } | ||
| 59 | - | ||
| 60 | - &.home { | ||
| 61 | - img { | ||
| 62 | - float: left; | ||
| 63 | - position: relative; | ||
| 64 | - top: -9px; | ||
| 65 | - width:46px; | ||
| 66 | - | ||
| 67 | - } | 61 | + padding-left:50px; |
| 62 | + padding-top:5px; | ||
| 68 | } | 63 | } |
| 69 | } | 64 | } |
| 70 | } | 65 | } |
app/assets/stylesheets/ui_mars.scss
| @@ -9,6 +9,28 @@ | @@ -9,6 +9,28 @@ | ||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | .ui_mars { | 11 | .ui_mars { |
| 12 | + background:#eee; | ||
| 13 | + | ||
| 14 | + .container { | ||
| 15 | + border: 1px solid rgba(0,0,0,.22); | ||
| 16 | + box-shadow: 0 0 0px 4px rgba(0,0,0,.04); | ||
| 17 | + background:white; | ||
| 18 | + margin-top:20px; | ||
| 19 | + min-height:500px; | ||
| 20 | + | ||
| 21 | + nav.main_menu { | ||
| 22 | + margin:0; | ||
| 23 | + margin-bottom: 20px; | ||
| 24 | + border:none; | ||
| 25 | + border-bottom: 1px solid #bbb; | ||
| 26 | + border-radius:0; | ||
| 27 | + | ||
| 28 | + a { | ||
| 29 | + border-radius:0; | ||
| 30 | + } | ||
| 31 | + } | ||
| 32 | + } | ||
| 33 | + | ||
| 12 | 34 | ||
| 13 | /* | 35 | /* |
| 14 | * Common styles | 36 | * Common styles |
| @@ -70,30 +92,23 @@ | @@ -70,30 +92,23 @@ | ||
| 70 | .app_logo { | 92 | .app_logo { |
| 71 | width:230px; | 93 | width:230px; |
| 72 | float:left; | 94 | float:left; |
| 73 | - position:relative; | ||
| 74 | - top:-4px; | 95 | + position:relative; |
| 96 | + top:-5px; | ||
| 75 | 97 | ||
| 76 | a { | 98 | a { |
| 77 | float:left; | 99 | float:left; |
| 78 | 100 | ||
| 79 | h1 { | 101 | h1 { |
| 80 | - | ||
| 81 | - background: url('images.png') no-repeat -3px -7px; | ||
| 82 | - width: 65px; | ||
| 83 | - height: 26px; | ||
| 84 | - margin: 5px 0; | ||
| 85 | - padding: 0; | ||
| 86 | - display: block; | ||
| 87 | - float: left; | ||
| 88 | - text-indent: -1000em; | ||
| 89 | - | ||
| 90 | - } | ||
| 91 | - | ||
| 92 | - &.home { | ||
| 93 | - img { | ||
| 94 | - display:none | ||
| 95 | - | ||
| 96 | - } | 102 | + background: url('logo_wh.png') no-repeat -3px -4px; |
| 103 | + float:left; | ||
| 104 | + margin-left:5px; | ||
| 105 | + font-size:20px; | ||
| 106 | + line-height:36px; | ||
| 107 | + font-weight:bold; | ||
| 108 | + color:#ccc; | ||
| 109 | + text-shadow: 0 1px 1px #111; | ||
| 110 | + padding-left:50px; | ||
| 111 | + padding-top:5px; | ||
| 97 | } | 112 | } |
| 98 | } | 113 | } |
| 99 | } | 114 | } |
| @@ -104,8 +119,8 @@ | @@ -104,8 +119,8 @@ | ||
| 104 | position:relative; | 119 | position:relative; |
| 105 | padding:15px 0; | 120 | padding:15px 0; |
| 106 | 121 | ||
| 107 | - .top_panel_content { | ||
| 108 | - margin:0 $app_padding; | 122 | + .account-box img { |
| 123 | + right:0; | ||
| 109 | } | 124 | } |
| 110 | } | 125 | } |
| 111 | 126 |
app/views/commits/_diff_head.html.haml
| @@ -5,22 +5,22 @@ | @@ -5,22 +5,22 @@ | ||
| 5 | %span.removed_file | 5 | %span.removed_file |
| 6 | %a{:href => "##{diff.a_path}"} | 6 | %a{:href => "##{diff.a_path}"} |
| 7 | = diff.a_path | 7 | = diff.a_path |
| 8 | - = image_tag "blueprint_delete.png" | 8 | + = image_tag "diff_file_delete.png" |
| 9 | - elsif diff.renamed_file | 9 | - elsif diff.renamed_file |
| 10 | %span.moved_file | 10 | %span.moved_file |
| 11 | %a{:href => "##{diff.b_path}"} | 11 | %a{:href => "##{diff.b_path}"} |
| 12 | = diff.a_path | 12 | = diff.a_path |
| 13 | = "->" | 13 | = "->" |
| 14 | = diff.b_path | 14 | = diff.b_path |
| 15 | - = image_tag "blueprint_notice.png" | 15 | + = image_tag "diff_file_notice.png" |
| 16 | - elsif diff.new_file | 16 | - elsif diff.new_file |
| 17 | %span.new_file | 17 | %span.new_file |
| 18 | %a{:href => "##{diff.b_path}"} | 18 | %a{:href => "##{diff.b_path}"} |
| 19 | = diff.b_path | 19 | = diff.b_path |
| 20 | - = image_tag "blueprint_add.png" | 20 | + = image_tag "diff_file_add.png" |
| 21 | - else | 21 | - else |
| 22 | %span.edit_file | 22 | %span.edit_file |
| 23 | %a{:href => "##{diff.b_path}"} | 23 | %a{:href => "##{diff.b_path}"} |
| 24 | = diff.b_path | 24 | = diff.b_path |
| 25 | - = image_tag "blueprint_info.png" | 25 | + = image_tag "diff_file_info.png" |
| 26 | 26 |
app/views/layouts/_head_panel.html.haml
| @@ -4,7 +4,6 @@ | @@ -4,7 +4,6 @@ | ||
| 4 | .top_panel_content | 4 | .top_panel_content |
| 5 | %div.app_logo | 5 | %div.app_logo |
| 6 | = link_to root_path, :class => "home", :title => "Home" do | 6 | = link_to root_path, :class => "home", :title => "Home" do |
| 7 | - = image_tag "logo_tr.png", :width => 50 | ||
| 8 | %h1 | 7 | %h1 |
| 9 | GITLAB | 8 | GITLAB |
| 10 | %h1.project_name= title | 9 | %h1.project_name= title |