Skip to content

Commit

Permalink
IBX-8593: Remove deprecation warnings from SCSS build after upgrading…
Browse files Browse the repository at this point in the history
… sass package (#1293)
  • Loading branch information
GrabowskiM authored Jul 22, 2024
1 parent f7e0ae0 commit 67f1aa4
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 171 deletions.
8 changes: 5 additions & 3 deletions src/bundle/Resources/public/scss/_content-type-edit.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
.ibexa-available-field-types {
@include sidebar-drag-items();

min-height: calculateRem(700px);
max-height: calc(100vh - #{calculateRem(200px)});
margin-left: calculateRem(32px);
& {
min-height: calculateRem(700px);
max-height: calc(100vh - #{calculateRem(200px)});
margin-left: calculateRem(32px);
}
}

.ibexa-available-field-type {
Expand Down
12 changes: 7 additions & 5 deletions src/bundle/Resources/public/scss/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ form:not(.form-inline) {
.col-form-legend {
@include label-required();

font-weight: 700;
font-size: calculateRem(16px);
color: $ibexa-color-black;
margin-bottom: 0;
margin-top: calculateRem(20px);
& {
font-weight: 700;
font-size: calculateRem(16px);
color: $ibexa-color-black;
margin-bottom: 0;
margin-top: calculateRem(20px);
}
}

.form-control {
Expand Down
14 changes: 8 additions & 6 deletions src/bundle/Resources/public/scss/_labels.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
.ibexa-label {
@include label-required();

font-size: $ibexa-text-font-size-small;
color: $ibexa-color-dark-400;
line-height: calculateRem(18px);
margin-bottom: calculateRem(8px);
padding-top: 0;
padding-bottom: 0;
& {
font-size: $ibexa-text-font-size-small;
color: $ibexa-color-dark-400;
line-height: calculateRem(18px);
margin-bottom: calculateRem(8px);
padding-top: 0;
padding-bottom: 0;
}

.ibexa-icon {
fill: $ibexa-color-dark-400;
Expand Down
6 changes: 4 additions & 2 deletions src/bundle/Resources/public/scss/_modals.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@
.close {
@include close-button();

top: calculateRem(22px);
right: calculateRem(18px);
& {
top: calculateRem(22px);
right: calculateRem(18px);
}
}

.modal-body {
Expand Down
42 changes: 0 additions & 42 deletions src/bundle/Resources/public/scss/_notifications-menu.scss

This file was deleted.

105 changes: 0 additions & 105 deletions src/bundle/Resources/public/scss/_user-menu.scss

This file was deleted.

2 changes: 0 additions & 2 deletions src/bundle/Resources/public/scss/ibexa.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
@import 'preview-header';
@import 'preview';
@import 'add-translation';
@import 'user-menu';
@import 'typography';
@import 'content-edit';
@import 'content-type-edit';
Expand Down Expand Up @@ -81,7 +80,6 @@
@import 'fieldType/preview/ezgmaplocation';
@import 'dashboard';
@import 'picker';
@import 'notifications-menu';
@import 'notifications-modal';
@import 'admin.section-view';
@import 'content-tree';
Expand Down
10 changes: 6 additions & 4 deletions src/bundle/Resources/public/scss/mixins/_drag-and-drop.scss
Original file line number Diff line number Diff line change
Expand Up @@ -412,10 +412,12 @@
@mixin drag-item {
$self: &;

display: flex;
background: $ibexa-color-light-300;
margin-top: calculateRem(8px);
border-radius: $ibexa-border-radius;
& {
display: flex;
background: $ibexa-color-light-300;
margin-top: calculateRem(8px);
border-radius: $ibexa-border-radius;
}

&:hover:not(&--is-non-interactive) {
#{$self}__content {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@
&__btn--close {
@include close-button();

top: calculateRem(22px);
right: calculateRem(18px);
& {
top: calculateRem(22px);
right: calculateRem(18px);
}
}

&__body {
Expand Down

0 comments on commit 67f1aa4

Please sign in to comment.