Skip to content

Commit

Permalink
[UI] Replace most of FA icons (2) (#13803)
Browse files Browse the repository at this point in the history
* fa fa-pencil

* fa fa-copy

* fa fa-times

* fa fa-question-circle

* fa fa-users

* fa fa-user

* fa fa-download

* fa fa-remove

* fa fa-plus

* fa fa-warning

* fa fa-edit

* fa fa-check

* times

* fa fa-envelope

* fa fa-external-link

* fa fa-image

* fa fa-trash-o

* fa fa-trash

* fa fa-search

* fa fa-clock-o

* fa-clock-o

* fa fa-arrow-circle-right

* fa fa-upload

* fa fa-archive

* fa-user

* fa-users

* fa-user-secret

* fa fa-building

* fa-building

* fa fa-tachometer

* fa-tachometer

* fa-level-down

* fa-level-up

* fa fa-eraser

* fa-eraser

* fa-download

* fa-times

* fa fa-refresh

* fa-info-circle

* fa fa-globe

* fa-globe

* fa-sign-in

* fa fa-eye

* fa-eye

* cs fix

* fix globe

* fa-search

* improvement

* fa fa-ban

* fa-ban

* fa fa-file-o

* fa fa-calendar

* fa-calendar

* fa-language

* fa fa-key

* fa fa-filter

* fast replacing

* fix flip on dropdown

* fix tag icon on batch dropdown

* fr

* fr

* update remix icon

* icons, including sizes

* renormalize

* cs fix

* mariadb fix
  • Loading branch information
andersonjeccel committed Jun 24, 2024
1 parent 40eae64 commit 02f3de8
Show file tree
Hide file tree
Showing 147 changed files with 488 additions and 348 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<input type="text" id="username" name="_username" class="form-control input-lg" value="{{ last_username }}" required autofocus placeholder="{{ 'mautic.user.auth.form.loginusername'|trans }}" />
</div>
<div class="input-group mb-md">
<span class="input-group-addon"><i class="fa fa-key"></i></span>
<span class="input-group-addon"><i class="ri-key-2-line"></i></span>
<label for="password" class="sr-only">{{ 'mautic.core.password'|trans }}:</label>
<input type="password" id="password" name="_password" class="form-control input-lg" required placeholder="{{ 'mautic.core.password'|trans }}" />
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/bundles/AssetBundle/Entity/Asset.php
Original file line number Diff line number Diff line change
Expand Up @@ -953,7 +953,7 @@ public function getIconClass(): string

// return missing file icon if file type is empty
if (!$fileType) {
return 'fa fa-ban';
return 'ri-prohibited-line';
}

$fileTypes = $this->getFileExtensions();
Expand All @@ -966,7 +966,7 @@ public function getIconClass(): string
}

