Merge branch 'winh-navcontrols-dropdown-style' into 'master'

Make sort by dropdown style consistent See merge request !13253

Merge branch 'winh-navcontrols-dropdown-style' into 'master'
36b6722c · Clement Ho · c044923b · b54a1e03 · 36b6722c · 36b6722c
Commit 36b6722c authored Aug 16, 2017 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

nav.scss app/assets/stylesheets/framework/nav.scss +2 -0

ui.html.haml app/views/help/ui.html.haml +1 -1

No files found.
--- 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;

--- 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'