diff --git a/app/assets/images/Arrow-Left-UI.PNG b/app/assets/images/Arrow-Left-UI.PNG deleted file mode 100644 index 80a34b411f1ddc9ec58f0a6a3ef1e16950125eb9..0000000000000000000000000000000000000000 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 3a38daa0cdad7911f21e15d6627b3150ab035830..0000000000000000000000000000000000000000 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 bf2fbec29649463a42d9b85fb449e9b369d79a6e..0000000000000000000000000000000000000000 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 c69e937232b24ea30f01c68bbd2ebc798dcecfcb..0000000000000000000000000000000000000000 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/diff_file_add.png similarity index 100% rename from app/assets/images/blueprint_add.png rename to app/assets/images/diff_file_add.png diff --git a/app/assets/images/blueprint_delete.png b/app/assets/images/diff_file_delete.png similarity index 100% rename from app/assets/images/blueprint_delete.png rename to app/assets/images/diff_file_delete.png diff --git a/app/assets/images/blueprint_info.png b/app/assets/images/diff_file_info.png similarity index 100% rename from app/assets/images/blueprint_info.png rename to app/assets/images/diff_file_info.png diff --git a/app/assets/images/diff_file_notice.png b/app/assets/images/diff_file_notice.png new file mode 100644 index 0000000000000000000000000000000000000000..d3b292f4907c165519dff3f892b506391726d2f0 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 7a934bbb62c63eee5a43809343a458964e888c42..bc5ec128b90ab7741a1dab22c28ff822336d6249 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 0000000000000000000000000000000000000000..2b7335dd4f9e1c27179e250ba283533787a0fbd3 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 d5edc04e65f555e3ba4dcdaad39dc352e75b575e..0000000000000000000000000000000000000000 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 8efe01b8f2308b3217ba277b01b774d6ef3c0bbd..64347525099d5c3d8158c9001c69829cdbb2bbcf 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 3490287941818cba6a8f065e252444072fde27c8..1178c1892475f7d1075735d263a4473e889144ec 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 20ec3cf11b000c01804c964c20bb3a02cfe33165..b7913160fd76d5f1c9e9ddc77181e5f64bf2d810 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 a8c70e3714688124d753e996a59a7c76d9c2ef4e..221bca559a9e3c39839b301bda4d66996e8cb287 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