// File extension is unknown, display general file icon.
return 'fa fa-file-o';
return 'ri-file-line';
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{% trans %}mautic.asset.no_audio_support{% endtrans %}
</audio>
{% else %}
<i class="{{ activeAsset.getIconClass() }} fa-5x"></i>
<i class="{{ activeAsset.getIconClass() }} ri-5x"></i>
{% endif %}
</div>
<div class="clearfix"></div>
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ private function addTimelineEvents(LeadTimelineEvent $event, $eventTypeKey, $eve
if (empty($log['isScheduled']) && empty($log['dateTriggered'])) {
// Note as cancelled
$label .= ' <i data-toggle="tooltip" title="'.$this->translator->trans('mautic.campaign.event.cancelled')
.'" class="fa fa-calendar-times-o text-warning timeline-campaign-event-cancelled-'.$log['event_id'].'"></i>';
.'" class="ri-calendar-close-fill text-warning timeline-campaign-event-cancelled-'.$log['event_id'].'"></i>';
}

if ((!empty($log['metadata']['errors']) && empty($log['dateTriggered'])) || !empty($log['metadata']['failed']) || !empty($log['fail_reason'])) {
Expand Down
2 changes: 1 addition & 1 deletion app/bundles/CampaignBundle/Form/Type/EventType.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
'label' => false,
'attr' => [
'class' => 'form-control',
'preaddon' => 'fa fa-calendar',
'preaddon' => 'ri-calendar-line',
'data-toggle' => 'datetime',
],
'widget' => 'single_text',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<h3 class="panel-title">{{ 'mautic.campaign.event.decision.header'|trans }}</h3>
</div>
<div class="col-xs-4 col-sm-2 pl-0 pr-0 pt-10 pb-10 text-right">
<i class="hidden-xs fa fa-random fa-lg"></i>
<i class="hidden-xs ri-shuffle-line fa-lg"></i>
<button class="visible-xs pull-right btn btn-sm btn-default btn-nospin text-success" data-type="Decision">
{{ 'mautic.core.select'|trans }}
</button>
Expand All @@ -37,7 +37,7 @@
<h3 class="panel-title">{{ 'mautic.campaign.event.action.header'|trans }}</h3>
</div>
<div class="col-xs-4 col-sm-2 pl-0 pr-0 pt-10 pb-10 text-right">
<i class="hidden-xs fa fa-bullseye fa-lg"></i>
<i class="hidden-xs ri-focus-2-line fa-lg"></i>
<button class="visible-xs pull-right btn btn-sm btn-default btn-nospin text-primary" data-type="Action">
{{ 'mautic.core.select'|trans }}
</button>
Expand All @@ -60,7 +60,7 @@
<h3 class="panel-title">{{ 'mautic.campaign.event.condition.header'|trans }}</h3>
</div>
<div class="col-xs-4 col-sm-2 pl-0 pr-0 pt-10 pb-10 text-right">
<i class="hidden-xs fa fa-filter fa-lg"></i>
<i class="hidden-xs ri-filter-2-fill fa-lg"></i>
<button class="visible-xs pull-right btn btn-sm btn-default btn-nospin text-danger" data-type="Condition">
{{ 'mautic.core.select'|trans }}
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
{% if (lead and securityHasEntityAccess('lead:leads:editown', 'lead:leads:editother', lead.getPermissionUser())) %}
<span class="form-buttons btn-group btn-group-xs mb-3" role="group" aria-label="Field options">
<button type="button" id="timeline-campaign-event-save-{{ item.event_id }}" class="btn btn-default btn-nospin" onmousedown="return false;" onclick="Mautic.saveScheduledCampaignEvent({{ item.event_id }}, {{ lead.getId() }})" data-toggle="tooltip" title="{{ 'mautic.campaign.event.save'|trans }}" style="display:none">
<i class="fa fa-floppy-o text-primary"></i>
<i class="ri-save-line text-primary"></i>
</button>
<button type="button" class="btn btn-default btn-nospin btn-reschedule" onclick="Mautic.updateScheduledCampaignEvent({{ item.event_id }}, {{ lead.getId() }})" data-toggle="tooltip" title="{{ 'mautic.campaign.event.reschedule'|trans }}">
<i class="ri-time-line text-primary"></i>
Expand Down
2 changes: 1 addition & 1 deletion app/bundles/CategoryBundle/Config/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
'mautic.category.menu.index' => [
'route' => 'mautic_category_index',
'access' => 'category:categories:view',
'iconClass' => 'ri-folder-settings-fill',
'iconClass' => 'ri-folder-6-fill',
'id' => 'mautic_category_index',
'priority' => 20,
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function injectContactBulkButtons(CustomButtonEvent $event): void
'data-header' => $this->translator->trans('mautic.lead.batch.channels'),
],
'btnText' => $this->translator->trans('mautic.lead.batch.channels'),
'iconClass' => 'ri-rss-line',
'iconClass' => 'ri-remote-control-line',
],
ButtonHelper::LOCATION_BULK_ACTIONS
);
Expand Down
2 changes: 1 addition & 1 deletion app/bundles/ChannelBundle/EventListener/LeadSubscriber.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function onTimelineGenerate(LeadTimelineEvent $event): void
'log' => $log,
],
'contentTemplate' => '@MauticChannel/SubscribedEvents/Timeline/queued_messages.html.twig',
'icon' => 'fa-comments-o',
'icon' => 'ri-question-answer-line',
'contactId' => $log['lead_id'],
]
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<div class="panel-body box-layout">
<div class="col-md-6 va-m">
<h5 class="text-white dark-md fw-sb mb-xs">
<div><i class="fa fa-line-chart pull-left"></i>
<div><i class="ri-line-chart-fill pull-left"></i>
<span class="pull-left"> {% trans %}mautic.messages.processed.messages{% endtrans %}</span></div>
</h5>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
},
} %}
{% if formContainsErrors(form.channels[channel]) %}
{% set tab = tab|merge({'class': 'text-danger', 'icon': 'fa-warning'}) %}
{% set tab = tab|merge({'class': 'text-danger', 'icon': 'ri-alert-fill'}) %}
{% elseif form.channels[channel].isEnabled.vars.data %}
{% set tab = tab|merge({'published': true}) %}
{% endif %}
Expand Down
1 change: 1 addition & 0 deletions app/bundles/CoreBundle/Assets/css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -5887,6 +5887,7 @@ ul.media-list.media-list-feed div.media-object {
}
.flip-vertically {
transform: scaleY(-1);
display: inline-flex;
}
.disabled-row {
opacity: 0.6;
Expand Down
1 change: 1 addition & 0 deletions app/bundles/CoreBundle/Assets/css/app/less/custom.less
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ ul.media-list.media-list-feed div.media-object

.flip-vertically {
transform: scaleY(-1);
display: inline-flex;
}

.disabled-row {
Expand Down
132 changes: 129 additions & 3 deletions app/bundles/CoreBundle/Assets/css/libraries/libraries.css
Original file line number Diff line number Diff line change
Expand Up @@ -6176,18 +6176,18 @@ button.close {
transform: scale(0.8) rotateY(45deg) translateZ(calc(-340px + (40px * 5)));
}
/*
* Remix Icon v4.2.0
* Remix Icon v4.3.0
* https://remixicon.com
* https://github.com/Remix-Design/RemixIcon
*
* Copyright RemixIcon.com
* Released under the Apache License Version 2.0
*
* Date: 2024-02-25
* Date: 2024-06-13
*/
@font-face {
font-family: "remixicon";
src: url("remixicon/fonts/remixicon.woff2?t=1708865856766") format("woff2");
src: url("remixicon/fonts/remixicon.woff2?t=1718271040674") format("woff2");
font-display: swap;
}
[class^="ri-"],
Expand Down Expand Up @@ -14800,6 +14800,132 @@ button.close {
.ri-weight-line:before {
content: "\f522";
}
.ri-book-shelf-fill:before {
content: "\f523";
}
.ri-book-shelf-line:before {
content: "\f524";
}
.ri-brain-2-fill:before {
content: "\f525";
}
.ri-brain-2-line:before {
content: "\f526";
}
.ri-chat-search-fill:before {
content: "\f527";
}
.ri-chat-search-line:before {
content: "\f528";
}
.ri-chat-unread-fill:before {
content: "\f529";
}
.ri-chat-unread-line:before {
content: "\f52a";
}
.ri-collapse-horizontal-fill:before {
content: "\f52b";
}
.ri-collapse-horizontal-line:before {
content: "\f52c";
}
.ri-collapse-vertical-fill:before {
content: "\f52d";
}
.ri-collapse-vertical-line:before {
content: "\f52e";
}
.ri-dna-fill:before {
content: "\f52f";
}
.ri-dna-line:before {
content: "\f530";
}
.ri-dropper-fill:before {
content: "\f531";
}
.ri-dropper-line:before {
content: "\f532";
}
.ri-expand-diagonal-s-2-fill:before {
content: "\f533";
}
.ri-expand-diagonal-s-2-line:before {
content: "\f534";
}
.ri-expand-diagonal-s-fill:before {
content: "\f535";
}
.ri-expand-diagonal-s-line:before {
content: "\f536";
}
.ri-expand-horizontal-fill:before {
content: "\f537";
}
.ri-expand-horizontal-line:before {
content: "\f538";
}
.ri-expand-horizontal-s-fill:before {
content: "\f539";
}
.ri-expand-horizontal-s-line:before {
content: "\f53a";
}
.ri-expand-vertical-fill:before {
content: "\f53b";
}
.ri-expand-vertical-line:before {
content: "\f53c";
}
.ri-expand-vertical-s-fill:before {
content: "\f53d";
}
.ri-expand-vertical-s-line:before {
content: "\f53e";
}
.ri-gemini-fill:before {
content: "\f53f";
}
.ri-gemini-line:before {
content: "\f540";
}
.ri-reset-left-fill:before {
content: "\f541";
}
.ri-reset-left-line:before {
content: "\f542";
}
.ri-reset-right-fill:before {
content: "\f543";
}
.ri-reset-right-line:before {
content: "\f544";
}
.ri-stairs-fill:before {
content: "\f545";
}
.ri-stairs-line:before {
content: "\f546";
}
.ri-telegram-2-fill:before {
content: "\f547";
}
.ri-telegram-2-line:before {
content: "\f548";
}
.ri-triangular-flag-fill:before {
content: "\f549";
}
.ri-triangular-flag-line:before {
content: "\f54a";
}
.ri-user-minus-fill:before {
content: "\f54b";
}
.ri-user-minus-line:before {
content: "\f54c";
}
/*!
* Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
/*
* Remix Icon v4.2.0
* Remix Icon v4.3.0
* https://remixicon.com
* https://github.com/Remix-Design/RemixIcon
*
* Copyright RemixIcon.com
* Released under the Apache License Version 2.0
*
* Date: 2024-02-25
* Date: 2024-06-13
*/
@font-face {
font-family: "remixicon";
src: url("remixicon/fonts/remixicon.woff2?t=1708865856766") format("woff2");
src: url("remixicon/fonts/remixicon.woff2?t=1718271040674") format("woff2");
font-display: swap;
}

Expand Down Expand Up @@ -2887,4 +2887,47 @@
.ri-webhook-fill:before { content: "\f51f"; }
.ri-webhook-line:before { content: "\f520"; }
.ri-weight-fill:before { content: "\f521"; }
.ri-weight-line:before { content: "\f522"; }
.ri-weight-line:before { content: "\f522"; }
.ri-book-shelf-fill:before { content: "\f523"; }
.ri-book-shelf-line:before { content: "\f524"; }
.ri-brain-2-fill:before { content: "\f525"; }
.ri-brain-2-line:before { content: "\f526"; }
.ri-chat-search-fill:before { content: "\f527"; }
.ri-chat-search-line:before { content: "\f528"; }
.ri-chat-unread-fill:before { content: "\f529"; }
.ri-chat-unread-line:before { content: "\f52a"; }
.ri-collapse-horizontal-fill:before { content: "\f52b"; }
.ri-collapse-horizontal-line:before { content: "\f52c"; }
.ri-collapse-vertical-fill:before { content: "\f52d"; }
.ri-collapse-vertical-line:before { content: "\f52e"; }
.ri-dna-fill:before { content: "\f52f"; }
.ri-dna-line:before { content: "\f530"; }
.ri-dropper-fill:before { content: "\f531"; }
.ri-dropper-line:before { content: "\f532"; }
.ri-expand-diagonal-s-2-fill:before { content: "\f533"; }
.ri-expand-diagonal-s-2-line:before { content: "\f534"; }
.ri-expand-diagonal-s-fill:before { content: "\f535"; }
.ri-expand-diagonal-s-line:before { content: "\f536"; }
.ri-expand-horizontal-fill:before { content: "\f537"; }
.ri-expand-horizontal-line:before { content: "\f538"; }
.ri-expand-horizontal-s-fill:before { content: "\f539"; }
.ri-expand-horizontal-s-line:before { content: "\f53a"; }
.ri-expand-vertical-fill:before { content: "\f53b"; }
.ri-expand-vertical-line:before { content: "\f53c"; }
.ri-expand-vertical-s-fill:before { content: "\f53d"; }
.ri-expand-vertical-s-line:before { content: "\f53e"; }
.ri-gemini-fill:before { content: "\f53f"; }
.ri-gemini-line:before { content: "\f540"; }
.ri-reset-left-fill:before { content: "\f541"; }
.ri-reset-left-line:before { content: "\f542"; }
.ri-reset-right-fill:before { content: "\f543"; }
.ri-reset-right-line:before { content: "\f544"; }
.ri-stairs-fill:before { content: "\f545"; }
.ri-stairs-line:before { content: "\f546"; }
.ri-telegram-2-fill:before { content: "\f547"; }
.ri-telegram-2-line:before { content: "\f548"; }
.ri-triangular-flag-fill:before { content: "\f549"; }
.ri-triangular-flag-line:before { content: "\f54a"; }
.ri-user-minus-fill:before { content: "\f54b"; }
.ri-user-minus-line:before { content: "\f54c"; }

Binary file not shown.
Loading

0 comments on commit 02f3de8

Please sign in to comment.