Merge branch 'MDL-62024-master' of git://github.com/bmbrands/moodle

moodle · Apr 26, 2018 · 258bf5c · 258bf5c
2 parents 46e7b6e + c706699
commit 258bf5c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/theme/boost/scss/moodle/icons.scss b/theme/boost/scss/moodle/icons.scss
@@ -33,6 +33,10 @@ $icon-big-height: 64px;
     color: $navbar-dark-color !important; /* stylelint-disable-line declaration-no-important */
 }
 
+.action-menu-item a:first-of-type > .icon {
+    margin-left: 0.5rem;
+}
+
 // YUI 2 Tree View icons must not have a margin left.
 .ygtvcell .icon {
     margin-left: 0 !important; /* stylelint-disable-line declaration-no-important */

diff --git a/theme/boost/templates/core/action_menu.mustache b/theme/boost/templates/core/action_menu.mustache
@@ -33,18 +33,18 @@
 <div class="action-menu {{classes}} d-inline"{{#attributes}} {{name}}="{{value}}"{{/attributes}}>
     {{#primary}}
 
-        <div class="{{classes}} d-flex justify-content-end "{{#attributes}} {{name}}="{{value}}"{{/attributes}}>
+        <div class="{{classes}} d-flex "{{#attributes}} {{name}}="{{value}}"{{/attributes}}>
 
             {{#prioritise}}{{> core/action_menu_trigger }}{{/prioritise}}
 
             {{#items}}
-                <div>
+                <div class="action-menu-item">
                     {{> core/action_menu_item }}
                 </div>
             {{/items}}
 
             {{^prioritise}}
-                <div>
+                <div class="action-menu-trigger">
                     {{> core/action_menu_trigger }}
                 </div>
             {{/prioritise}}