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 a18b1b2..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 {
-  border-left-color: @gray-lighter-80;
+  border-left-color: @gray-light;
 }
 .combobox-container .add-on {
   float: left;
@@ -40,11 +40,11 @@
   margin-right: -1px;
   padding: 4px 5px;
   font-weight: normal;
-  color: @gray-lighter-60;
+  color: @gray-light;
   text-align: center;
-  text-shadow: 0 1px 0 @white;
+  text-shadow: 0 1px 0 @body-bg;
   background-color: @well-bg;
-  border: 1px solid @gray-lighter-80;
+  border: 1px solid @gray-light;
   -webkit-border-radius: 3px 0 0 3px;
   -moz-border-radius: 3px 0 0 3px;
   border-radius: 3px 0 0 3px;
@@ -52,7 +52,7 @@
 }
 .combobox-container .active {
   background-color: @brand-primary; //#3875d7;
-  color: @white;
+  color: @body-bg;
 }
 .combobox-container input,
 .combobox-container .uneditable-input {
@@ -63,7 +63,7 @@
 }
 .combobox-container .uneditable-input {
   border-left-color: @gray-lighter;
-  border-right-color: @gray-lighter-80;
+  border-right-color: @gray-light;
 }
 .combobox-container .add-on {
   margin-right: 0;
@@ -132,11 +132,11 @@
   overflow-y: auto;
 }
 .control-group.error .combobox-container .add-on {
-  color: @danger-darker-14; //#B94A48;
-  border-color: @danger-darker-14; //#B94A48;
+  color: @brand-danger; //#B94A48;
+  border-color: @brand-danger; //#B94A48;
 }
 .control-group.error .combobox-container .caret {
-  border-top-color: @danger-darker-14; //#B94A48;
+  border-top-color: @brand-danger; //#B94A48;
 }
 .control-group.warning .combobox-container .add-on {
   color: @brand-warning; //#C09853;
@@ -146,11 +146,11 @@
   border-top-color: @brand-warning; //#C09853;
 }
 .control-group.success .combobox-container .add-on {
-  color: #468847;
-  border-color: #468847;
+  color: @brand-success; //#468847;
+  border-color: @brand-success; //#468847;
 }
 .control-group.success .combobox-container .caret {
-  border-top-color: #468847;
+  border-top-color: @brand-success; //#468847;
 }
 .btn .combobox-clear [class^="icon-"] {
   line-height: 1.4em;
@@ -158,22 +158,22 @@
 .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: 1px solid #5897fb;
+    border: 1px solid @brand-primary; //#5897fb;
 }
 
 .dropdown-menu .active {
-    background: #3875d7;
-    color: #fff;
+    background: @brand-primary; //#3875d7;
+    color: @body-bg;
 }
 
 .dropdown-menu .active label{
-    color: #fff;
+    color: @body-bg;
 }
 
 .dropdown-menu .roo-select2-result {
@@ -194,12 +194,12 @@
 }
 .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;
-   background-color: #eee;
+   background-color: @gray-lighter;
 
 }
 
@@ -228,11 +228,16 @@
 .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;
-    border: 1px solid #ccc;
+    border: 1px solid @input-border;
     border-left: 0px;
 }
 
@@ -278,7 +283,7 @@
 }*/
 
 .has-warning .roo-select2-container-multi {
-    border: 1px solid #8a6d3b;
+    border: 1px solid @brand-warning; //#8a6d3b;
 }
 
 .roo-ios-select {