Commit fa4545e3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'fix-border' into 'master'

Fix double right border in MR discussion
Signed-off-by: default avatarDmitriy 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
parents c21cd0ba 9472d137
...@@ -10,8 +10,7 @@ ...@@ -10,8 +10,7 @@
margin-left: -$gl-padding; margin-left: -$gl-padding;
margin-right: -$gl-padding; margin-right: -$gl-padding;
color: $gl-gray; color: $gl-gray;
border-bottom: 1px solid #ECEEF1; border-bottom: 1px solid $border-white-light;
border-right: 1px solid #ECEEF1;
&:target { &:target {
background: $hover; background: $hover;
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
} }
section { section {
border-right: 1px solid #ECEEF1; border-right: 1px solid $border-white-light;
> .tab-content { > .tab-content {
margin-right: 1px; margin-right: 1px;
......
...@@ -149,3 +149,10 @@ form.edit-issue { ...@@ -149,3 +149,10 @@ form.edit-issue {
.issue-form .select2-container { .issue-form .select2-container {
width: 250px !important; width: 250px !important;
} }
.issue-discussion {
.common-note-form {
border-right: 1px solid $border-white-light;
}
}
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
padding: $gl-padding; padding: $gl-padding;
margin-left: -$gl-padding; margin-left: -$gl-padding;
margin-right: -$gl-padding; margin-right: -$gl-padding;
border-right: 1px solid $border-color;
border-top: 1px solid $border-color; border-top: 1px solid $border-color;
margin-bottom: -$gl-padding; margin-bottom: -$gl-padding;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment