Skip to content

Commit

Permalink
IBX-7315: Update eslint/prettier to newest versions (#1036)
Browse files Browse the repository at this point in the history
  • Loading branch information
GrabowskiM authored Dec 7, 2023
1 parent 9c3fc93 commit 108fbf6
Show file tree
Hide file tree
Showing 16 changed files with 81 additions and 28 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"prettier": "eslint-config-ibexa/prettier",
"dependencies": {},
"devDependencies": {
"eslint-config-ibexa": "https://github.com/ibexa/eslint-config-ibexa.git#v1.0.0"
"eslint-config-ibexa": "https://github.com/ibexa/eslint-config-ibexa.git#v1.1.0"
},
"scripts": {
"test": "yarn prettier-test && yarn eslint-test",
Expand Down
14 changes: 10 additions & 4 deletions src/bundle/Resources/public/scss/_animations.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
background-color: $ibexa-color-white;
}
25% {
box-shadow: inset 10px 10px 10px 4px rgba(237, 237, 237, 0.1), inset -10px -10px 10px 4px rgba(237, 237, 237, 0.1),
inset 10px -10px 10px 4px rgba(237, 237, 237, 0.1), inset -10px 10px 10px 4px rgba(237, 237, 237, 0.1);
box-shadow:
inset 10px 10px 10px 4px rgba(237, 237, 237, 0.1),
inset -10px -10px 10px 4px rgba(237, 237, 237, 0.1),
inset 10px -10px 10px 4px rgba(237, 237, 237, 0.1),
inset -10px 10px 10px 4px rgba(237, 237, 237, 0.1);
}
50% {
transform: scale(0.75);
Expand All @@ -26,8 +29,11 @@
}
50% {
transform: scale(0.75);
box-shadow: inset 10px 10px 10px 4px rgba(237, 237, 237, 0.1), inset -10px -10px 10px 4px rgba(237, 237, 237, 0.1),
inset 10px -10px 10px 4px rgba(237, 237, 237, 0.1), inset -10px 10px 10px 4px rgba(237, 237, 237, 0.1);
box-shadow:
inset 10px 10px 10px 4px rgba(237, 237, 237, 0.1),
inset -10px -10px 10px 4px rgba(237, 237, 237, 0.1),
inset 10px -10px 10px 4px rgba(237, 237, 237, 0.1),
inset -10px 10px 10px 4px rgba(237, 237, 237, 0.1);
background-color: rgba(237, 237, 237, 0.1);
}
100% {
Expand Down
16 changes: 12 additions & 4 deletions src/bundle/Resources/public/scss/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@

&:hover {
color: $ibexa-color-white;
box-shadow: 0 0 0 transparent, $ibexa-btn-hover-box-shadow;
box-shadow:
0 0 0 transparent,
$ibexa-btn-hover-box-shadow;

.ibexa-icon {
fill: $ibexa-color-white;
Expand Down Expand Up @@ -196,7 +198,9 @@
color: $ibexa-color-white;
fill: $ibexa-color-white;
background-color: $ibexa-color-dark;
box-shadow: 0 0 0 transparent, $ibexa-btn-hover-box-shadow-dark;
box-shadow:
0 0 0 transparent,
$ibexa-btn-hover-box-shadow-dark;

.ibexa-icon {
fill: $ibexa-color-white;
Expand Down Expand Up @@ -230,7 +234,9 @@

&:hover {
color: $ibexa-color-white;
box-shadow: 0 0 0 transparent, $ibexa-btn-hover-box-shadow-info;
box-shadow:
0 0 0 transparent,
$ibexa-btn-hover-box-shadow-info;
background-color: $ibexa-color-info;

.ibexa-icon {
Expand Down Expand Up @@ -298,7 +304,9 @@

&:hover {
border-color: $ibexa-color-info;
box-shadow: 0 0 0 transparent, $ibexa-btn-hover-box-shadow-info;
box-shadow:
0 0 0 transparent,
$ibexa-btn-hover-box-shadow-info;
}

&:focus {
Expand Down
3 changes: 2 additions & 1 deletion src/bundle/Resources/public/scss/_collapse.scss
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@
}

&--heavy {
box-shadow: inset 0 0 0 calculateRem(1px) $ibexa-color-light,
box-shadow:
inset 0 0 0 calculateRem(1px) $ibexa-color-light,
calculateRem(4px) calculateRem(22px) calculateRem(47px) 0 rgba($ibexa-color-info, 0.05);
border-radius: $ibexa-border-radius;
transition: all $ibexa-admin-transition-duration;
Expand Down
10 changes: 9 additions & 1 deletion src/bundle/Resources/public/scss/_custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,15 @@ $ibexa-color-complementary-strong-200: #ccdbde;
$ibexa-color-complementary-strong-100: #e5edee;

// Ibexa fonts - part 1
$ibexa-font-family: 'Noto Sans', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif !default;
$ibexa-font-family:
'Noto Sans',
-apple-system,
BlinkMacSystemFont,
'Segoe UI',
Roboto,
'Helvetica Neue',
Arial,
sans-serif !default;
$ibexa-font-family-headings: 'Work Sans', sans-serif;

// boostrap variables
Expand Down
3 changes: 2 additions & 1 deletion src/bundle/Resources/public/scss/_dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,8 @@

&:not(.ibexa-dropdown--disabled):not(:hover) {
&.ibexa-dropdown {
$versions: 'primary' $ibexa-color-primary $ibexa-color-primary $ibexa-color-primary-200,
$versions:
'primary' $ibexa-color-primary $ibexa-color-primary $ibexa-color-primary-200,
'secondary' $ibexa-color-dark $ibexa-color-dark $ibexa-color-light-400,
'info' $ibexa-color-info $ibexa-color-info $ibexa-color-info-200,
'danger' $ibexa-color-danger $ibexa-color-danger $ibexa-color-danger-200,
Expand Down
4 changes: 3 additions & 1 deletion src/bundle/Resources/public/scss/_edit-header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
border-color: $ibexa-color-light-400;
border-top-left-radius: $ibexa-border-radius;
border-top-right-radius: $ibexa-border-radius;
transition: all $ibexa-admin-transition-duration $ibexa-admin-transition, border-bottom-width 0;
transition:
all $ibexa-admin-transition-duration $ibexa-admin-transition,
border-bottom-width 0;
z-index: 1050;

&__container {
Expand Down
4 changes: 3 additions & 1 deletion src/bundle/Resources/public/scss/_general.scss
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ img {
.btn {
white-space: normal;
cursor: pointer;
transition: opacity 0.3s $ibexa-admin-transition, background 0.3s $ibexa-admin-transition;
transition:
opacity 0.3s $ibexa-admin-transition,
background 0.3s $ibexa-admin-transition;
}

.ezrichtext-field {
Expand Down
4 changes: 3 additions & 1 deletion src/bundle/Resources/public/scss/_inputs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@
}

&--textarea {
transition: all $ibexa-admin-transition-duration $ibexa-admin-transition, box-shadow 0s; // Chrome does not render box-shadow properly with transition
transition:
all $ibexa-admin-transition-duration $ibexa-admin-transition,
box-shadow 0s; // Chrome does not render box-shadow properly with transition
height: calculateRem(120px);
padding: calculateRem(10px) calculateRem(16px);
}
Expand Down
10 changes: 8 additions & 2 deletions src/bundle/Resources/public/scss/_tabs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,10 @@
border-right-width: 0;
background-color: $ibexa-color-light-300;
border-color: $ibexa-color-light-300;
transition: all $ibexa-admin-transition-duration $ibexa-admin-transition, margin-bottom 1ms, border-color 1ms;
transition:
all $ibexa-admin-transition-duration $ibexa-admin-transition,
margin-bottom 1ms,
border-color 1ms;
}

&::after {
Expand Down Expand Up @@ -299,7 +302,10 @@
border: calculateRem(1px) solid $ibexa-color-light;
border-right-width: 0;
z-index: 2;
transition: all $ibexa-admin-transition-duration $ibexa-admin-transition, margin-bottom 1ms, border-color 1ms;
transition:
all $ibexa-admin-transition-duration $ibexa-admin-transition,
margin-bottom 1ms,
border-color 1ms;
}

&::after {
Expand Down
10 changes: 7 additions & 3 deletions src/bundle/Resources/public/scss/_tag-view-select.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,13 @@
}
}

$color-versions: 'primary' $ibexa-color-primary $ibexa-color-primary-200, 'secondary' $ibexa-color-dark $ibexa-color-light-500,
'info' $ibexa-color-info $ibexa-color-info-200, 'danger' $ibexa-color-danger $ibexa-color-danger-200,
'success' $ibexa-color-success $ibexa-color-success-200, 'complementary' $ibexa-color-complementary $ibexa-color-complementary-200;
$color-versions:
'primary' $ibexa-color-primary $ibexa-color-primary-200,
'secondary' $ibexa-color-dark $ibexa-color-light-500,
'info' $ibexa-color-info $ibexa-color-info-200,
'danger' $ibexa-color-danger $ibexa-color-danger-200,
'success' $ibexa-color-success $ibexa-color-success-200,
'complementary' $ibexa-color-complementary $ibexa-color-complementary-200;

@mixin colorful-tags($color-text, $color-background) {
.ibexa-tag-view-select {
Expand Down
10 changes: 7 additions & 3 deletions src/bundle/Resources/public/scss/_tag.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,13 @@
}
}

$color-versions: 'primary' $ibexa-color-primary $ibexa-color-primary-200, 'secondary' $ibexa-color-dark $ibexa-color-light-500,
'info' $ibexa-color-info $ibexa-color-info-200, 'danger' $ibexa-color-danger $ibexa-color-danger-200,
'success' $ibexa-color-success $ibexa-color-success-200, 'complementary' $ibexa-color-complementary $ibexa-color-complementary-200;
$color-versions:
'primary' $ibexa-color-primary $ibexa-color-primary-200,
'secondary' $ibexa-color-dark $ibexa-color-light-500,
'info' $ibexa-color-info $ibexa-color-info-200,
'danger' $ibexa-color-danger $ibexa-color-danger-200,
'success' $ibexa-color-success $ibexa-color-success-200,
'complementary' $ibexa-color-complementary $ibexa-color-complementary-200;

@each $name, $color-text, $color-background in $color-versions {
&--#{$name} {
Expand Down
8 changes: 6 additions & 2 deletions src/bundle/Resources/public/scss/_translation-selector.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,16 @@
opacity: 1;
transform: scaleX(1);
transform-origin: right center;
transition: transform 0.4s ease-in, opacity 0.4s ease-in;
transition:
transform 0.4s ease-in,
opacity 0.4s ease-in;

&--hidden {
opacity: 0;
transform: scaleX(0);
transition: transform 0.2s ease-out, opacity 0.2s ease-out;
transition:
transform 0.2s ease-out,
opacity 0.2s ease-out;
}
}

Expand Down
4 changes: 3 additions & 1 deletion src/bundle/Resources/public/scss/mixins/_drag-and-drop.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
@mixin drag-module-backdrop-background {
background-image: radial-gradient($ibexa-color-light 0.5px, transparent 0); // 0.5px is needed so that both on HD and Retina we have 1px
background-color: $ibexa-color-light-200;
background-position: 0 0, calculateRem(5px) calculateRem(5px);
background-position:
0 0,
calculateRem(5px) calculateRem(5px);
background-size: calculateRem(5px) calculateRem(5px);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@
color: $ibexa-color-dark;
text-decoration: underline;
font-size: $ibexa-text-font-size-medium;
transition: background $ibexa-admin-transition-duration $ibexa-admin-transition,
transition:
background $ibexa-admin-transition-duration $ibexa-admin-transition,
color $ibexa-admin-transition-duration $ibexa-admin-transition;

.ibexa-icon {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
opacity: 0;
transform: translateY(-50%) scaleX(0);
transform-origin: left;
transition: all $ibexa-admin-transition-duration $ibexa-admin-transition, transform 0s;
transition:
all $ibexa-admin-transition-duration $ibexa-admin-transition,
transform 0s;

&:focus {
outline: none;
Expand Down

0 comments on commit 108fbf6

Please sign in to comment.