Skip to content

Commit

Permalink
Merge branch 'MDL-62024-master' of git://github.com/bmbrands/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
David Monllao committed Apr 26, 2018
2 parents 46e7b6e + c706699 commit 258bf5c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions theme/boost/scss/moodle/icons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
6 changes: 3 additions & 3 deletions theme/boost/templates/core/action_menu.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down

0 comments on commit 258bf5c

Please sign in to comment.