From fc01f94387c3c41ca0d7c6d4ad8ed1d6678abfdd Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Fri, 21 Nov 2014 15:30:59 -0500 Subject: [PATCH] Globalizing and creating two variants of Carrot.org icon; tidying up some CSS --- .../_global/img/icons/carrot-icon--black.png | Bin 0 -> 1538 bytes .../_global/img/icons/carrot-icon--white.png | Bin 0 -> 1605 bytes themes/baggy/css/main.css | 76 +++++++++++------- themes/baggy/view.twig | 4 +- themes/default/css/style-default.css | 5 +- themes/default/img/default/carrot.png | Bin 718 -> 0 bytes 6 files changed, 52 insertions(+), 33 deletions(-) create mode 100644 themes/_global/img/icons/carrot-icon--black.png create mode 100644 themes/_global/img/icons/carrot-icon--white.png delete mode 100644 themes/default/img/default/carrot.png diff --git a/themes/_global/img/icons/carrot-icon--black.png b/themes/_global/img/icons/carrot-icon--black.png new file mode 100644 index 0000000000000000000000000000000000000000..6da7925b5d58526ff9aaaeb93596de846371bcd2 GIT binary patch literal 1538 zcmaJ>eM}Q)7(e-Nn~Y_cfxw)cM?@sHch^tuq;qYr*fNV1sv?TzXb-qSd+qh01(ykJ zqZ6krPJ}-Y*)l&CWiA=w)DW18;6&Lng^3?)baO&hG0|0xPIg6L`@?y;yZ3#c{C>~# zdp`1RHDoV~o|QNY0Dx$nmdN2(F!a4Tlm9!bs~_-70;kF2a+zYzMY0s2v@k^!sI!tK zR1QU2svPI23;+m+Xk#9ir(cen8LN;CVT5k0oo53;#!|PPG?!5vSVWc3HU%_xvI_!f zivn6B)gyYlnkuEW)hv};oozH%mzgmOwDest!;SL}tQ1FrZfm*CiMtihgkPNBhs-bp zPC&Ra1@v50p56ee8I}U2LaD%vh)__D2~nw3E*C8ZMF=W^5fnzn0u;j~5*$Im$p_-2 zv6f;yhsd0a#h(;VDaYAy7spQm88>-E!)ZO+L;@g;-Zq#Z_u2yC^6@|r+9xg6?W881XT zja7CE&Y_%41#9N}QJg$Q=4Q7NLc<;BpD7Mr4_Y3?oD+ zs*xx)sG5I81g24`h;(F%tFt*d(q^Wnxb!qvllf9Eu4XBcV^|}@luvcfP|9$Ovy`!e z>RcI^x`wt{7?*QVsI-$xDVDCJESW501t)5Q(=UjxmZK86RD-INVhOKZjEUul21(ao zm;{rl2sJdxwY(tjNv`OBxiBvV4mI{ajh-^`(-YcGk1cBiPdm$x^;t=OA^?O{ z>IkLLJ$$B7uQjfGtJfs{p{A9J`?9Isz^O*moHXtBDJV8y>(6{GKh>v-niI&k$b8s9rk9@oGR4Yq^q>99!!B3Os-YtSU#~yD z3Ihyydi!P5zSCwucs1#YY=5}p#@=K81Z~mq<<*bQJX-r>QrO-ebxYZ;(f<0{IsRyE#IZ9^b%ue!m4>jJq)d(tX02;u z<0RhL;Pn}c_6Nr!?hJZTXYM)Gk*fe^FHa9dlJ>O^C=ZS2hm90A1!o>a9uIEm88zm^ zThS$Nd)uFM(+lg)dv*thK3vo=d}YWo?7-aJ+{UKSc(JH277%4ViMf$xVL9*TmlNMQgub0EGXZWcA@v^RfEs`tTWvju`R5MQ4<{qr?)qHcIuH^hc?&r7LF~{+b>%dEOrrIaN&8MN?8}^5n`n}8U ztUoHR3Jg{Z85fj)VP3cNdqu~Ac%tvCC(ZTphWM_Lxc38_zgzuRO~q%wx(Z_E9bZ_u z{gCO8RsDkrpN<-VzYn{!4s>UHyL0Sp!wKJrsXeG{yV+OZxLOta&Y^L3;q}T5edFxV e!{oq{u-AcCj3+J>c5eA8bSvvL*~HhXLeD?`CrNq$ literal 0 HcmV?d00001 diff --git a/themes/_global/img/icons/carrot-icon--white.png b/themes/_global/img/icons/carrot-icon--white.png new file mode 100644 index 0000000000000000000000000000000000000000..a70044b6f5b82e2e3cb146fdff08747ed47d6c4b GIT binary patch literal 1605 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%u1Od5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT-VtFWlg~VrW1CgG|37u|VHY&pf(~1RD?6IsxA(xEJ)Q4 zN-fSWElLK)N18HBGcfG%TLe-Fbd8luesXDUYF>$_i>(q+L@y;X#md~o(AmJu&BV;o z#mLam)x^=&&>4t~Tr6FkoLnpnV0u0Cic1pnl2c)NGZA`?@#?j5E=o--$uA1Y&(DFy zUO+~ENq%ugeu08>u$h8JcxGNoetEGbC}^QBO)bhSOHFYr%Fk5*hmBPx7W zgeO}d2cGa#^MI+n2$-yyR@-SYFfi@(ba4!+xV2}xuSck($no|5t{lG>@R(>tX=EvQ zd@2cU+gjl|b4LZo))lUeoJkiBx$Zu2#$}4x)(#CN?k2HZ9>E@?BOD^X4?S8aIxR3W z%1O}j@A7}s`98<(D_>uHzfnH_+?>zv=2#jRzl(9#e9Cel?Sr6<*E8v&rin=txa(Ak zd9)ge{_%C~GpOL`T9O>*!02)y+Q4_O08ir?i}MWE>X-h~j=j>o;(QbDvU&kVna2&4 z38uG$bB_N^|I>MBcglpLEZf2#sCG0}e(3Xlkar^YfyN2;xpip~taiXW=WZta;n`Rx8f$@-?T} z^Pe;`(hM&Z@vZUt;$!cf(06o`MCO6ZrFj z;~91bSC*|}joPyc=Dy@J zyxJxCGO=2}cK3?*T($!5Gdnu1e+vI_{q1+lYQ=XWk8H*{MwjZ?MLL|8)Lv`6{($Xk z`hzuV8NwPoH$E$tN#Or+VDa-`_gMZWh}UxG*$HF zWZl(LCs?&RLM(QcIcKzC^Oc}Ya~S%XCHfOiXzb?8-X*mB(4YT~0lVffWF2An^>ib@ z&Zb8@?Nn_fT?i zmzNn<3B_%!^;pC|`T3rLYfV`J2Twok`5?)-Ic%Ro&y+U_zmgeijrDf2=svK!z1DA6 y%fvU&&#)i7R&w^9E$h< li > a:hover, #links > li > a:focus { - background: #999; + background-color: #999; color: #000; } @@ -344,7 +344,7 @@ footer a { } .entrie { - background: #FFF; + background-color: #FFF; letter-spacing:normal; box-shadow: 0 3px 7px rgba(0,0,0,0.3); display: inline-block; @@ -391,7 +391,7 @@ footer a { width: 100%; bottom: 0; left: 0; - background: #000; + background-color: #000; -webkit-transition: all 0.5s ease; -moz-transition: all 0.5s ease; -ms-transition: all 0.5s ease; @@ -557,7 +557,7 @@ footer a { } .popup-form form { - background: #FFF; + background-color: #FFF; position: absolute; top: 0; left: 0; @@ -574,7 +574,7 @@ footer a { .closeMessage, .close-button { - background: #000; + background-color: #000; color: #FFF; font-size: 1.2em; line-height: 1.6; @@ -587,7 +587,7 @@ footer a { .closeMessage:focus, .close-button:hover, .close-button:focus { - background: #999; + background-color: #999; color: #000; } @@ -657,17 +657,18 @@ a.add-to-wallabag-link-after:after { @font-face { font-family: 'icomoon'; src:url('../fonts/icomoon.eot?-s0mcsx'); - src:url('../fonts/icomoon.eot?#iefix-s0mcsx') format('embedded-opentype'), - url('../fonts/icomoon.woff?-s0mcsx') format('woff'), - url('../fonts/icomoon.ttf?-s0mcsx') format('truetype'), - url('../fonts/icomoon.svg?-s0mcsx#icomoon') format('svg'); + src:url('../fonts/icomoon.eot?#iefix-s0mcsx') format('embedded-opentype'), + url('../fonts/icomoon.woff?-s0mcsx') format('woff'), + url('../fonts/icomoon.ttf?-s0mcsx') format('truetype'), + url('../fonts/icomoon.svg?-s0mcsx#icomoon') format('svg'); font-weight: normal; font-style: normal; } -.icon span { - position: absolute; - top: -9999px; +.icon span, +.icon-image span { + display: inline-block; + text-indent: -9999px; } [class^="icon-"]:before, [class*=" icon-"]:before { @@ -736,6 +737,23 @@ a.add-to-wallabag-link-after:after { content: "\e80d"; } + +/* .icon-image class, for image-based icons + ========================================================================== */ + +.icon-image { + background-size: 16px 16px; + background-repeat: no-repeat; + background-position: center; + padding-right: 1em !important; + padding-left: 1em !important; +} + +/* Carrot (http://carrot.org) */ +.icon-image--carrot { + background-image: url('../../_global/img/icons/carrot-icon--white.png'); +} + /* ========================================================================== Icon selected ========================================================================== */ @@ -805,7 +823,7 @@ a.add-to-wallabag-link-after:after { blockquote { border:1px solid #999; - background: #FFF; + background-color: #FFF; padding: 1em; margin: 0; } @@ -838,14 +856,14 @@ blockquote { } #article_toolbar a { - background: #000; + background-color: #000; padding: 0.3em 0.5em 0.2em; color: #FFF; text-decoration: none; } #article_toolbar a:hover, #article_toolbar a:focus { - background: #999; + background-color: #999; } .shaarli:before { @@ -868,7 +886,7 @@ blockquote { } .icon-rss { - background: #000; + background-color: #000; color: #FFF; padding: 0.2em 0.5em; } @@ -883,7 +901,7 @@ blockquote { } .list-tags .icon-rss:hover, .list-tags .icon-rss:focus { - background: #FFF; + background-color: #FFF; color: #000; text-decoration: none; } @@ -944,7 +962,7 @@ pre code { margin-left: 0; } body > header { - background: #333; + background-color: #333; position: fixed; top: 0; width: 100%; @@ -990,11 +1008,11 @@ pre code { width: 2.5em; height: 2.5em; cursor: pointer; - background: #999; + background-color: #999; font-size: 1.2em; } .desktopHide:hover, .desktopHide:focus { - background: #FFF; + background-color: #FFF; } #links { display: none; diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index 9182ee7..ee96403 100755 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig @@ -16,7 +16,7 @@ {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %} {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
  • {% trans "flattr" %}
    • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %} ({{ flattr.numFlattrs }})
    • {% endif %}{% endif %} - {% if constant('CARROT') == 1 %}
  • Carrot
    • {% endif %} + {% if constant('CARROT') == 1 %}
  • Carrot
    • {% endif %} {% if constant('SHOW_PRINTLINK') == 1 %}
  • {% trans "Print" %}
    • {% endif %}
  • EPUB
  • {% trans "Does this article appear wrong?" %}
    • @@ -96,4 +96,4 @@ }); }); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css index d00647a..6ff2aca 100755 --- a/themes/default/css/style-default.css +++ b/themes/default/css/style-default.css @@ -39,7 +39,8 @@ a.flattr span { } a.carrot span { - background-image: url('../img/default/carrot.png') + background-image: url('../../_global/img/icons/carrot-icon--black.png'); + background-size: 16px 16px; } a.email span { @@ -60,4 +61,4 @@ a.bad-display span { a.print span { background-image: url('../img/default/print.png'); -} \ No newline at end of file +} diff --git a/themes/default/img/default/carrot.png b/themes/default/img/default/carrot.png deleted file mode 100644 index 5fc1727348e5dd1981345f62150baa16e2789690..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 718 zcmV;<0x|uGP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2i^-4 z4h;}<8(q8r00K@)L_t(I%Z*aMOKNcx|D5~dfnJTe2%9qN82}Rz17Hb11ADz*3WY+FVHli9BoGRP002J~Aiv)aRaLREu|Zo~ zTQCd*vMhuCS^S2zwKXs^9v>f}X&PsuNR7I( z+uP7}9mQf%bh};g`uh5-)9GM19HQNB|J~1Cv$M18^ZEGT;DF!W-ni9jS!ZWw7BgE< zPfwGbogEGY0(Qk2{?X=W;m?hr@h*eQnk2bt{!hO_r9H7=UHxD0b_?V2}*M zu$s*#?e6XhkH;gQpPy4a9%s`urB&CSh6cr;A_Gcz;nbULle%S*}OaLCWk&nTD6 z5JK1qH0|XTMNxQve;*GI4^pXAA^>3K|4#ghKf+fVCC0i4)c^nh07*qoM6N<$f^nER AL;wH)