Skip to content

Fix edited field label focus mode #1000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 21, 2023
Merged

Fix edited field label focus mode #1000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/bundle/Resources/public/scss/fieldType/edit/_base-field.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
&__focus-mode-control-container {
display: flex;
align-self: flex-end;

.ibexa-label {
display: none;
}
}

&__focus-mode-control-btn {
Expand Down Expand Up @@ -141,7 +145,15 @@
}

&__focus-mode-control-container {
display: flex;
justify-content: space-between;
width: 100%;
height: calculateRem(40px);

.ibexa-label {
display: inline-flex;
margin: calculateRem(8px) 0 0 0;
}
}

&__focus-mode-control-btn {
Expand Down
49 changes: 27 additions & 22 deletions src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,28 +524,33 @@
} only %}
</div>
<div class="ibexa-field-edit__focus-mode-control-container">
<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">
<svg class="ibexa-icon ibexa-icon--small">
<use xlink:href="{{ ibexa_icon_path('focus') }}"></use>
</svg>
<span
class="ibexa-btn__label"
title="{{ 'focus_mode.enable.tooltip'|trans|desc('Enter focus mode. It shows only rich text editor toolbar and focuses your attention on editing text.') }}"
>
{{ 'focus_mode.enable.label'|trans|desc('Focus mode') }}
</span>
</button>
<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">
<svg class="ibexa-icon ibexa-icon--small">
<use xlink:href="{{ ibexa_icon_path('un-focus') }}"></use>
</svg>
<span
class="ibexa-btn__label"
title="{{ 'focus_mode.disable.tooltip'|trans|desc('Exit focus mode.') }}"
>
{{ 'focus_mode.disable.label'|trans|desc('Exit focus mode') }}
</span>
</button>
<div class="ibexa-field-edit__focus-mode-label">
{{- form_label(form) -}}
</div>
<div class="ibexa-field-edit__focus-mode-btns">
<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">
<svg class="ibexa-icon ibexa-icon--small">
<use xlink:href="{{ ibexa_icon_path('focus') }}"></use>
</svg>
<span
class="ibexa-btn__label"
title="{{ 'focus_mode.enable.tooltip'|trans|desc('Enter focus mode. It shows only rich text editor toolbar and focuses your attention on editing text.') }}"
>
{{ 'focus_mode.enable.label'|trans|desc('Focus mode') }}
</span>
</button>
<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">
<svg class="ibexa-icon ibexa-icon--small">
<use xlink:href="{{ ibexa_icon_path('un-focus') }}"></use>
</svg>
<span
class="ibexa-btn__label"
title="{{ 'focus_mode.disable.tooltip'|trans|desc('Exit focus mode.') }}"
>
{{ 'focus_mode.disable.label'|trans|desc('Exit focus mode') }}
</span>
</button>
</div>
</div>
</div>
{%- endblock -%}