Skip to content

Commit e993bae

Browse files
authored
Added edited field label to focus mode (#1000)
1 parent dbfda9d commit e993bae

File tree

2 files changed

+39
-22
lines changed

2 files changed

+39
-22
lines changed

src/bundle/Resources/public/scss/fieldType/edit/_base-field.scss

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
&__focus-mode-control-container {
3131
display: flex;
3232
align-self: flex-end;
33+
34+
.ibexa-label {
35+
display: none;
36+
}
3337
}
3438

3539
&__focus-mode-control-btn {
@@ -141,7 +145,15 @@
141145
}
142146

143147
&__focus-mode-control-container {
148+
display: flex;
149+
justify-content: space-between;
150+
width: 100%;
144151
height: calculateRem(40px);
152+
153+
.ibexa-label {
154+
display: inline-flex;
155+
margin: calculateRem(8px) 0 0 0;
156+
}
145157
}
146158

147159
&__focus-mode-control-btn {

src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -524,28 +524,33 @@
524524
} only %}
525525
</div>
526526
<div class="ibexa-field-edit__focus-mode-control-container">
527-
<button type="button" class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small ibexa-field-edit__focus-mode-control-btn ibexa-field-edit__focus-mode-control-btn--enable">
528-
<svg class="ibexa-icon ibexa-icon--small">
529-
<use xlink:href="{{ ibexa_icon_path('focus') }}"></use>
530-
</svg>
531-
<span
532-
class="ibexa-btn__label"
533-
title="{{ 'focus_mode.enable.tooltip'|trans|desc('Enter focus mode. It shows only rich text editor toolbar and focuses your attention on editing text.') }}"
534-
>
535-
{{ 'focus_mode.enable.label'|trans|desc('Focus mode') }}
536-
</span>
537-
</button>
538-
<button type="button" class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small ibexa-field-edit__focus-mode-control-btn ibexa-field-edit__focus-mode-control-btn--disable">
539-
<svg class="ibexa-icon ibexa-icon--small">
540-
<use xlink:href="{{ ibexa_icon_path('un-focus') }}"></use>
541-
</svg>
542-
<span
543-
class="ibexa-btn__label"
544-
title="{{ 'focus_mode.disable.tooltip'|trans|desc('Exit focus mode.') }}"
545-
>
546-
{{ 'focus_mode.disable.label'|trans|desc('Exit focus mode') }}
547-
</span>
548-
</button>
527+
<div class="ibexa-field-edit__focus-mode-label">
528+
{{- form_label(form) -}}
529+
</div>
530+
<div class="ibexa-field-edit__focus-mode-btns">
531+
<button type="button" class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small ibexa-field-edit__focus-mode-control-btn ibexa-field-edit__focus-mode-control-btn--enable">
532+
<svg class="ibexa-icon ibexa-icon--small">
533+
<use xlink:href="{{ ibexa_icon_path('focus') }}"></use>
534+
</svg>
535+
<span
536+
class="ibexa-btn__label"
537+
title="{{ 'focus_mode.enable.tooltip'|trans|desc('Enter focus mode. It shows only rich text editor toolbar and focuses your attention on editing text.') }}"
538+
>
539+
{{ 'focus_mode.enable.label'|trans|desc('Focus mode') }}
540+
</span>
541+
</button>
542+
<button type="button" class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small ibexa-field-edit__focus-mode-control-btn ibexa-field-edit__focus-mode-control-btn--disable">
543+
<svg class="ibexa-icon ibexa-icon--small">
544+
<use xlink:href="{{ ibexa_icon_path('un-focus') }}"></use>
545+
</svg>
546+
<span
547+
class="ibexa-btn__label"
548+
title="{{ 'focus_mode.disable.tooltip'|trans|desc('Exit focus mode.') }}"
549+
>
550+
{{ 'focus_mode.disable.label'|trans|desc('Exit focus mode') }}
551+
</span>
552+
</button>
553+
</div>
549554
</div>
550555
</div>
551556
{%- endblock -%}

0 commit comments

Comments
 (0)