summaryrefslogtreecommitdiffstats
path: root/core/css
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-01-09 20:16:05 +0100
committerGitHub <noreply@github.com>2019-01-09 20:16:05 +0100
commit011aab52ff3c64dcf650ac8aa5c34665b70cc75a (patch)
treecf6f7662197d78d109cc6e9dd482cd11afeed658 /core/css
parent62b4f961124f8865508c29f38d7a9429ae47f700 (diff)
parent1728075946ded49e66867ea020243b735607a655 (diff)
downloadnextcloud-server-011aab52ff3c64dcf650ac8aa5c34665b70cc75a.tar.gz
nextcloud-server-011aab52ff3c64dcf650ac8aa5c34665b70cc75a.zip
Merge pull request #13156 from nextcloud/enhancement/npmize
Use npm for js depdencies, bundle with webpack
Diffstat (limited to 'core/css')
-rw-r--r--core/css/inputs.scss9
1 files changed, 5 insertions, 4 deletions
diff --git a/core/css/inputs.scss b/core/css/inputs.scss
index 57355967514..96c53d6e9b0 100644
--- a/core/css/inputs.scss
+++ b/core/css/inputs.scss
@@ -40,6 +40,7 @@ div[contenteditable=false] {
/* Default global values */
+div.select2-drop .select2-search input, // TODO: REMOVE WHEN DROPPING SELECT2
select,
button, .button,
input:not([type='range']),
@@ -414,7 +415,7 @@ input {
}
/* Select2 overriding. Merged to core with vendor stylesheet */
-.select2-drop {
+div.select2-drop {
margin-top: -2px;
background-color: var(--color-main-background);
&.select2-drop-active {
@@ -473,7 +474,7 @@ input {
cursor: pointer;
}
}
-.select2-container-multi {
+div.select2-container-multi {
.select2-choices,
&.select2-container-active .select2-choices {
box-shadow: none;
@@ -511,7 +512,7 @@ input {
}
}
}
-.select2-container {
+div.select2-container {
margin: 3px 3px 3px 0;
&.select2-container-multi .select2-choices {
display: flex;
@@ -520,7 +521,7 @@ input {
float: none;
}
}
- .select2-choice {
+ a.select2-choice {
box-shadow: none;
white-space: nowrap;
text-overflow: ellipsis;