From 324f6ca562d75cf925ae272131b281be6a2f8400 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Dec 2013 14:29:33 -0800 Subject: [PATCH] buttons should be more mixin friendly --- dist/css/bootstrap.css.map | Bin 236977 -> 236997 bytes less/buttons.less | 44 ++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dist/css/bootstrap.css.map b/dist/css/bootstrap.css.map index 8aacfe2aa0c3e002d06300871a26386c739c1de5..d30b028959599cd1a521de377f0a44c47d4892c6 100644 GIT binary patch delta 272 zcmdnEoA2muz6}8(yk-6YI-ZV>{?@Jm;X#vQLlpSJoIwJ<){c(Oemb6$|DBiA2eRE= zAj*KEU=4xRt{_&ZqoX5;<)~Ba1ZD>0ySYt1*d!w0pXCNt7z{Ef1ZdFt1WB=6h$4{s ze5m@&0Jmnf(CuoWj1QhpH;iT$o-QrSC^FqZnOS3cs5O)5^q6R78RpuUyy*tvjFQt0 zCo+joukT~xot|LH$UeP3oRM?-MPp{M>3^3n$*?LYfE0FyGultLlwp#Z9&N*9%deoI mmtT;WoLN$-p=V~QIsL{?@Jmp&^rFLlnY7TtNc9){c(OFeyjp5S?U4M@MT{ zM`uT!LMIRtDDMtd=?_vF0MZi(k`L1fg{v$Et8@*>b#t72ut~(;Kf?`dWH3le2uMpP z#F{`y$8eB7Z;%NkPCB^|jUe0dp=P89I5w+=ZdVIseDIXBHYP77PcNw?Z~8eQCIx8_ z%PJ$kEVW1nB5akGpIln3P#u#u-OHLuVfwUOW(hsGCac8clFYJHs9HS;52RQ@A-}XF zCo?bAO2J_I21_QH>5q+>C8oczW|DD)>()!jEKW?yNlk(3kB0GMfdXlnsW~adsU-+O z1(4&wE;*>oBsD$FhRIe%FTWr$IkTivL(j}q(;8&2UQ&LAZgECpN`ARUUVdJxrgi%T N8>a0SY?!|$001_3j8Fgo diff --git a/less/buttons.less b/less/buttons.less index 68664ea5c..b728f332c 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -18,32 +18,32 @@ white-space: nowrap; .button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @border-radius-base); .user-select(none); -} -.btn:focus { - .tab-focus(); -} + &:focus { + .tab-focus(); + } -.btn:hover, -.btn:focus { - color: @btn-default-color; - text-decoration: none; -} + &:hover, + &:focus { + color: @btn-default-color; + text-decoration: none; + } -.btn:active, -.btn.active { - outline: 0; - background-image: none; - .box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); -} + &:active, + &.active { + outline: 0; + background-image: none; + .box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); + } -.btn.disabled, -.btn[disabled], -fieldset[disabled] .btn { - cursor: not-allowed; - pointer-events: none; // Future-proof disabling of clicks - .opacity(.65); - .box-shadow(none); + &.disabled, + &[disabled], + fieldset[disabled] & { + cursor: not-allowed; + pointer-events: none; // Future-proof disabling of clicks + .opacity(.65); + .box-shadow(none); + } }