projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix combo checbox label
[roojs1]
/
less
/
roojs-bootstrap
/
combobox.less
diff --git
a/less/roojs-bootstrap/combobox.less
b/less/roojs-bootstrap/combobox.less
index
04605ff
..
cf08751
100644
(file)
--- a/
less/roojs-bootstrap/combobox.less
+++ b/
less/roojs-bootstrap/combobox.less
@@
-29,7
+29,7
@@
z-index: 2;
}
.combobox-container .uneditable-input {
z-index: 2;
}
.combobox-container .uneditable-input {
- border-left-color: @gray-light
er
;
+ border-left-color: @gray-light;
}
.combobox-container .add-on {
float: left;
}
.combobox-container .add-on {
float: left;
@@
-42,8
+42,8
@@
font-weight: normal;
color: @gray-light;
text-align: center;
font-weight: normal;
color: @gray-light;
text-align: center;
- text-shadow: 0 1px 0 @
white
;
- background-color: @
gray-lighter
;
+ text-shadow: 0 1px 0 @
body-bg
;
+ background-color: @
well-bg
;
border: 1px solid @gray-light;
-webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px;
border: 1px solid @gray-light;
-webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px;
@@
-51,8
+51,8
@@
}
.combobox-container .active {
}
.combobox-container .active {
- background-color: @brand-primary;
- color: @
white
;
+ background-color: @brand-primary;
//#3875d7;
+ color: @
body-bg
;
}
.combobox-container input,
.combobox-container .uneditable-input {
}
.combobox-container input,
.combobox-container .uneditable-input {
@@
-63,7
+63,7
@@
}
.combobox-container .uneditable-input {
border-left-color: @gray-lighter;
}
.combobox-container .uneditable-input {
border-left-color: @gray-lighter;
- border-right-color: @gray-light
er
;
+ border-right-color: @gray-light;
}
.combobox-container .add-on {
margin-right: 0;
}
.combobox-container .add-on {
margin-right: 0;
@@
-132,25
+132,25
@@
overflow-y: auto;
}
.control-group.error .combobox-container .add-on {
overflow-y: auto;
}
.control-group.error .combobox-container .add-on {
- color: @brand-danger;
- border-color: @brand-danger;
+ color: @brand-danger;
//#B94A48;
+ border-color: @brand-danger;
//#B94A48;
}
.control-group.error .combobox-container .caret {
}
.control-group.error .combobox-container .caret {
- border-top-color: @brand-danger;
+ border-top-color: @brand-danger;
//#B94A48;
}
.control-group.warning .combobox-container .add-on {
}
.control-group.warning .combobox-container .add-on {
- color: @brand-warning;
- border-color: @brand-warning;
+ color: @brand-warning;
//#C09853;
+ border-color: @brand-warning;
//#C09853;
}
.control-group.warning .combobox-container .caret {
}
.control-group.warning .combobox-container .caret {
- border-top-color: @brand-warning;
+ border-top-color: @brand-warning;
//#C09853;
}
.control-group.success .combobox-container .add-on {
}
.control-group.success .combobox-container .add-on {
- color: @brand-success;
- border-color: @brand-success;
+ color: @brand-success;
//#468847;
+ border-color: @brand-success;
//#468847;
}
.control-group.success .combobox-container .caret {
}
.control-group.success .combobox-container .caret {
- border-top-color: @brand-success;
+ border-top-color: @brand-success;
//#468847;
}
.btn .combobox-clear [class^="icon-"] {
line-height: 1.4em;
}
.btn .combobox-clear [class^="icon-"] {
line-height: 1.4em;
@@
-158,22
+158,22
@@
.combobox-container .dropdown-menu {
border-radius: 0;
padding: 0;
.combobox-container .dropdown-menu {
border-radius: 0;
padding: 0;
- border: 1px solid #66afe9;
+ border: 1px solid
@brand-primary; //
#66afe9;
border-top: none;
}
.roo-select2-container .dropdown-menu {
border-top: none;
}
.roo-select2-container .dropdown-menu {
- border: 1px solid #5897fb;
+ border: 1px solid
@brand-primary; //
#5897fb;
}
.dropdown-menu .active {
}
.dropdown-menu .active {
- background: #3875d7;
- color:
#fff
;
+ background:
@brand-primary; //
#3875d7;
+ color:
@body-bg
;
}
.dropdown-menu .active label{
}
.dropdown-menu .active label{
- color:
#fff
;
+ color:
@body-bg
;
}
.dropdown-menu .roo-select2-result {
}
.dropdown-menu .roo-select2-result {
@@
-194,12
+194,12
@@
}
.roo-select2-container .x-combo-noedit {
cursor: pointer;
}
.roo-select2-container .x-combo-noedit {
cursor: pointer;
- background-color:
#fff
;
+ background-color:
@body-bg
;
}
.roo-select2-container .x-combo-noedit[disabled] {
cursor: not-allowed;
}
.roo-select2-container .x-combo-noedit[disabled] {
cursor: not-allowed;
- background-color:
#eee
;
+ background-color:
@gray-lighter
;
}
}
@@
-228,11
+228,16
@@
.dropdown-menu .roo-select2-result .checkbox {
margin-top: 3px;
margin-bottom: 3px;
.dropdown-menu .roo-select2-result .checkbox {
margin-top: 3px;
margin-bottom: 3px;
+ margin-left: 20px;
+}
+
+.roo-select2-result .checkbox label {
+ margin-left: 5px;
}
.roo-select2-container .input-group-addon {
padding: 6px 12px;
}
.roo-select2-container .input-group-addon {
padding: 6px 12px;
- border: 1px solid
#ccc
;
+ border: 1px solid
@input-border
;
border-left: 0px;
}
border-left: 0px;
}
@@
-278,7
+283,7
@@
}*/
.has-warning .roo-select2-container-multi {
}*/
.has-warning .roo-select2-container-multi {
- border: 1px solid #8a6d3b;
+ border: 1px solid
@brand-warning; //
#8a6d3b;
}
.roo-ios-select {
}
.roo-ios-select {