Merge branch 'winh-member-permission-dropdown' into 'master'

Make member permission dropdowns consistent See merge request !13600

Merge branch 'winh-member-permission-dropdown' into 'master'
996fdda2 · Phil Hughes · 10854ad8 · 76441216 · 996fdda2 · 996fdda2
Commit 996fdda2 authored Sep 01, 2017 by Phil Hughes
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

dropdowns.scss app/assets/stylesheets/framework/dropdowns.scss +1 -0

members.scss app/assets/stylesheets/pages/members.scss +8 -0

No files found.
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -729,6 +729,7 @@
  #{$selector}.dropdown-menu,
  #{$selector}.dropdown-menu-nav {
    li {
+      display: block;
      padding: 0 1px;

      &:hover {

--- a/app/assets/stylesheets/pages/members.scss
+++ b/app/assets/stylesheets/pages/members.scss
@@ -55,6 +55,10 @@
      display: -webkit-flex;
      display: flex;
    }
+
+    .dropdown-menu.dropdown-menu-align-right {
+      margin-top: -2px;
+    }
  }

  .form-horizontal {
@@ -306,3 +310,7 @@
    }
  }
 }
+
+.member-form-control {
+  @include new-style-dropdown;
+}