Merge branch 'fix-border' into 'master'

Fix double right border in MR discussion Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> # Before ![Screenshot_2015-12-16_15.44.00](/uploads/dd2c85e82fdb784e897cf1a695af1a1e/Screenshot_2015-12-16_15.44.00.png) # After ![Screenshot_2015-12-16_15.43.36](/uploads/b50954e01bb3f45d2df6f43d34a1db60/Screenshot_2015-12-16_15.43.36.png) cc @skyruler See merge request !2113

Merge branch 'fix-border' into 'master'
fa4545e3 · Dmitriy Zaporozhets · c21cd0ba · 9472d137 · fa4545e3 · fa4545e3
Commit fa4545e3 authored Dec 16, 2015 by Dmitriy Zaporozhets
4 changed files
--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -10,8 +10,7 @@
    margin-left: -$gl-padding;
    margin-right: -$gl-padding;
    color: $gl-gray;
-    border-bottom: 1px solid #ECEEF1;
-    border-right: 1px solid #ECEEF1;
+    border-bottom: 1px solid $border-white-light;

    &:target {
      background: $hover;

--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -51,7 +51,7 @@
  }

  section {
-    border-right: 1px solid #ECEEF1;
+    border-right: 1px solid $border-white-light;

    > .tab-content {
      margin-right: 1px;

--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -149,3 +149,10 @@ form.edit-issue {
 .issue-form .select2-container {
  width: 250px !important;
 }
+
+
+.issue-discussion {
+  .common-note-form {
+    border-right: 1px solid $border-white-light;
+  }
+}
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -79,7 +79,6 @@
  padding: $gl-padding;
  margin-left: -$gl-padding;
  margin-right: -$gl-padding;
-  border-right: 1px solid $border-color;
  border-top: 1px solid $border-color;
  margin-bottom: -$gl-padding;
 }