Revert to :not simple notation

Jonathan Adeline · Jonathan Adeline · commit ab8466b4b5d4 · 2024-05-01T09:50:08.000Z
diff --git a/premium/web-frontend/modules/baserow_premium/assets/scss/components/views/calendar/calendar_card.scss b/premium/web-frontend/modules/baserow_premium/assets/scss/components/views/calendar/calendar_card.scss
@@ -12,12 +12,10 @@
   }
 
   &:hover {
-    cursor: pointer;
-  }
-
-  &:not(.calendar-card--disabled, .calendar-card--dragging):hover {
-    cursor: pointer;
-    background-color: $color-neutral-100;
+    &:not(.calendar-card--disabled):not(.calendar-card--dragging) {
+      cursor: pointer;
+      background-color: $color-neutral-100;
+    }
   }
 }
 
diff --git a/premium/web-frontend/modules/baserow_premium/assets/scss/components/views/kanban.scss b/premium/web-frontend/modules/baserow_premium/assets/scss/components/views/kanban.scss
@@ -161,13 +161,12 @@
     transition: transform 0.1s ease-out 0s;
   }
 
-  &:not(
-      .kanban-view__stack-card--disabled,
-      .kanban-view__stack-card--dragging
-    ):hover {
-    cursor: pointer;
+  &:hover {
+    &:not(.kanban-view__stack-card--disabled):not(.kanban-view__stack-card--dragging) {
+      cursor: pointer;
 
-    @include elevation($elevation-medium);
+      @include elevation($elevation-medium);
+    }
   }
 }
 
diff --git a/web-frontend/.stylelintrc.js b/web-frontend/.stylelintrc.js
@@ -48,5 +48,6 @@ module.exports = {
     'color-function-notation': 'legacy',
     'scss/no-global-function-names': null,
     'alpha-value-notation': 'number',
+    'selector-not-notation': 'simple',
   },
 }
diff --git a/web-frontend/modules/core/assets/scss/components/button.scss b/web-frontend/modules/core/assets/scss/components/button.scss
@@ -28,7 +28,7 @@
     text-decoration: none;
   }
 
-  &:active:not(.button--loading, [disabled]) {
+  &:active:not(.button--loading):not([disabled]) {
     box-shadow: none !important;
   }
 
diff --git a/web-frontend/modules/core/assets/scss/components/button_floating.scss b/web-frontend/modules/core/assets/scss/components/button_floating.scss
@@ -14,13 +14,13 @@
   @include rounded($rounded-3xl);
   @include elevation($elevation-low);
 
-  &:hover:not(.button-floating--loading, [disabled]) {
+  &:hover:not(.button-floating--loading):not([disabled]) {
     background: $palette-neutral-25;
     color: $palette-blue-600;
     text-decoration: none;
   }
 
-  &:active:not(.button-floating--loading, [disabled]) {
+  &:active:not(.button-floating--loading):not([disabled]) {
     background: $palette-neutral-50;
     color: $palette-blue-700;
     box-shadow: none;
diff --git a/web-frontend/modules/core/assets/scss/components/button_icon.scss b/web-frontend/modules/core/assets/scss/components/button_icon.scss
@@ -15,14 +15,14 @@
   @include rounded($rounded-md);
   @include elevation($elevation-low);
 
-  &:hover:not(.button-icon--loading, [disabled]) {
+  &:hover:not(.button-icon--loading):not([disabled]) {
     background: $palette-neutral-25;
     color: $palette-blue-600;
     text-decoration: none;
   }
 
   &.active,
-  &:active:not(.button-icon--loading, [disabled]) {
+  &:active:not(.button-icon--loading):not([disabled]) {
     background: $palette-neutral-50;
     color: $palette-blue-700;
     box-shadow: none !important;
diff --git a/web-frontend/modules/core/assets/scss/components/button_text.scss b/web-frontend/modules/core/assets/scss/components/button_text.scss
@@ -18,9 +18,8 @@
     color: $palette-neutral-500;
   }
 
-  &:hover:not(.button-text--loading, [disabled]) {
+  &:hover:not(.button-text--loading):not([disabled]) {
     color: $palette-neutral-1300;
-    text-decoration: none;
   }
 
   &[disabled]:not(.button-text--loading) {
@@ -71,11 +70,11 @@
     color: $palette-neutral-500;
   }
 
-  .button-text:hover:not(.button-text--loading, [disabled]) & {
+  .button-text:hover:not(.button-text--loading):not([disabled]) & {
     color: $palette-neutral-1300;
   }
 
-  .button-text:active:not(.button-text--loading, [disabled]) & {
+  .button-text:active:not(.button-text--loading):not([disabled]) & {
     color: $palette-neutral-700;
   }
 }
diff --git a/web-frontend/modules/core/assets/scss/components/choice_items.scss b/web-frontend/modules/core/assets/scss/components/choice_items.scss
@@ -49,7 +49,7 @@
   &:hover {
     text-decoration: none;
 
-    &:not(.disabled, .active) {
+    &:not(.disabled):not(.active) {
       background-color: $color-neutral-100;
       color: $color-neutral-900;
     }
diff --git a/web-frontend/modules/core/assets/scss/components/select.scss b/web-frontend/modules/core/assets/scss/components/select.scss
@@ -242,7 +242,7 @@
     color: $palette-neutral-1200;
   }
 
-  :not(.select__item--loading, .select__item--no-options):hover > & {
+  :not(.select__item--loading):not(.select__item--no-options):hover > & {
     display: block;
   }
 }
diff --git a/web-frontend/modules/core/assets/scss/components/select_row_modal.scss b/web-frontend/modules/core/assets/scss/components/select_row_modal.scss
@@ -9,8 +9,7 @@
   }
 
   .simple-grid__left {
-    .simple-grid__cell:not(
-        .simple-grid__cell--first,
+    .simple-grid__cell:not(.simple-grid__cell--first):not(
         .simple-grid__cell--single
       ) {
       width: 200px;
diff --git a/web-frontend/modules/core/assets/scss/components/views/gallery.scss b/web-frontend/modules/core/assets/scss/components/views/gallery.scss
@@ -40,12 +40,12 @@
     transition: transform 0.1s ease-out 0s;
   }
 
-  &:not(
-      .card--loading,
-      .gallery-view__card--disabled,
-      .gallery-view__card--dragging
-    ):hover {
-    cursor: pointer;
-    box-shadow: 0 1px 3px 0 rgba($black, 0.32);
+  &:hover {
+    &:not(.card--loading):not(.gallery-view__card--disabled):not(
+        .gallery-view__card--dragging
+      ) {
+      cursor: pointer;
+      box-shadow: 0 1px 3px 0 rgba($black, 0.32);
+    }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,10 @@`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`&:hover {`
`15`		`- cursor: pointer;`
`16`		`- }`
`17`		`-`
`18`		`- &:not(.calendar-card--disabled, .calendar-card--dragging):hover {`
`19`		`- cursor: pointer;`
`20`		`- background-color: $color-neutral-100;`
	`15`	`+ &:not(.calendar-card--disabled):not(.calendar-card--dragging) {`
	`16`	`+ cursor: pointer;`
	`17`	`+ background-color: $color-neutral-100;`
	`18`	`+ }`
`21`	`19`	`}`
`22`	`20`	`}`
`23`	`21`
Original file line number	Diff line number	Diff line change
`@@ -161,13 +161,12 @@`
`161`	`161`	`transition: transform 0.1s ease-out 0s;`
`162`	`162`	`}`
`163`	`163`
`164`		`- &:not(`
`165`		`- .kanban-view__stack-card--disabled,`
`166`		`- .kanban-view__stack-card--dragging`
`167`		`- ):hover {`
`168`		`- cursor: pointer;`
	`164`	`+ &:hover {`
	`165`	`+ &:not(.kanban-view__stack-card--disabled):not(.kanban-view__stack-card--dragging) {`
	`166`	`+ cursor: pointer;`
`169`	`167`
`170`		`- @include elevation($elevation-medium);`
	`168`	`+ @include elevation($elevation-medium);`
	`169`	`+ }`
`171`	`170`	`}`
`172`	`171`	`}`
`173`	`172`
Original file line number	Diff line number	Diff line change
`@@ -48,5 +48,6 @@ module.exports = {`
`48`	`48`	`'color-function-notation': 'legacy',`
`49`	`49`	`'scss/no-global-function-names': null,`
`50`	`50`	`'alpha-value-notation': 'number',`
	`51`	`+ 'selector-not-notation': 'simple',`
`51`	`52`	`},`
`52`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`text-decoration: none;`
`29`	`29`	`}`
`30`	`30`
`31`		`- &:active:not(.button--loading, [disabled]) {`
	`31`	`+ &:active:not(.button--loading):not([disabled]) {`
`32`	`32`	`box-shadow: none !important;`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,8 @@`
`18`	`18`	`color: $palette-neutral-500;`
`19`	`19`	`}`
`20`	`20`
`21`		`- &:hover:not(.button-text--loading, [disabled]) {`
	`21`	`+ &:hover:not(.button-text--loading):not([disabled]) {`
`22`	`22`	`color: $palette-neutral-1300;`
`23`		`- text-decoration: none;`
`24`	`23`	`}`
`25`	`24`
`26`	`25`	`&[disabled]:not(.button-text--loading) {`
`@@ -71,11 +70,11 @@`
`71`	`70`	`color: $palette-neutral-500;`
`72`	`71`	`}`
`73`	`72`
`74`		`- .button-text:hover:not(.button-text--loading, [disabled]) & {`
	`73`	`+ .button-text:hover:not(.button-text--loading):not([disabled]) & {`
`75`	`74`	`color: $palette-neutral-1300;`
`76`	`75`	`}`
`77`	`76`
`78`		`- .button-text:active:not(.button-text--loading, [disabled]) & {`
	`77`	`+ .button-text:active:not(.button-text--loading):not([disabled]) & {`
`79`	`78`	`color: $palette-neutral-700;`
`80`	`79`	`}`
`81`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`&:hover {`
`50`	`50`	`text-decoration: none;`
`51`	`51`
`52`		`- &:not(.disabled, .active) {`
	`52`	`+ &:not(.disabled):not(.active) {`
`53`	`53`	`background-color: $color-neutral-100;`
`54`	`54`	`color: $color-neutral-900;`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@`
`242`	`242`	`color: $palette-neutral-1200;`
`243`	`243`	`}`
`244`	`244`
`245`		`- :not(.select__item--loading, .select__item--no-options):hover > & {`
	`245`	`+ :not(.select__item--loading):not(.select__item--no-options):hover > & {`
`246`	`246`	`display: block;`
`247`	`247`	`}`
`248`	`248`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,7 @@`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`.simple-grid__left {`
`12`		`- .simple-grid__cell:not(`
`13`		`- .simple-grid__cell--first,`
	`12`	`+ .simple-grid__cell:not(.simple-grid__cell--first):not(`
`14`	`13`	`.simple-grid__cell--single`
`15`	`14`	`) {`
`16`	`15`	`width: 200px;`
Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,12 @@`
`40`	`40`	`transition: transform 0.1s ease-out 0s;`
`41`	`41`	`}`
`42`	`42`
`43`		`- &:not(`
`44`		`- .card--loading,`
`45`		`- .gallery-view__card--disabled,`
`46`		`- .gallery-view__card--dragging`
`47`		`- ):hover {`
`48`		`- cursor: pointer;`
`49`		`- box-shadow: 0 1px 3px 0 rgba($black, 0.32);`
	`43`	`+ &:hover {`
	`44`	`+ &:not(.card--loading):not(.gallery-view__card--disabled):not(`
	`45`	`+ .gallery-view__card--dragging`
	`46`	`+ ) {`
	`47`	`+ cursor: pointer;`
	`48`	`+ box-shadow: 0 1px 3px 0 rgba($black, 0.32);`
	`49`	`+ }`
`50`	`50`	`}`
`51`	`51`	`}`