From a6061ce555196ff989148c5f2e3dbc1f9da5453b Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Thu, 11 Feb 2016 15:29:57 -0500 Subject: [PATCH 1/2] 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 @@
  • - - Default +
    • @@ -43,7 +42,7 @@ Type
  • - +
    • 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_RGrOdfvw&G6vcFBF48hJaj!Gdm$CT984=u7IaT zpesU8KV~@e<}2|@1EdK(EIA^mXfABDB&#tmb8Tc0R{kT#+^q3Ek;cM0000eSad^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(=-RU@-}Sd+<&=Gdm}yRSTqWv5Tqr@V8B>%`8(tA}vq~ zFv%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%Uz0ydrRSb@ 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{}WU46pxd1?o(b~+=kSHhWh&HaGb}RR(EKI`ub~t^&s7$ zo0>rWF|7r=6Ic&=V$*6Z494RmmzDq+jK|Shu*SADt-5h*Ve{wP3!z2}ee3C}>RRM*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 // -------------------------------------------------- From 692878b0c0943d581e522c8af903fd3fa60b2465 Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Thu, 11 Feb 2016 15:46:37 -0500 Subject: [PATCH 2/2] Checkbox fixes for light and dark themes, ready to hand over to trent for new images --- .../features/datasources/partials/edit.html | 2 +- public/img/checkbox.png | Bin 1461 -> 465 bytes public/img/checkbox_white.png | Bin 465 -> 960 bytes public/less/variables.dark.less | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/features/datasources/partials/edit.html b/public/app/features/datasources/partials/edit.html index 7ae595a30b6..27476f684c8 100644 --- a/public/app/features/datasources/partials/edit.html +++ b/public/app/features/datasources/partials/edit.html @@ -42,7 +42,7 @@ Type
  • - +
    • diff --git a/public/img/checkbox.png b/public/img/checkbox.png index a1256ec8b95ec93a31883140e5afafb09f4458d6..877f6ddcc2cff8770c674291f7d4be717e8ac460 100644 GIT binary patch delta 452 zcmV;#0XzP+3(*6R7k?-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_RGrOdfvw&G6vcFBF48hJaj!Gdm$CT984=u7IaT zpesU8KV~@e<}2|@1EdK(EIA^mXfABDB&#tmb8Tc0R{kT#+^q3Ek;cM0000eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00kXML_t(o!|j(lY#db-K+pTmdVie|e_$OuF&IGv4nZJL zA_{~AAs}dIXh0N{>7o>XP!I(v5}-r~=%9cC(eRNdXb>IZC-KY23Rpl$Koc<>pX+kmMD#lzq$N1)9MRjJ15N8_{5W-wr?zMavtG5nv2i#PmQZGZIJNcFQ-p` z)ot42)_>UNHf!2uv&l6#?_&P+$#)3hjj5@rFHLD=`}@xOK5HG;8jP_RZFo0e?96!_Qp!_#?7r{q3Hn4I!)omCK8i z_8(XVN`E`U%(26?DvJlFr>7Tmubb-LQ!X!V2$WUJ2d7S+d~210DwPVQ{Rep9gHI^! zKR~&>xGpGED=dLJ)&NLbDTDj&VdBscemJwh#Gxadhx7uukP&(*2*6p#%r{>nUw)6j z{(mN>&s96Xm7szM+Bq7H#u}wgDf$%596L<<+nEkzC8($sNs?UIv`JE+sP!`7a*!rT z3Tv8HFE?!@NfL@$b$}~Zv}w~i>nJpv%p5xmKtTj&Jt2h6nRY30wbAsoD~!^bR@U0Q zX;qsh>y)Z>O*^{d22x$D~fWodfI^2J$hPg4BDE@rUgXl%P^5n@2O%WifS7< zu5mW4L-_)_P=L0!rM;RMWBywKTA{2)dr$0PV=E%~efOhh&(l9Vz_z`635^En!UA^d zR{X#q>B0gr%P5ZRAhuG{`FX5Xe1CWR=n9{S;O@Q`J9-0RHDTmBaGqGM5WJ_AB(!RE zVhGfWeS|EK*6NHl&oeYR$&*KqsrR0ET=G3D^q~s^Jf;b0R1}2ZJ(s}NQM92bZ)*>yJd(;4H!C6om<#e|O za;tXb+`2uj^Bx3ZjN}J=MNg{~AYDnjj%kgyh{~l0VO3AteG;zN({9-|P`flYQ*_=F zqeiK)3bN^*cH!b2F{T}prYVg^zS&pP(=J&;t^2+BFZ8tkk?|LnZwbTVIbLx90000< KMNUMnLSTZ7eSad^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(=-RU@-}Sd+<&=Gdm}yRSTqWv5Tqr@V8B>%`8(tA}vq~ zFv%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%Uz0ydrRSb@ 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{}WU46pxd1?o(b~+=kSHhWh&HaGb}RR(EKI`ub~t^&s7$ zo0>rWF|7r=6Ic&=V$*6Z494RmmzDq+jK|Shu*SADt-5h*Ve{wP3!z2}ee3C}>RRM*T((+XXC`cQO(>TFMgwv6R2?#8d#Y<7F{ Z9s;J(u!2VmmCyhH002ovPDHLkV1f+t#MS@+ 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_RGrOdfvw&G6vcFBF48hJaj!Gdm$CT984=u7IaT zpesU8KV~@e<}2|@1EdK(EIA^mXfABDB&#tmb8Tc0R{kT#+^q3Ek;cM0000