From e1e49cbbb24243a204703b60ad61eebfbba1a426 Mon Sep 17 00:00:00 2001 From: Brigitte Warner Date: Thu, 24 Jul 2014 20:42:09 -0400 Subject: [PATCH] update less to sass --- .../bootstrap_and_overrides.css.scssc | Bin 0 -> 7499 bytes app/assets/javascripts/application.js | 4 +-- app/assets/stylesheets/application.css | 3 ++ .../bootstrap_and_overrides.css.scss | 31 ++++++++++++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 .sass-cache/537fb40b38351f28b6bdf09386ea293e12c7399b/bootstrap_and_overrides.css.scssc create mode 100644 app/assets/stylesheets/bootstrap_and_overrides.css.scss diff --git a/.sass-cache/537fb40b38351f28b6bdf09386ea293e12c7399b/bootstrap_and_overrides.css.scssc b/.sass-cache/537fb40b38351f28b6bdf09386ea293e12c7399b/bootstrap_and_overrides.css.scssc new file mode 100644 index 0000000000000000000000000000000000000000..d8d6d9a26ebfe901005e6ac32004f6ab138a68d3 GIT binary patch literal 7499 zcmcIp3v(065ynnRmSkJT=4GBY$bfAQJ&et32e{=ZsB%?8sEE6(i|a}?l19>o)y`&j zWZ_WcCnP^7|0h2rmG0TuUCnxB1G%FLw6i=Lx^x-RbN+e6+)N*xvn4hdtuW?r#6VF6%t(J$$^|Y?gmt6xQVy3q#9#7jSM_ ze-=W%5k07m3hS!5<*f)E=?HHDB)N{qor1Mwi+(@k z5+0Xr?)4NMU0$FSr$ASnMcCPQT)tmDX#5cJAZ&C3XW&T5CoJ%I(D>eY&s#&@YcSt$ zfaP3wDcOB(Ssvs0@wUA3>$H6@7Nghxyd{4E?TWYYO< zAbd>c75WV-eAZ{Z9=N_Hg|C!av=5m(hWyo$Zgm64mvP1X!GSDbZjs(Ow&6!4v#gd3 zfE{drDtXxSKPaXU#v`9wE09~Bbovetz+&NJvWFkffVK@Gsq{FK1gB|Vg$dl}YRrL4-Or6DOA)k?TNrlKPTcw0uHz?L((U7ysIXNUc7+P<; z5tGnw?JYrXYj3Z{-gbFkqG!O5bQ8Tvw<4F_*Dj;m^e)nZZ;Bb;6u}!85(RN}Igtjw zq4#J_J0p)Wb%se-u&+mI7P=O6{%#=t%DhbTF$4Vl{q;2(r_-y0-$sDjeDu$=MlGWfTeL=0DN zV*f(@F9Ybj=SLF}^Z+t%MELcCbX?1NBZ3igoxk%QoT3X*Pq42ICjm+a^eNdR=ELuz z9r`WG3hdo^qde2h;)vi7*(l4`j8HH#e`r36KyIRdhA$cd_yHde~kHW~7O-@{J<^6;T(djz_Y8BGb9IIc@PAqjGh{tVe6SAc*= z0uLe}sFRi;eG$Ok37K#u7eNEM3E_@4T+|b|p!anip2esN8fDj|KKMhs8x@?LGiJGiWK5dr;nk}&5o33CpDb2SMyuAUm9o(^*!Z5n2icFK_TDMNmO zj&hbIw@7pDUMWH^zaZ!}?EHcHy6)}u+1N_16E7s3g$Cy2H23eQ%?BRv404|%_tcOp*-Oex7vQ!S8Bv5VC^eN1$mm<93Y7pDJ~baJTA->1~4X#0{B~#1pu>b(*MODQ+v(q&&aWH=BmS z&yFb^RSm|ofc@KTeVO||JyoT zjbtF)+8_{PzYe24XovA6j$Y_vIVUl0g05*|;HqYLB|b;v#3<>+02ql8Yt4|YWK^7+ zNoJ%Q%Sx?ugFWAxI}PVk-SAYpf_Vc(YWf8taB)0SD~a7-CM#{sQP%AoS)T>lTCdYA z+e+{PrQOSs2A~l0!r5MegypVqMWAfU;Na3m=gA)1d#t{trBKbJRuu%UB;s*((Fl4v zRm!7GOTnZ}O5syl3b!JGp&f-8JWgw1z&!t--{F5zkdLHX zif4{6;k5{kWNG>i=a3e`p(8DSDwoTR#);##@-1^jW<_^-HTBxs{JcR5j!-tYX~Zfs zy7?M@>0k!APFwIA@bA~1W`KKsqiF_k{=cUg%iXj(8&^0=xMqrEcsOm{`m nUgJ2NbrdTm3fL^7L7Rf;X~diQ@JZca04h$Oxfc?&jiBOxh-`@N literal 0 HcmV?d00001 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 46f1298..b704c6d 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,8 +12,8 @@ // //= require jquery //= require jquery_ujs -//= require twitter/bootstrap/bootstrap-button -//= require twitter/bootstrap/bootstrap-modal +// require twitter/bootstrap/bootstrap-button +// require twitter/bootstrap/bootstrap-modal //= require utils //= require bootstrap-datepicker //= require bootstrap-timepicker diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 6b66844..221a607 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -10,6 +10,9 @@ * *= require_self *= require datepicker + *= require bootstrap + *= require bootstrap-responsive *= require bootstrap-timepicker *= require bootstrap_and_overrides + *= require bootstrap-fontawesome */ diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.scss b/app/assets/stylesheets/bootstrap_and_overrides.css.scss new file mode 100644 index 0000000..891367e --- /dev/null +++ b/app/assets/stylesheets/bootstrap_and_overrides.css.scss @@ -0,0 +1,31 @@ +body { + padding-top: 60px; + padding-left: 20px; +} + + +// Set the correct sprite paths +$iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png'); +$iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png'); + +// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines) +// Note: If you use asset_path() here, your compiled boostrap_and_overrides.css will not +// have the proper paths. So for now we use the absolute path. +$fontAwesomeEotPath: '/assets/fontawesome-webfont.eot'; +$fontAwesomeWoffPath: '/assets/fontawesome-webfont.woff'; +$fontAwesomeTtfPath: '/assets/fontawesome-webfont.ttf'; +$fontAwesomeSvgPath: '/assets/fontawesome-webfont.svg'; + +[data-toggle="buttons-radio"] > .btn > input[type="radio"], +[data-toggle="buttons"] > .btn > input[type="checkbox"] { + display: none; +} + +.inline-block { + display: inline-block; +} + +.control-group.error .btn-group > .btn { + color: #b94a48; + border-color: #b94a48; +}