summaryrefslogtreecommitdiffstats
path: root/core/css
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2021-03-09 20:31:57 +0100
committerGitHub <noreply@github.com>2021-03-09 20:31:57 +0100
commit2f70397b03ce422fdb3b6fedb1a2b8409166650e (patch)
treea0750873fd211f2b958ad98bf9d4d285a6d4210b /core/css
parent5063745cace4a7ccf219a23eb1b7717d06406707 (diff)
parent8691084f17c38e1267d46de8d9942b8443c692b5 (diff)
downloadnextcloud-server-2f70397b03ce422fdb3b6fedb1a2b8409166650e.tar.gz
nextcloud-server-2f70397b03ce422fdb3b6fedb1a2b8409166650e.zip
Merge pull request #25721 from nextcloud/do-not-target-vue-buttons
Do not target vue buttons with server rules
Diffstat (limited to 'core/css')
-rw-r--r--core/css/inputs.scss16
1 files changed, 8 insertions, 8 deletions
diff --git a/core/css/inputs.scss b/core/css/inputs.scss
index 3ae0c3a270e..64a46e14ba1 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,
+button:not(.vue),
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, .button,
+button:not(.vue), .button:not(.vue),
input:not([type='range']),
textarea,
div[contenteditable=true],
@@ -168,8 +168,8 @@ input {
/* 'Click' inputs */
select,
-button, .button,
-input[type='button'],
+button:not(.vue), .button:not(.vue),
+input[type='button']:not(.vue),
input[type='submit'],
input[type='reset'] {
padding: 6px 16px;
@@ -184,7 +184,7 @@ input[type='reset'] {
}
}
select,
-button, .button {
+button:not(.vue), .button:not(.vue) {
* {
cursor: pointer;
}
@@ -197,8 +197,8 @@ button, .button {
}
/* Buttons */
-button, .button,
-input[type='button'],
+button:not(.vue), .button:not(.vue),
+input[type='button']:not(.vue),
input[type='submit'],
input[type='reset'] {
font-weight: bold;
@@ -215,7 +215,7 @@ input[type='reset'] {
color: #fff !important;
}
}
-button, .button {
+button:not(.vue), .button:not(.vue) {
> span {
/* icon position inside buttons */
&[class^='icon-'],