github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-01-23 02:09:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove fa-fw class from all icons

Browse Source 
Often it is desirable to NOT have this class applied, and it is easier
to apply its styles if needed rather than un-apply it.
This commit is contained in:
Toby Zerner 2017-07-22 11:45:42 +09:30
parent 7200bdbcb5
commit aabb55e1dd
6 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/js/lib/helpers/icon.js
View File

@ -6,7 +6,7 @@
* @return {Object} * @return {Object}
*/ */
export default function icon(name, attrs = {}) { export default function icon(name, attrs = {}) {
attrs.className = 'icon fa fa-fw fa-' + name + ' ' + (attrs.className || ''); attrs.className = 'icon fa fa-' + name + ' ' + (attrs.className || '');
return <i {...attrs}/>; return <i {...attrs}/>;
} }

1
framework/core/less/forum/Composer.less
View File

@ -61,6 +61,7 @@
} }
.icon { .icon {
font-size: 14px; font-size: 14px;
margin-right: 3px;
} }
} }
} }

1
framework/core/less/forum/NotificationGrid.less
View File

@ -31,6 +31,7 @@
.icon { .icon {
font-size: 14px; font-size: 14px;
margin-right: 2px; margin-right: 2px;
.fa-fw();
} }
} }
.NotificationGrid-checkbox { .NotificationGrid-checkbox {

4
framework/core/less/lib/Button.less
View File

@ -224,14 +224,14 @@
} }
} }
.Button-icon { .Button-icon {
margin-right: 3px; margin-right: 7px;
} }
.Button-icon, .Button-icon,
.Button-caret { .Button-caret {
font-size: 14px; font-size: 14px;
} }
.Button-caret { .Button-caret {
margin-left: 3px; margin-left: 7px;
} }
.Button-badge { .Button-badge {
font-size: 12px; font-size: 12px;

1
framework/core/less/lib/Dropdown.less
View File

@ -49,6 +49,7 @@
float: left; float: left;
margin-left: -25px; margin-left: -25px;
margin-top: 2px; margin-top: 2px;
.fa-fw();
} }
&.disabled { &.disabled {

1
framework/core/less/lib/Select.less
View File

@ -16,4 +16,5 @@
margin-left: -30px; margin-left: -30px;
pointer-events: none; pointer-events: none;
color: @control-color; color: @control-color;
.fa-fw();
} }