Merge pull request #29194 from nextcloud/revert-29178-backport/25774/stable21

3 files changed, 8 insertions, 30 deletions

diff --git a/core/css/css-variables.scss b/core/css/css-variables.scss
index d475d6d2c66..86f80611a6c 100644
--- a/core/css/css-variables.scss
+++ b/core/css/css-variables.scss
@@ -18,23 +18,15 @@
 	--color-placeholder-dark: #{$color-placeholder-dark};
 
 	--color-primary: #{$color-primary};
-	--color-primary-hover: #{$color-primary-hover};
 	--color-primary-light: #{$color-primary-light};
-	--color-primary-light-hover: #{$color-primary-light-hover};
 	--color-primary-text: #{$color-primary-text};
-	--color-primary-light-text: #{$color-primary-light-text};
 	--color-primary-text-dark: #{$color-primary-text-dark};
 	--color-primary-element: #{$color-primary-element};
-	--color-primary-element-hover: #{$color-primary-element-hover};
 	--color-primary-element-light: #{$color-primary-element-light};
-	--color-primary-element-lighter: #{$color-primary-element-lighter};
 
 	--color-error: #{$color-error};
-	--color-error-hover: #{$color-error-hover};
 	--color-warning: #{$color-warning};
-	--color-warning-hover: #{$color-warning-hover};
 	--color-success: #{$color-success};
-	--color-success-hover: #{$color-success-hover};
 
 	--color-text-maxcontrast: #{$color-text-maxcontrast};
 	--color-text-light: #{$color-main-text};
@@ -52,8 +44,6 @@
 
 	--color-border: #{$color-border};
 	--color-border-dark: #{$color-border-dark};
-
-
 	--border-radius: #{$border-radius};
 	--border-radius-large: #{$border-radius-large};
 	--border-radius-pill: #{$border-radius-pill};
@@ -68,4 +58,3 @@
 
 	--header-height: #{$header-height};
 }
-
diff --git a/core/css/inputs.scss b/core/css/inputs.scss
index f4a2a2bfe03..4f73696d264 100644
--- a/core/css/inputs.scss
+++ b/core/css/inputs.scss
@@ -24,7 +24,7 @@ $default-height: 34px;
 
 /* Simple selector to allow easy overriding */
 select,
-button:not(.button-vue),
+button,
 input,
 textarea,
 div[contenteditable=true],
@@ -43,7 +43,7 @@ div[contenteditable=false] {
 /* Default global values */
 div.select2-drop .select2-search input, // TODO: REMOVE WHEN DROPPING SELECT2
 select,
-button:not(.button-vue), .button:not(.button-vue),
+button, .button,
 input:not([type='range']),
 textarea,
 div[contenteditable=true],
@@ -168,8 +168,8 @@ input {
 
 /* 'Click' inputs */
 select,
-button:not(.button-vue), .button:not(.button-vue),
-input[type='button']:not(.button-vue),
+button, .button,
+input[type='button'],
 input[type='submit'],
 input[type='reset'] {
 	padding: 6px 16px;
@@ -184,7 +184,7 @@ input[type='reset'] {
 	}
 }
 select,
-button:not(.button-vue), .button:not(.button-vue) {
+button, .button {
 	* {
 		cursor: pointer;
 	}
@@ -197,8 +197,8 @@ button:not(.button-vue), .button:not(.button-vue) {
 }
 
 /* Buttons */
-button:not(.button-vue), .button:not(.button-vue),
-input[type='button']:not(.button-vue),
+button, .button,
+input[type='button'],
 input[type='submit'],
 input[type='reset'] {
 	font-weight: bold;
@@ -215,7 +215,7 @@ input[type='reset'] {
 		color: #fff !important;
 	}
 }
-button:not(.button-vue), .button:not(.button-vue) {
+button, .button {
 	> span {
 		/* icon position inside buttons */
 		&[class^='icon-'],
diff --git a/core/css/variables.scss b/core/css/variables.scss
index 84646379ef1..cf7d919d72d 100644
--- a/core/css/variables.scss
+++ b/core/css/variables.scss
@@ -44,27 +44,17 @@ $color-placeholder-light: nc-darken($color-main-background, 10%) !default;
 $color-placeholder-dark: nc-darken($color-main-background, 20%) !default;
 
 $color-primary: #0082c9 !default;
-$color-primary-hover: mix($color-primary, $color-main-background, 80%) !default;
-
 $color-primary-light: mix($color-primary, $color-main-background, 10%) !default;
-$color-primary-light-text: $color-primary !default;
-$color-primary-light-hover: mix($color-primary-light, $color-main-text, 95%) !default;
-
 $color-primary-text: #ffffff !default;
 // do not use nc-darken/lighten in case of overriding because
 // primary-text is independent of color-main-text
 $color-primary-text-dark: darken($color-primary-text, 7%) !default;
 $color-primary-element: $color-primary !default;
-$color-primary-element-hover: mix($color-primary-element, $color-main-background, 80%) !default;
 $color-primary-element-light: lighten($color-primary-element, 15%) !default;
-$color-primary-element-lighter: mix($color-primary-element, $color-main-background, 15%) !default;
 
 $color-error: #e9322d;
-$color-error-hover: mix($color-error, $color-main-background, 80%) !default;
 $color-warning: #eca700;
-$color-warning-hover: mix($color-warning, $color-main-background, 80%) !default;
 $color-success: #46ba61;
-$color-success-hover: mix($color-success, $color-main-background, 80%) !default;
 // used for svg
 $color-white: #fff;
 $color-black: #000;
@@ -91,7 +81,6 @@ $color-box-shadow: transparentize(nc-darken($color-main-background, 70%), 0.5) !
 $color-border: nc-darken($color-main-background, 7%) !default;
 // darker border like inputs or very visible elements
 $color-border-dark: nc-darken($color-main-background, 14%) !default;
-
 $border-radius: 3px !default;
 $border-radius-large: 10px !default;
 // Pill-style button, value is large so big buttons also have correct roundness