github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-13 07:03:35 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Only give dropdown menu items padding if they have an icon

Browse Source
This commit is contained in:
Toby Zerner 2015-05-14 22:24:59 +09:30
parent d85ae8745e
commit a2049feddf
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/js/lib/components/action-button.js
View File

@ -13,7 +13,7 @@ export default class ActionButton extends Component {
delete attrs.label; delete attrs.label;
attrs.href = attrs.href || 'javascript:;'; attrs.href = attrs.href || 'javascript:;';
return m('a', attrs, [ return m('a'+(iconName ? '.has-icon' : ''), attrs, [
iconName ? icon(iconName+' icon') : '', iconName ? icon(iconName+' icon') : '',
m('span.label', label) m('span.label', label)
]); ]);

18
framework/core/less/lib/dropdowns.less
View File

@ -6,14 +6,22 @@
color: @fl-body-color; color: @fl-body-color;
.box-shadow(0 2px 6px @fl-shadow-color); .box-shadow(0 2px 6px @fl-shadow-color);
& > li > a { & > li > a:hover,
padding: 8px 15px 8px 40px; & > li > a:focus,
color: @fl-body-color; & > .active > a,
& > .active > a:hover,
&:hover, &:focus { & > .active > a:focus {
color: @fl-body-color; color: @fl-body-color;
background-color: @fl-body-control-bg; background-color: @fl-body-control-bg;
} }
& > li > a {
padding: 8px 15px;
color: @fl-body-color;
&.has-icon {
padding-left: 40px;
}
&.disabled { &.disabled {
color: #aaa; color: #aaa;
cursor: default; cursor: default;