Commit 60d17ecd authored by Damyon Wiese's avatar Damyon Wiese Committed by Dan Poltawski
Browse files

MDL-55831 blocks: Fix block headings with action menu changes

Part of MDL-55071
parent 3fd04d52
......@@ -13,6 +13,10 @@
margin-left: 0;
}
.block .card-title {
margin-bottom: -1.5rem;
}
.block .block-controls {
.dropdown-toggle {
/* So that the caret takes the colour of the icon. */
......
......@@ -22,11 +22,11 @@
<div class="{{classes}}" {{#attributes}}{{name}}="{{value}}"{{/attributes}}>
{{#prioritise}}{{> core/action_menu_trigger }}{{/prioritise}}<!--
{{#prioritise}}{{> core/action_menu_trigger }}{{/prioritise}}{{!
-->{{#items}}{{> core/action_menu_item }}{{/items}}<!--
}}{{#items}}{{> core/action_menu_item }}{{/items}}{{!
-->{{^prioritise}}{{> core/action_menu_trigger }}{{/prioritise}}
}}{{^prioritise}}{{> core/action_menu_trigger }}{{/prioritise}}
</div>
......
......@@ -21,11 +21,11 @@
<a href="#" class="dropdown-toggle" id="dropdown-{{instance}}" title="{{title}}" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{{actiontext}}}{{{menutrigger}}}{{#icon}}{{> core/pix_icon}}{{/icon}}{{#rawicon}}{{{.}}}{{/rawicon}}{{#menutrigger}}<b class="caret"></b>{{/menutrigger}}</a>
{{#secondary}}
<div class="dropdown-menu dropdown-menu-right {{classes}}" {{#attributes}}{{name}}="{{value}}"{{/attributes}} aria-labelledby="dropdown-{{instance}}">
{{#items}}<!--
-->{{#actionmenulink}}<a href="{{url}}" class="dropdown-item {{classes}}" {{#attributes}}{{name}}={{#quote}}{{value}}{{/quote}}{{/attributes}} {{#showtext}}aria-labelledby="actionmenuaction-{{instance}}"{{/showtext}}>{{#icon}}{{>core/pix_icon}}{{/icon}}{{#showtext}}<span class="menu-action-text" id="actionmenuaction-{{instance}}">{{{text}}}</span>{{/showtext}}</a>{{/actionmenulink}}<!--
-->{{#actionmenufiller}}<div class="dropdown-divider"></div>{{/actionmenufiller}}<!--
-->{{^actionmenulink}}{{^actionmenufiller}}<div class="dropdown-item">{{> core/action_menu_item }}</div>{{/actionmenufiller}}{{/actionmenulink}}<!--
-->{{/items}}
{{#items}}{{!
}}{{#actionmenulink}}<a href="{{url}}" class="dropdown-item {{classes}}" {{#attributes}}{{name}}={{#quote}}{{value}}{{/quote}}{{/attributes}} {{#showtext}}aria-labelledby="actionmenuaction-{{instance}}"{{/showtext}}>{{#icon}}{{>core/pix_icon}}{{/icon}}{{#showtext}}<span class="menu-action-text" id="actionmenuaction-{{instance}}">{{{text}}}</span>{{/showtext}}</a>{{/actionmenulink}}{{!
}}{{#actionmenufiller}}<div class="dropdown-divider"></div>{{/actionmenufiller}}{{!
}}{{^actionmenulink}}{{^actionmenufiller}}<div class="dropdown-item">{{> core/action_menu_item }}</div>{{/actionmenufiller}}{{/actionmenulink}}{{!
}}{{/items}}
</div>
{{/secondary}}
</span>
......@@ -11,18 +11,19 @@
aria-label="{{{arialabel}}}"
{{/arialabel}} >
{{#hascontrols}}
<div class="pull-xs-right m-a-1 block-controls">
{{{controls}}}
</div>
{{/hascontrols}}
{{! Block contents }}
<div class="card-block">
{{! Block header }}
{{#title}}
<h3 class="card-title">{{{title}}}</h3>
<h3 class="card-title p-r-3">{{{title}}}</h3>
{{/title}}
{{#hascontrols}}
<div class="pull-xs-right block-controls">
{{{controls}}}
</div>
{{/hascontrols}}
<span class="clearfix m-b-1 d-block"></span>
<div class="card-text">
{{{content}}}
{{{footer}}}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment