From 781f5aa6fb25b4aed91f711daefdae4bce8d968b Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 13 Mar 2012 22:17:13 +0200 Subject: [PATCH] classic theme improved, images refactored --- app/assets/images/Arrow-Left-UI.PNG | Bin 568 -> 0 bytes app/assets/images/Arrow-Right-UI.PNG | Bin 561 -> 0 bytes app/assets/images/add_new.png | Bin 333 -> 0 bytes app/assets/images/ajax-loader-tree.gif | Bin 2608 -> 0 bytes app/assets/images/blueprint_add.png | Bin 177 -> 0 bytes app/assets/images/blueprint_delete.png | Bin 295 -> 0 bytes app/assets/images/blueprint_info.png | Bin 749 -> 0 bytes app/assets/images/diff_file_add.png | Bin 0 -> 177 bytes app/assets/images/diff_file_delete.png | Bin 0 -> 295 bytes app/assets/images/diff_file_info.png | Bin 0 -> 749 bytes app/assets/images/diff_file_notice.png | Bin 0 -> 302 bytes app/assets/images/logo_tr.png | Bin 7896 -> 0 bytes app/assets/images/logo_wh.png | Bin 0 -> 2056 bytes app/assets/images/rails.png | Bin 6646 -> 0 bytes app/assets/stylesheets/ui_basic.scss | 15 +++++---------- app/assets/stylesheets/ui_mars.scss | 57 ++++++++++++++++++++++++++++++++++++--------------------- app/views/commits/_diff_head.html.haml | 8 ++++---- app/views/layouts/_head_panel.html.haml | 1 - 18 files changed, 45 insertions(+), 36 deletions(-) delete mode 100644 app/assets/images/Arrow-Left-UI.PNG delete mode 100644 app/assets/images/Arrow-Right-UI.PNG delete mode 100644 app/assets/images/add_new.png delete mode 100644 app/assets/images/ajax-loader-tree.gif delete mode 100644 app/assets/images/blueprint_add.png delete mode 100644 app/assets/images/blueprint_delete.png delete mode 100644 app/assets/images/blueprint_info.png create mode 100644 app/assets/images/diff_file_add.png create mode 100644 app/assets/images/diff_file_delete.png create mode 100644 app/assets/images/diff_file_info.png create mode 100644 app/assets/images/diff_file_notice.png create mode 100644 app/assets/images/logo_wh.png delete mode 100644 app/assets/images/rails.png diff --git a/app/assets/images/Arrow-Left-UI.PNG b/app/assets/images/Arrow-Left-UI.PNG deleted file mode 100644 index 80a34b4..0000000 Binary files a/app/assets/images/Arrow-Left-UI.PNG and /dev/null differ diff --git a/app/assets/images/Arrow-Right-UI.PNG b/app/assets/images/Arrow-Right-UI.PNG deleted file mode 100644 index 3a38daa..0000000 Binary files a/app/assets/images/Arrow-Right-UI.PNG and /dev/null differ diff --git a/app/assets/images/add_new.png b/app/assets/images/add_new.png deleted file mode 100644 index bf2fbec..0000000 Binary files a/app/assets/images/add_new.png and /dev/null differ diff --git a/app/assets/images/ajax-loader-tree.gif b/app/assets/images/ajax-loader-tree.gif deleted file mode 100644 index c69e937..0000000 Binary files a/app/assets/images/ajax-loader-tree.gif and /dev/null differ diff --git a/app/assets/images/blueprint_add.png b/app/assets/images/blueprint_add.png deleted file mode 100644 index 0f01128..0000000 Binary files a/app/assets/images/blueprint_add.png and /dev/null differ diff --git a/app/assets/images/blueprint_delete.png b/app/assets/images/blueprint_delete.png deleted file mode 100644 index b4d360f..0000000 Binary files a/app/assets/images/blueprint_delete.png and /dev/null differ diff --git a/app/assets/images/blueprint_info.png b/app/assets/images/blueprint_info.png deleted file mode 100644 index 8529e82..0000000 Binary files a/app/assets/images/blueprint_info.png and /dev/null differ diff --git a/app/assets/images/diff_file_add.png b/app/assets/images/diff_file_add.png new file mode 100644 index 0000000..0f01128 Binary files /dev/null and b/app/assets/images/diff_file_add.png differ diff --git a/app/assets/images/diff_file_delete.png b/app/assets/images/diff_file_delete.png new file mode 100644 index 0000000..b4d360f Binary files /dev/null and b/app/assets/images/diff_file_delete.png differ diff --git a/app/assets/images/diff_file_info.png b/app/assets/images/diff_file_info.png new file mode 100644 index 0000000..8529e82 Binary files /dev/null and b/app/assets/images/diff_file_info.png differ diff --git a/app/assets/images/diff_file_notice.png b/app/assets/images/diff_file_notice.png new file mode 100644 index 0000000..d3b292f Binary files /dev/null and b/app/assets/images/diff_file_notice.png differ diff --git a/app/assets/images/logo_tr.png b/app/assets/images/logo_tr.png index 7a934bb..bc5ec12 100644 Binary files a/app/assets/images/logo_tr.png and b/app/assets/images/logo_tr.png differ diff --git a/app/assets/images/logo_wh.png b/app/assets/images/logo_wh.png new file mode 100644 index 0000000..2b7335d Binary files /dev/null and b/app/assets/images/logo_wh.png differ diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png deleted file mode 100644 index d5edc04..0000000 Binary files a/app/assets/images/rails.png and /dev/null differ diff --git a/app/assets/stylesheets/ui_basic.scss b/app/assets/stylesheets/ui_basic.scss index 8efe01b..6434752 100644 --- a/app/assets/stylesheets/ui_basic.scss +++ b/app/assets/stylesheets/ui_basic.scss @@ -43,11 +43,14 @@ .app_logo { width:230px; float:left; + position:relative; + top:-5px; a { float:left; h1 { + background: url('logo_tr.png') no-repeat -3px -4px; float:left; margin-left:5px; font-size:20px; @@ -55,16 +58,8 @@ font-weight:bold; color:#aaa; text-shadow: 0 1px 1px #FFF; - } - - &.home { - img { - float: left; - position: relative; - top: -9px; - width:46px; - - } + padding-left:50px; + padding-top:5px; } } } diff --git a/app/assets/stylesheets/ui_mars.scss b/app/assets/stylesheets/ui_mars.scss index 3490287..1178c18 100644 --- a/app/assets/stylesheets/ui_mars.scss +++ b/app/assets/stylesheets/ui_mars.scss @@ -9,6 +9,28 @@ * */ .ui_mars { + background:#eee; + + .container { + border: 1px solid rgba(0,0,0,.22); + box-shadow: 0 0 0px 4px rgba(0,0,0,.04); + background:white; + margin-top:20px; + min-height:500px; + + nav.main_menu { + margin:0; + margin-bottom: 20px; + border:none; + border-bottom: 1px solid #bbb; + border-radius:0; + + a { + border-radius:0; + } + } + } + /* * Common styles @@ -70,30 +92,23 @@ .app_logo { width:230px; float:left; - position:relative; - top:-4px; + position:relative; + top:-5px; a { float:left; h1 { - - background: url('images.png') no-repeat -3px -7px; - width: 65px; - height: 26px; - margin: 5px 0; - padding: 0; - display: block; - float: left; - text-indent: -1000em; - - } - - &.home { - img { - display:none - - } + background: url('logo_wh.png') no-repeat -3px -4px; + float:left; + margin-left:5px; + font-size:20px; + line-height:36px; + font-weight:bold; + color:#ccc; + text-shadow: 0 1px 1px #111; + padding-left:50px; + padding-top:5px; } } } @@ -104,8 +119,8 @@ position:relative; padding:15px 0; - .top_panel_content { - margin:0 $app_padding; + .account-box img { + right:0; } } diff --git a/app/views/commits/_diff_head.html.haml b/app/views/commits/_diff_head.html.haml index 20ec3cf..b791316 100644 --- a/app/views/commits/_diff_head.html.haml +++ b/app/views/commits/_diff_head.html.haml @@ -5,22 +5,22 @@ %span.removed_file %a{:href => "##{diff.a_path}"} = diff.a_path - = image_tag "blueprint_delete.png" + = image_tag "diff_file_delete.png" - elsif diff.renamed_file %span.moved_file %a{:href => "##{diff.b_path}"} = diff.a_path = "->" = diff.b_path - = image_tag "blueprint_notice.png" + = image_tag "diff_file_notice.png" - elsif diff.new_file %span.new_file %a{:href => "##{diff.b_path}"} = diff.b_path - = image_tag "blueprint_add.png" + = image_tag "diff_file_add.png" - else %span.edit_file %a{:href => "##{diff.b_path}"} = diff.b_path - = image_tag "blueprint_info.png" + = image_tag "diff_file_info.png" diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml index a8c70e3..221bca5 100644 --- a/app/views/layouts/_head_panel.html.haml +++ b/app/views/layouts/_head_panel.html.haml @@ -4,7 +4,6 @@ .top_panel_content %div.app_logo = link_to root_path, :class => "home", :title => "Home" do - = image_tag "logo_tr.png", :width => 50 %h1 GITLAB %h1.project_name= title -- libgit2 0.21.2