Pretty compare mode

2 files changed, 26 insertions, 18 deletions

diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss
index 12c0a17b1e0..7ed53333f8c 100644
--- a/app/assets/stylesheets/sections/commits.scss
+++ b/app/assets/stylesheets/sections/commits.scss
@@ -303,9 +303,14 @@
 
 
 .commits-compare-switch{
-  background: url('switch_icon.png');
+  background: url("switch_icon.png") no-repeat center center;
   width: 16px;
   height: 18px;
   text-indent: -9999px;
-  display: inline-block;
-}
\ No newline at end of file
+  float: left;
+  margin-right: 9px;
+  border: 1px solid #DDD;
+  @include border-radius(4px);
+  padding: 4px;
+  background-color: #EEE;
+}
diff --git a/app/views/compare/_form.html.haml b/app/views/compare/_form.html.haml
index 123c1c457f8..7e3a2a0e1f5 100644
--- a/app/views/compare/_form.html.haml
+++ b/app/views/compare/_form.html.haml
@@ -1,28 +1,31 @@
 %div
-  %p.slead
-    Fill input field with commit id like
-    %code.label_branch 4eedf23
-    or branch/tag name like
-    %code.label_branch master
-    and press compare button for commits list, code diff.
+  - unless params[:to]
+    %p.slead
+      Fill input field with commit id like
+      %code.label_branch 4eedf23
+      or branch/tag name like
+      %code.label_branch master
+      and press compare button for commits list, code diff.
 
-  %br
+    %br
 
   = form_tag project_compare_index_path(@project), method: :post do
     .clearfix
-      = text_field_tag :from, params[:from], placeholder: "master", class: "xlarge"
-      = "..."
-      = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge"
-      - if params[:to] && params[:from]
-        = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'}
+      .pull-left
+        - if params[:to] && params[:from]
+          = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'}
+        = text_field_tag :from, params[:from], placeholder: "master", class: "xlarge"
+        = "..."
+        = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge"
+      .pull-left
+         
+        = submit_tag "Compare", class: "btn primary wide commits-compare-btn"
     - if @refs_are_same
       .alert
         %span Refs are the same
-    .actions
-      = submit_tag "Compare", class: "btn primary wide commits-compare-btn"
 
 
- 
+
 :javascript
   $(function() {
     var availableTags = #{@project.ref_names.to_json};