classic theme improved, images refactored

15 files changed, 45 insertions, 36 deletions

diff --git a/app/assets/images/Arrow-Left-UI.PNG b/app/assets/images/Arrow-Left-UI.PNG
deleted file mode 100644
index 80a34b411f1..00000000000
--- a/app/assets/images/Arrow-Left-UI.PNG
+++ /dev/null
diff --git a/app/assets/images/Arrow-Right-UI.PNG b/app/assets/images/Arrow-Right-UI.PNG
deleted file mode 100644
index 3a38daa0cda..00000000000
--- a/app/assets/images/Arrow-Right-UI.PNG
+++ /dev/null
diff --git a/app/assets/images/add_new.png b/app/assets/images/add_new.png
deleted file mode 100644
index bf2fbec2964..00000000000
--- a/app/assets/images/add_new.png
+++ /dev/null
diff --git a/app/assets/images/ajax-loader-tree.gif b/app/assets/images/ajax-loader-tree.gif
deleted file mode 100644
index c69e937232b..00000000000
--- a/app/assets/images/ajax-loader-tree.gif
+++ /dev/null
diff --git a/app/assets/images/blueprint_add.png b/app/assets/images/diff_file_add.png
index 0f01128df96..0f01128df96 100644
--- a/app/assets/images/blueprint_add.png
+++ b/app/assets/images/diff_file_add.png
diff --git a/app/assets/images/blueprint_delete.png b/app/assets/images/diff_file_delete.png
index b4d360f329d..b4d360f329d 100644
--- a/app/assets/images/blueprint_delete.png
+++ b/app/assets/images/diff_file_delete.png
diff --git a/app/assets/images/blueprint_info.png b/app/assets/images/diff_file_info.png
index 8529e82396a..8529e82396a 100644
--- a/app/assets/images/blueprint_info.png
+++ b/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 00000000000..d3b292f4907
--- /dev/null
+++ b/app/assets/images/diff_file_notice.png
diff --git a/app/assets/images/logo_tr.png b/app/assets/images/logo_tr.png
index 7a934bbb62c..bc5ec128b90 100644
--- a/app/assets/images/logo_tr.png
+++ b/app/assets/images/logo_tr.png
diff --git a/app/assets/images/logo_wh.png b/app/assets/images/logo_wh.png
new file mode 100644
index 00000000000..2b7335dd4f9
--- /dev/null
+++ b/app/assets/images/logo_wh.png
diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png
deleted file mode 100644
index d5edc04e65f..00000000000
--- a/app/assets/images/rails.png
+++ /dev/null
diff --git a/app/assets/stylesheets/ui_basic.scss b/app/assets/stylesheets/ui_basic.scss
index 8efe01b8f23..64347525099 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 34902879418..1178c189247 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 20ec3cf11b0..b7913160fd7 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 a8c70e37146..221bca559a9 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