diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-08-11 15:31:24 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-08-11 15:31:24 +0000 |
| commit | 3f18ea1ea964a1214814692ec980435a9cb22ff6 (patch) | |
| tree | cf5c7ccbf8d755b19f9427d531954c3b0168998a /app | |
| parent | f662721eedbbbd145301f1c3c1724b5ac1adc69e (diff) | |
| parent | 643355908762c591c53a77813edb60a3e7532923 (diff) | |
| download | gitlab-ce-3f18ea1ea964a1214814692ec980435a9cb22ff6.tar.gz | |
Merge branch 'winh-git-revision-dropdown-style' into 'master'
Make Git revision dropdown style consistent
See merge request !13116
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 8 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/typography.scss | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 02e0ba74158..1bb04b59a2a 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -725,9 +725,9 @@ } // TODO: change global style and remove mixin -@mixin new-style-dropdown { - .dropdown-menu, - .dropdown-menu-nav { +@mixin new-style-dropdown($selector: '') { + #{$selector}.dropdown-menu, + #{$selector}.dropdown-menu-nav { .divider { margin: 6px 0; } @@ -773,7 +773,7 @@ } } - .dropdown-menu-align-right { + #{$selector}.dropdown-menu-align-right { margin-top: 2px; } } diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index bf5f124d142..96409b10b99 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -339,6 +339,8 @@ a > code { @extend .ref-name; } +@include new-style-dropdown('.git-revision-dropdown'); + /** * Apply Markdown typography * |