diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-08-16 14:17:20 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-08-16 14:17:20 +0000 |
| commit | 36b6722c1ac2a81a47951d99c4353eb9f2aa6f05 (patch) | |
| tree | 6c2266093ba7e4d4d5b7b972e910dfffba1892a8 | |
| parent | c044923bcd9263a80623b9fda58692651a54786f (diff) | |
| parent | b54a1e030d3a0ab904bf3c278a2cfaea6ff0b3dc (diff) | |
| download | gitlab-ce-36b6722c1ac2a81a47951d99c4353eb9f2aa6f05.tar.gz | |
Merge branch 'winh-navcontrols-dropdown-style' into 'master'
Make sort by dropdown style consistent
See merge request !13253
| -rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 2 | ||||
| -rw-r--r-- | app/views/help/ui.html.haml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index d386ac5ba9c..071f20fc457 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -161,6 +161,8 @@ } .nav-controls { + @include new-style-dropdown; + display: inline-block; float: right; text-align: right; diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index f18c3a74120..445f0dffbcc 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -189,7 +189,7 @@ = icon('chevron-down') %ul.dropdown-menu %li - %a Sort by date + = link_to 'Sort by date', '#' = link_to 'New issue', '#', class: 'btn btn-new btn-inverted' |