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-8593: Remove depracation warnings from scss build after upgrading sass package #1293

Merged
merged 2 commits into from
Jul 22, 2024
Merged

IBX-8593: Remove depracation warnings from scss build after upgrading sass package #1293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ccffab
sass
GrabowskiM Jul 18, 2024
8c0ced1
added to mixin
GrabowskiM Jul 19, 2024
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
8 changes: 5 additions & 3 deletions src/bundle/Resources/public/scss/_content-type-edit.scss
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

105 changes: 0 additions & 105 deletions src/bundle/Resources/public/scss/_user-menu.scss
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/bundle/Resources/public/scss/ibexa.scss
View file
Open in desktop
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
View file
Open in desktop
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
6 changes: 4 additions & 2 deletions src/bundle/Resources/public/scss/ui/modules/common/_popup.scss
View file
Open in desktop
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
Loading