Merge branch 'ui-fixes' into 'master'

Improve UI for last push widget and web editor

See merge request !1296

app/assets/stylesheets/generic/blocks.scss

@@ -36,6 +36,11 @@
     margin-bottom: 0;
   }
 
+  &.clear-block {
+    margin-bottom: $gl-padding - 1px;
+    padding-bottom: $gl-padding;
+  }
+
   &.second-block {
     margin-top: -1px;
     margin-bottom: 0;

app/assets/stylesheets/generic/common.scss

@@ -377,4 +377,8 @@ table {
   height: 56px;
   margin-top: -$gl-padding;
   padding-top: $gl-padding;
+
+  &.no-bottom {
+    margin-bottom: 0;
+  }
 }

app/assets/stylesheets/pages/editor.scss

@@ -9,6 +9,10 @@
     width: 100%;
   }
 
+  .ace_gutter-cell {
+    background-color: $background-color;
+  }
+
   .cancel-btn {
     color: #B94A48;
     &:hover {
@@ -32,14 +36,12 @@
 
   .file-title {
     @extend .monospace;
-    font-size: 14px;
-    padding: 5px;
   }
 
   .editor-ref {
     background: $background-color;
     padding: 11px 15px;
-    border-right: 1px solid #CCC;
+    border-right: 1px solid $border-color;
     display: inline-block;
     margin: -5px -5px;
     margin-right: 10px;
@@ -50,5 +52,15 @@
       display: inline-block;
       width: 200px;
     }
+
+    .form-control {
+      margin-top: -3px;
+    }
+  }
+
+  .form-actions {
+    margin: -$gl-padding;
+    margin-top: 0;
+    padding: $gl-padding
   }
 }

app/views/events/_event_last_push.html.haml

 - if show_last_push_widget?(event)
-  .event-last-push
-    .event-last-push-text
-      %span You pushed to
-      = link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do
-        %strong= event.ref_name
-      %span at
-      %strong= link_to_project event.project
-      #{time_ago_with_tooltip(event.created_at)}
+  .gray-content-block.clear-block
+    .event-last-push
+      .event-last-push-text
+        %span You pushed to
+        = link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do
+          %strong= event.ref_name
+        %span at
+        %strong= link_to_project event.project
+        #{time_ago_with_tooltip(event.created_at)}
 
-    .pull-right
-      = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
-        Create Merge Request
-  %hr
+      .pull-right
+        = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
+          Create Merge Request

app/views/projects/_last_push.html.haml

 - if event = last_push_event
   - if show_last_push_widget?(event)
-    .hidden-xs.center
-      .slead
-        %span You pushed to
-        = link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do
-          %strong= event.ref_name
-        branch
-        #{time_ago_with_tooltip(event.created_at)}
 
-      %div
-        = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
-          Create Merge Request
-      %hr
+    .gray-content-block.top-block.clear-block.hidden-xs
+      .event-last-push
+        .event-last-push-text
+          %span You pushed to
+          = link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do
+            %strong= event.ref_name
+          branch
+          #{time_ago_with_tooltip(event.created_at)}
+
+        .pull-right
+          = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
+            Create Merge Request

app/views/projects/blob/edit.html.haml

 - page_title "Edit", @blob.path, @ref
 .file-editor
-  %ul.nav.nav-tabs.js-edit-mode
+  %ul.center-top-menu.no-bottom.js-edit-mode
     %li.active
       = link_to '#editor' do
         %i.fa.fa-edit