Commit 65a56215 authored by Bryce Johnson's avatar Bryce Johnson

Merge branch 'merge-request-push-compare-ui' of...

Merge branch 'merge-request-push-compare-ui' of gitlab.com:gitlab-org/gitlab-ce into merge-request-push-compare-ui
parents c887f837 86bddc59
...@@ -377,14 +377,27 @@ ...@@ -377,14 +377,27 @@
.mr-version-controls { .mr-version-controls {
background: $background-color; background: $background-color;
border: 1px solid $border-color; border-bottom: 1px solid $border-color;
border-top: 0; color: $gl-text-color;
padding: 0 16px;
color: $gl-placeholder-color; .mr-version-menus-container {
display: -webkit-flex;
display: flex;
-webkit-align-items: center;
align-items: center;
padding: 16px;
}
.comments-disabled-notif {
padding: 10px 16px;
.btn {
margin-left: 5px;
}
}
.mr-version-dropdown, .mr-version-dropdown,
.mr-version-compare-dropdown { .mr-version-compare-dropdown {
margin: 0 10px; margin: 0 7px;
} }
.comments-disabled-notif { .comments-disabled-notif {
...@@ -396,7 +409,8 @@ ...@@ -396,7 +409,8 @@
} }
.fa-info-circle { .fa-info-circle {
color: $red-normal; color: $orange-normal;
padding-right: 5px;
} }
} }
......
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