IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: Update Font Awesome to v5.4.1 and SVGs (#6557)

Browse Source 
* First take on subsetting svg icons

* FontAwesome 5 svg subset WIP

* Include icons from plugins/badges into svg sprite subset

* add svg icon support to themes

* Add spec for SvgSprite

* Misc. SVG icon fixes

* Use FA5 svgs in local-dates plugin

* CSS adjustments, fix SVG icons in group flair

* Use SVG icons in poll plugin

* Add SVG icons to /wizard
This commit is contained in:
Penar Musaraj
2018-11-07 13:05:43 -05:00
committed by GitHub
parent 6b60646330
commit 005e1ecb9b
124 changed files with 6692 additions and 2211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
View File

@@ -73,5 +73,5 @@
{{/d-modal-body}}
<div class="modal-footer">
{{d-button action="insertPoll" icon="bar-chart-o" class='btn-primary' label='poll.ui_builder.insert' disabled=disableInsert}}
{{d-button action="insertPoll" icon="chart-bar" class='btn-primary' label='poll.ui_builder.insert' disabled=disableInsert}}
</div>

2
plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6
View File

@@ -32,7 +32,7 @@ function initializePollUIBuilder(api) {
api.addToolbarPopupMenuOptionsCallback(function() {
return {
action: "showPollBuilder",
icon: "bar-chart-o",
icon: "chart-bar",
label: "poll.ui_builder.title",
condition: "canBuildPoll"
};

4
plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
View File

@@ -39,9 +39,9 @@ createWidget("discourse-poll-option", {
const chosen = vote.indexOf(option.id) !== -1;
if (attrs.isMultiple) {
result.push(iconNode(chosen ? "check-square-o" : "square-o"));
result.push(iconNode(chosen ? "far-check-square" : "far-square"));
} else {
result.push(iconNode(chosen ? "dot-circle-o" : "circle-o"));
result.push(iconNode(chosen ? "far-dot-circle" : "far-circle"));
}
result.push(" ");
result.push(optionHtml(option));

12
plugins/poll/assets/stylesheets/desktop/poll.scss
View File

@@ -47,16 +47,20 @@ div.poll {
.poll {
li[data-poll-option-id]:before {
font-family: FontAwesome;
content: "\f10c";
margin-right: 0.25em;
position: relative;
vertical-align: baseline;
border: 2px solid $primary;
border-radius: 50%;
display: inline-block;
margin-right: 0.5em;
width: 12px;
height: 12px;
content: "";
}
&[data-poll-type="multiple"] {
li[data-poll-option-id]:before {
content: "\f096";
border-radius: 3px;
}
}
}