projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
09978d3
)
scss/roojs-bootstrap/combobox.scss
author
Alan Knowles
<alan@roojs.com>
Thu, 24 Jan 2019 08:14:14 +0000
(16:14 +0800)
committer
Alan Knowles
<alan@roojs.com>
Thu, 24 Jan 2019 08:14:14 +0000
(16:14 +0800)
scss/roojs-bootstrap/combobox.scss
patch
|
blob
|
history
diff --git
a/scss/roojs-bootstrap/combobox.scss
b/scss/roojs-bootstrap/combobox.scss
index
cf3b723
..
41e3e2b
100644
(file)
--- a/
scss/roojs-bootstrap/combobox.scss
+++ b/
scss/roojs-bootstrap/combobox.scss
@@
-195,6
+195,7
@@
.roo-select2-container .x-combo-noedit {
cursor: pointer;
background-color: $body-bg;
.roo-select2-container .x-combo-noedit {
cursor: pointer;
background-color: $body-bg;
+ display: table-cell;
}
.roo-select2-container .x-combo-noedit[disabled] {
}
.roo-select2-container .x-combo-noedit[disabled] {
@@
-220,7
+221,7
@@
.dropdown-menu .checkbox label {
width: 100%;
}
.dropdown-menu .checkbox label {
width: 100%;
}
-
+
.roo-select2-container-multi .dropdown-menu .roo-select2-result .checkbox {
margin-top: 0px;
margin-bottom: 0px;
.roo-select2-container-multi .dropdown-menu .roo-select2-result .checkbox {
margin-top: 0px;
margin-bottom: 0px;
@@
-229,11
+230,12
@@
margin-top: 3px;
margin-bottom: 3px;
}
margin-top: 3px;
margin-bottom: 3px;
}
-
+
.roo-select2-container .input-group-addon {
padding: 6px 12px;
border: 1px solid $input-border;
border-left: 0px;
.roo-select2-container .input-group-addon {
padding: 6px 12px;
border: 1px solid $input-border;
border-left: 0px;
+ display: table-cell;
}
.roo-select2-container .roo-removable {
}
.roo-select2-container .roo-removable {
@@
-253,30
+255,7
@@
z-index: 2;
top: 5px;
}
z-index: 2;
top: 5px;
}
-
-/*
-.roo-select2-container .roo-removable.has-feedback .roo-combo-removable-btn {
- position: absolute;
- right: 40px;
- z-index: 2;
- top: 5px;
-}
-
-.roo-select2-container .roo-removable.has-feedback.input-group .roo-combo-removable-btn {
- position: absolute;
- right: 70px;
- z-index: 2;
- top: 5px;
-}
-
-
-.roo-select2-container.input-group .has-feedback .roo-combo-removable-btn {
- position: absolute;
- right: 35px;
- z-index: 2;
- top: 5px;
-}*/
-
+
.has-warning .roo-select2-container-multi {
border: 1px solid $brand-warning; //#8a6d3b;
}
.has-warning .roo-select2-container-multi {
border: 1px solid $brand-warning; //#8a6d3b;
}