diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-08-25 12:59:21 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-08-25 12:59:21 -0500 |
| commit | bbd9a6fe405d0df1c7c9ad09b7c3ff6a0201953f (patch) | |
| tree | ebe142b4a13ff41691fdc75b348e718c3989a2df /app/assets | |
| parent | 532489dc045d6f0c6a215889be3f1d39097d1c83 (diff) | |
| parent | a943ccf10ecf2af3331927cb83268fbc70f43634 (diff) | |
| download | gitlab-ce-bbd9a6fe405d0df1c7c9ad09b7c3ff6a0201953f.tar.gz | |
Merge branch 'dz-merge-request-version'
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 10 |
2 files changed, 16 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 7d3a063d6c2..be5c64c56d3 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -17,6 +17,12 @@ .dropdown { position: relative; + + .btn-link { + &:hover { + cursor: pointer; + } + } } .open { diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index fcdaf671538..fcdcc837298 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -375,6 +375,16 @@ } } +.mr-version-switch { + background: $background-color; + padding: $gl-btn-padding; + color: $gl-placeholder-color; + + a.btn-link { + color: $gl-dark-link-color; + } +} + .merge-request-details { .title { |