Merge branch 'MDL-57158-master' of git://github.com/ryanwyllie/moodle

2016-11-28 14:39:22 +08:00
parent c811356efb 60ff24c0f1
commit 6ee691d71b
1 changed files with 6 additions and 5 deletions
@@ -14,6 +14,12 @@ a:first-of-type > .icon {
    margin-left: 0.5rem;
 }

+// Fix the first icon for an action menu. This rule exists to reverse the
+// icon margin defined in the a:first-of-type > .icon rule.
+.action-menu .dropdown a:first-of-type > .icon {
+    margin-left: 0;
+}
+
 .pull-xs-right {
    .icon {
        margin-right: 0;
@@ -21,11 +27,6 @@ a:first-of-type > .icon {
    }
 }

-// Fix the cog icon for an action menu.
-.action-menu > .dropdown .icon {
-    margin-left: 0;
-}
-
 // Fix the space between the dropdown icon and the caret.
 .action-menu {
    .dropdown-toggle {