From a6061ce555196ff989148c5f2e3dbc1f9da5453b Mon Sep 17 00:00:00 2001
From: Matt Toback <matt@raintank.io>
Date: Thu, 11 Feb 2016 15:29:57 -0500
Subject: [PATCH] Checkboxes working

---
 .../app/features/datasources/partials/edit.html |   5 ++---
 public/img/checkbox_white.png                   | Bin 960 -> 465 bytes
 public/less/dropdown.less                       |   3 ++-
 public/less/forms.less                          |   9 ++++-----
 public/less/normform.less                       |   1 +
 public/less/variables.dark.less                 |   2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/public/app/features/datasources/partials/edit.html b/public/app/features/datasources/partials/edit.html
index 6113ebed18b..7ae595a30b6 100644
--- a/public/app/features/datasources/partials/edit.html
+++ b/public/app/features/datasources/partials/edit.html
@@ -31,8 +31,7 @@
 					</li>
 					<li class="norm-form-item trans">
 						<input class="cr1" id="current.isDefault" type="checkbox" ng-model="current.isDefault" ng-checked="current.isDefault">
-						<label for="current.isDefault" class="cr1"></label>
-						Default
+						<label for="current.isDefault" class="cr1">Default</label>
 					</li>
 				</ul>
 				<div class="clearfix"></div>
@@ -43,7 +42,7 @@
 						Type
 					</li>
 					<li>
-						<select class="input-xlarge norm-form-input norm-form-auto" ng-model="current.type" ng-options="k as v.name for (k, v) in types" ng-change="typeChanged()"></select>
+						<select class="input-xlarge norm-form-input norm-form-auto norm-form-input-boxbox" ng-model="current.type" ng-options="k as v.name for (k, v) in types" ng-change="typeChanged()"></select>
 					</li>
 				</ul>
 				<div class="clearfix"></div>
