Skip to content

Commit

Permalink
IBX-5232: Unification of extra action styles and removing duplicated …
Browse files Browse the repository at this point in the history
…code
  • Loading branch information
GrabowskiM committed Mar 15, 2023
1 parent 5c7a7d6 commit 2c6e759
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 19 deletions.
22 changes: 15 additions & 7 deletions src/bundle/Resources/public/scss/_extra-actions.scss
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
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
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%;
}
}
}
}
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
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

0 comments on commit 2c6e759

Please sign in to comment.