Merge branch 'winh-protection-dropdowns' into 'master'

Make protected branches / tags permission dropdowns consistent See merge request !13611

Merge branch 'winh-protection-dropdowns' into 'master'
4a98420f · Phil Hughes · d4dd6b08 · 2d6733c8 · 4a98420f
Commit 4a98420f authored Sep 05, 2017 by Phil Hughes
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 13 deletions

projects.scss app/assets/stylesheets/pages/projects.scss +5 -13

No files found.
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -800,8 +800,10 @@ pre.light-well {
  }
 }

-.new_protected_branch,
+.new-protected-branch,
 .new-protected-tag {
+  @include new-style-dropdown;
+
  label {
    margin-top: 6px;
    font-weight: $gl-font-weight-normal;
@@ -821,19 +823,9 @@ pre.light-well {

 .protected-branches-list,
 .protected-tags-list {
-  margin-bottom: 30px;
-
-  a {
-    color: $gl-text-color;
-
-    &:hover {
-      color: $gl-link-color;
-    }
+  @include new-style-dropdown;

-    &.is-active {
-      font-weight: $gl-font-weight-bold;
-    }
-  }
+  margin-bottom: 30px;

  .settings-message {
    margin: 0;