Merge branch…

Merge branch '40631-sidebar-icon-alignment-for-confidentiality-and-lock-issue-is-misaligned' into 'master' Resolve "Sidebar icon alignment for confidentiality and lock issue is misaligned" Closes #40631 See merge request gitlab-org/gitlab-ce!15692

Merge branch…
ba44a57f · Clement Ho · 2b07c2ee · 2c6d2409 · ba44a57f
Commit ba44a57f authored Dec 07, 2017 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

note_form.scss app/assets/stylesheets/pages/note_form.scss +8 -8

No files found.
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -141,20 +141,20 @@

 .sidebar-item-icon {
  border-radius: $border-radius-default;
-  margin: 0 3px 0 -4px;
-  vertical-align: middle;
+  margin: 0 5px 0 0;
+  vertical-align: text-bottom;

  &.is-active {
    fill: $orange-600;
  }
-}

-.sidebar-collapsed-icon .sidebar-item-icon {
-  margin: 0;
-}
+  .sidebar-collapsed-icon & {
+    margin: 0;
+  }

-.sidebar-item-value .sidebar-item-icon {
-  fill: $theme-gray-700;
+  .sidebar-item-value & {
+    fill: $theme-gray-700;
+  }
 }

 .sidebar-item-warning-message {