Skip to content
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

Jump to bottom

IBX-5232: Unification of extra action styles and removing duplicated code #725

Merged
merged 1 commit into from
Mar 17, 2023
Merged

IBX-5232: Unification of extra action styles and removing duplicated code #725

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
22 changes: 15 additions & 7 deletions src/bundle/Resources/public/scss/_extra-actions.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,31 @@
}

&__content {
padding: 0 calculateRem(32px);
padding: calculateRem(32px);
width: 75%;
max-height: calc(100% - #{calculateRem(90px)});
overflow: auto;

.form-group {
margin-bottom: 0;
}

&--create {
padding: 0 calculateRem(32px);
}
}

&--edit-user,
&--edit {
.ibexa-extra-actions__content {
padding: calculateRem(32px);
width: 75%;
&__btns {
margin-top: calculateRem(42px);
display: flex;

.ibexa-btn + .ibexa-btn {
margin-left: calculateRem(16px);
}
}

&--edit-user,
&--edit {
.form-check {
padding-left: 0;
}
Expand Down Expand Up @@ -124,7 +133,6 @@
&__section-content--content-type {
padding: 0;
border: none;
width: 75%;
}
}

Expand Down
6 changes: 0 additions & 6 deletions src/bundle/Resources/public/scss/_instant-filter.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
}

.ibexa-extra-actions--create {
.ibexa-extra-actions {
&__section-content {
width: 75%;
}
}

.ibexa-instant-filter {
&__desc {
color: $ibexa-color-dark-400;
Expand Down
4 changes: 0 additions & 4 deletions src/bundle/Resources/public/scss/ui/modules/universal-discovery/_content.create.widget.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
&__content {
height: calc(100% - #{calculateRem(166px)});
}

&__section-content {
width: 75%;
}
}
}
}
2 changes: 1 addition & 1 deletion src/bundle/Resources/views/themes/admin/content/widget/content_create.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{% endif %}
</div>
</div>
<div class="ibexa-extra-actions__content">
<div class="ibexa-extra-actions__content ibexa-extra-actions__content--create">
{% set action = action is defined ? action : path('ibexa.content.create') %}
{{ form_start(form, {
'action': action,
Expand Down
2 changes: 1 addition & 1 deletion ...src/modules/universal-discovery/components/content-create-widget/content.create.widget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ const ContentCreateWidget = () => {
</button>
<div className="ibexa-extra-actions__header-subtitle">{createUnderLabel}</div>
</div>
<div className="ibexa-extra-actions__content">
<div className="ibexa-extra-actions__content ibexa-extra-actions__content--create">
<label className="ibexa-label ibexa-extra-actions__section-header">{selectLanguageLabel}</label>
<div className="ibexa-extra-actions__section-content">
<Dropdown
Expand Down