Merge branch 'ui-fixes' into 'master'

Improve UI for last push widget and web editor

See merge request !1296

3 files changed, 24 insertions, 3 deletions

diff --git a/app/assets/stylesheets/generic/blocks.scss b/app/assets/stylesheets/generic/blocks.scss
index 1bd016e0df2..ce024272a30 100644
--- a/app/assets/stylesheets/generic/blocks.scss
+++ b/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;
diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index 5e191d5dd4a..3a237bf3228 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/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;
+  }
 }
diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss
index 759ba6b1c22..1d565477dd4 100644
--- a/app/assets/stylesheets/pages/editor.scss
+++ b/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
   }
 }