diff --git a/public/img/checkbox_white.png b/public/img/checkbox_white.png
index dbff6d5ab64c0583e46c7f27b3259d48358cbf7e..877f6ddcc2cff8770c674291f7d4be717e8ac460 100644
GIT binary patch
delta 452
zcmV;#0XzP{2hjtN7k?-S1^@s69PPoP0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+
zQe|Oed2z{QJOBUzb4f%&RCwBAWB`JhGiUY#sR9P_!G!em^g>3cK@LD12o!igswqJI
z3P5T-5N~9Hx`-@;Kme*Q5Qy_ZCjV!k0sxuA#6U$bYS^e@qko1`*Dz=?LP;hE>Hh#S
zYyzk}BG*8q@@yg_RG<M|9x*TokYOIEJX;7X*BTfGEdYCyZQ~V6y!inXUcdZx8W^Dl
z)l<P?jUdDRQ^}VfsF`R520lCGDhV^JHj`rzU}Z)TXCc*~Ifl{<v9gdzzXUY2`Q|Iq
z4FkDiwV5n~oqsSln1Au(4~EJ2-jeQ3eSQvxT~-QkgBCyjz~FZ50mFyie{mZI()7|(
z1MC%agFrM0fLxPu{wan*7~TZg4Dt>rOdfvw&G6vcFBF48hJaj!Gdm$CT984=u7IaT
zpesU8KV~@e<}2|@1EdK(EI<Jb5+h^~)(Aj05M~gFCOxXuz?C=UxmdyBMwJ{uszEfV
uohDGptO>A^mXfABDB&#tmb8Tc0R{kT#+^q3Ek;cM0000<MNUMnLSTZmb+o_$

delta 951
zcmV;o14#VQ1HcE67k?xO1^@s6YcB!W00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru-U%KDD=BEZ=Ar-q02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{00SsVL_t(Y$L*FuY!p=(fWP;@X@47b35f^0ZA{qRHrQHR
zHO7laJ&DF+J&LEM8zO~G7D^U8G&CjJ7>zLvoX|AouqW?wffF$iLIqN^cDJcr7Q}9=
zCC={5dmM(=-R<tO2;TfBZw@p6`)1zz=Y4PB8HNHnKmX#ZPr!bp9sNQ(oqW&#4b=J6
zk&h>U@-}Sd+<&=Gdm}yRSTqWv5Tqr@V8B>%`8<W<ozIdZBgeMxNqATIP%IinMB`|U
zXhAn=q9w=?O)MHEyeoXD`a#axdMSh`L@SgMP{G)nhE<3*7!+&krBDqFcr>(tA}vq~
zFv<qN2GikGC#p6p)-2>%ej5M7o&shcwZ}!PJSRvnL4VP$!YJFc{I=>8^r?eIx+7R)
zF<3+!u&U)-fyMY1Yb=rONbN8aiNu3kK94azp6_FPgWseX-vl|vCzsE!CK8Fonm0Rn
zdg}ejQztH7pZ|$s@lIP49f|btO5$ZQ6H^CjR>$!0utV3LH&Ofr%CuJp>tQM2Zj`dw
ztmVImr++f7Z@ur*N00tcZQ3)vk)GpEYT6&KUM1Aq%j)fgZ}7aCR4R4F*&PaxY?)Sc
zAfi^^nV|S3x5R}Tw-|cw1MaQ;dGL*Ut4vQ%Uz0ydrRS<mt3<VIl}d%LFI^@!mf>b@
z9rOCze80AF5T`3CjZE9@sJLa0&0ZijmLXTz1b?6~f0GYidlm2R&GXX8w8rkNw(Gj2
zXXk1_<>f_^&V5$%OQYlC<0Wa-sUm{wy6u6M^P{Q5htKX%P}wb$o}J^{=l7DHox^qA
zmZ0Lw3R|F>4aM_4j?A28-^nw~FP4anWk`QH3D6KU5Q|b=S!ujGX{{N3_W(0juG6`<
zpMP9olh{}WU<YV09!Hckm!m>46pxd1?o(b~+=kSHhWh&HaGb}RR(EKI`ub~t^&s7$
zo0>rWF|7r=6Ic&=V$*6Z494RmmzDq+jK|Shu*SADt-5h*Ve{wP3!z2}ee3C}>RR<L
z)xH-89_)W<AY5(QcP3Arxb!bf`+H_$>M*T((+XXC`cQO(>TFMgwv6R2?#8d#Y<7F{
Z9s;J(u!2VmmCyhH002ovPDHLkV1f+t#MS@+

diff --git a/public/less/dropdown.less b/public/less/dropdown.less
index 40d8b53fa86..1497c255432 100644
--- a/public/less/dropdown.less
+++ b/public/less/dropdown.less
@@ -15,6 +15,7 @@
   padding: 0 12px 0 6px;
   border: @grafanaPanelBorder;
   background-color: @grafanaSelectBackground;
+  background-color: red;
   overflow: hidden;
   vertical-align: top;
   -webkit-border-radius: 3px;
@@ -39,7 +40,7 @@
   text-indent: .01px;
   text-overflow: '';
   -webkit-appearance: none;
-  -moz-appearance: menulist-text; // was set to "window" and caused odd display on windos and linux.
+  -moz-appearance: menulist-text; // was set to "window" and caused odd display on windows and linux.
   appearance: none;
 }
 
diff --git a/public/less/forms.less b/public/less/forms.less
index 3afe3e02ab5..61693f63ece 100644
--- a/public/less/forms.less
+++ b/public/less/forms.less
@@ -18,20 +18,19 @@ input[type="checkbox"].cr1 {
 
 label.cr1 {
   display: inline-block;
-  height: 18px;
+  height: 19px;
   position: relative;
-  top: -2px;
   clear: none;
   text-indent: 2px;
   margin: 0 0 0px 0;
-  padding: 0 0 0 23px;
-  vertical-align:middle;
+  padding: 0 0 0 20px;
+  vertical-align: top;
   background: url(@checkboxImageUrl) left top no-repeat;
   cursor:pointer;
 }
 
 input[type="checkbox"]:checked+label {
-  background: url(@checkboxImageUrl) 0px -18px no-repeat;
+  background: url(@checkboxImageUrl) 0px -21px no-repeat;
 }
 
 .gf-form {
diff --git a/public/less/normform.less b/public/less/normform.less
index 496679fd5b0..2aba22c9e7f 100644
--- a/public/less/normform.less
+++ b/public/less/normform.less
@@ -17,6 +17,7 @@
     display: inline;
     padding-right: 4px;
     margin-bottom: 0;
+    margin-left: 5px;
   }
 }
 
diff --git a/public/less/variables.dark.less b/public/less/variables.dark.less
index 715aa4f2660..e1a81829870 100644
--- a/public/less/variables.dark.less
+++ b/public/less/variables.dark.less
@@ -307,7 +307,7 @@
 @popoverArrowOuterColor:  rgba(0,0,0,.25);
 
 // images
-@checkboxImageUrl: '../img/checkbox.png';
+@checkboxImageUrl: '../img/checkbox_white.png';
 
 // GRID
 // --------------------------------------------------