diff options
| author | tauriedavis <taurie@gitlab.com> | 2016-09-14 14:51:06 -0700 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-09-19 22:50:55 -0400 |
| commit | b68b17ddaa6c9e729d56ad9a675b5d3937425a2f (patch) | |
| tree | 509b6e05f5e0c92689cfef0513af7fffca932adb | |
| parent | d20d7c98857c60c9e64628e04cdd7edc977a6aad (diff) | |
| download | gitlab-ce-b68b17ddaa6c9e729d56ad9a675b5d3937425a2f.tar.gz | |
style updates
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index fc61bdff072..926247e5e87 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -373,14 +373,27 @@ .mr-version-controls { background: $background-color; - border: 1px solid $border-color; - border-top: 0; - padding: 0 16px; - color: $gl-placeholder-color; + border-bottom: 1px solid $border-color; + color: $gl-text-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-compare-dropdown { - margin: 0 10px; + margin: 0 7px; } .comments-disabled-notif { @@ -392,7 +405,8 @@ } .fa-info-circle { - color: $red-normal; + color: $orange-normal; + padding-right: 5px; } } |