Skip to content

Commit 2d8c86b

Browse files
authored
Merge pull request mautic#14372 from andersonjeccel/dynamic-content-slot-generator
[UX] Dynamic content slot generator
2 parents 39b4b77 + 3bd2fa9 commit 2d8c86b

File tree

132 files changed

+839
-454
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+839
-454
lines changed

app/bundles/AssetBundle/Resources/views/Asset/details.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<!-- asset detail collapseable toggler -->
105105
<div class="hr-expand nm">
106106
<span data-toggle="tooltip" title="Detail">
107-
<a href="javascript:void(0)" class="arrow text-muted collapsed" data-toggle="collapse"
107+
<a href="javascript:void(0)" class="arrow text-secondary collapsed" data-toggle="collapse"
108108
data-target="#asset-details"><span class="caret"></span> {% trans %}mautic.core.details{% endtrans %}</a>
109109
</span>
110110
</div>

app/bundles/AssetBundle/Resources/views/Asset/list.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
</div>
204204
{% set description = item.getDescription() %}
205205
{% if description %}
206-
<div class="text-muted mt-4">
206+
<div class="text-secondary mt-4">
207207
<small>{{ description|purify }}</small>
208208
</div>
209209
{% endif %}

app/bundles/AssetBundle/Resources/views/Remote/browse.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<ul class="list-group list-group-tabs">
3030
{% for integration in integrations %}
3131
<li class="list-group-item{% if loop.index0 is same as(0) %} active{% endif %}" id="tab{{ integration.getName() }}">
32-
<a href="javascript: void(0);" class="list-group-item-text steps" onclick="Mautic.updateRemoteBrowser('{{ integration.getName() }}');">
32+
<a href="javascript: void(0);" class="list-group-item-heading steps" onclick="Mautic.updateRemoteBrowser('{{ integration.getName() }}');">
3333
{{ integration.getDisplayName() }}
3434
</a>
3535
</li>

app/bundles/CampaignBundle/Resources/views/Campaign/Builder/_index.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@
142142
<div id="CampaignPasteContainer mt-10" class="panel mb-0">
143143
<div id="CampaignPasteDescription" class="panel-body">
144144
<div><b>{{ 'mautic.campaign.event.clone.header'|trans }}</b></div>
145-
<div><span class="text-muted">{{ 'mautic.campaign.event.clone.name'|trans }}: </span><span data-campaign-event-clone="sourceEventName"></span></div>
146-
<div><span class="text-muted">{{ 'mautic.campaign.event.clone.from'|trans }}: </span><span data-campaign-event-clone="sourceCampaignName"></span></div>
145+
<div><span class="text-secondary">{{ 'mautic.campaign.event.clone.name'|trans }}: </span><span data-campaign-event-clone="sourceEventName"></span></div>
146+
<div><span class="text-secondary">{{ 'mautic.campaign.event.clone.from'|trans }}: </span><span data-campaign-event-clone="sourceCampaignName"></span></div>
147147

148148
</div>
149149
<div class="panel-footer">

app/bundles/CampaignBundle/Resources/views/Campaign/_events.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
</span>
3131
</div>
3232
<div class="col-md-5 va-m">
33-
<h5 class="fw-sb text-primary mb-xs">
33+
<h5 class="fw-sb text-interactive mb-xs">
3434
{{ event.name }}
3535
{% if event.eventType is defined and 'action' != event.eventType %}
36-
<small class="text-muted">{{ event.percent }}%</small>
36+
<small class="text-secondary">{{ event.percent }}%</small>
3737
{% endif %}
3838

3939
</h5>

app/bundles/CampaignBundle/Resources/views/Campaign/details.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<!-- campaign detail collapseable toggler -->
8383
<div class="hr-expand nm">
8484
<span data-toggle="tooltip" title="Detail">
85-
<a href="javascript:void(0)" class="arrow text-muted collapsed" data-toggle="collapse"
85+
<a href="javascript:void(0)" class="arrow text-secondary collapsed" data-toggle="collapse"
8686
data-target="#campaign-details"><span
8787
class="caret"></span> {{ 'mautic.core.details'|trans }}</a>
8888
</span>

app/bundles/CampaignBundle/Resources/views/Campaign/list.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
</a>
154154
</div>
155155
{%- if item.description -%}
156-
<div class="text-muted mt-4"><small>{{ item.description|purify }}</small></div>
156+
<div class="text-secondary mt-4"><small>{{ item.description|purify }}</small></div>
157157
{%- endif -%}
158158
</td>
159159
<td class="visible-md visible-lg">

app/bundles/CampaignBundle/Resources/views/Event/form.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<div class="bundle-form-header mb-10">
1313
<h3>{{ eventHeader }}</h3>
1414
{% if eventDescription is defined %}
15-
<h6 class="text-muted">{{ eventDescription|purify }}</h6>
15+
<h6 class="text-secondary">{{ eventDescription|purify }}</h6>
1616
{% endif %}
1717
</div>
1818

app/bundles/CampaignBundle/Resources/views/Source/form.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="bundle-form">
22
<div class="bundle-form-header mb-15">
33
<h3>{{ 'mautic.campaign.leadsource.header.singular'|trans }}</h3>
4-
<h6 class="text-muted">{{ ('mautic.campaign.leadsource.'~sourceType~'.tooltip')|trans }}</h6>
4+
<h6 class="text-secondary">{{ ('mautic.campaign.leadsource.'~sourceType~'.tooltip')|trans }}</h6>
55
</div>
66
{{ form_start(form) }}
77
{{ form_end(form) }}

app/bundles/CampaignBundle/Resources/views/SubscribedEvents/Timeline/index.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
{% if (lead and securityHasEntityAccess('lead:leads:editown', 'lead:leads:editother', lead.getPermissionUser())) %}
3333
<span class="form-buttons btn-group btn-group-xs mb-3" role="group" aria-label="Field options">
3434
<button type="button" id="timeline-campaign-event-save-{{ item.event_id }}" class="btn btn-ghost 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">
35-
<i class="ri-save-line text-primary"></i>
35+
<i class="ri-save-line text-interactive"></i>
3636
</button>
3737
<button type="button" class="btn btn-ghost btn-nospin btn-reschedule" onclick="Mautic.updateScheduledCampaignEvent({{ item.event_id }}, {{ lead.getId() }})" data-toggle="tooltip" title="{{ 'mautic.campaign.event.reschedule'|trans }}">
38-
<i class="ri-time-line text-primary"></i>
38+
<i class="ri-time-line text-interactive"></i>
3939
</button>
4040
<button type="button" class="btn btn-ghost btn-nospin"{{ cancelled ? ' disabled' : '' }} onclick="Mautic.cancelScheduledCampaignEvent({{ item.event_id }}, {{ lead.getId() }})" data-toggle="tooltip" title="{{ 'mautic.campaign.event.cancel'|trans }}">
4141
<i class="ri-close-line text-danger"></i>

0 commit comments

Comments
 (0)