From 946cb2d78c3d7acb71002b2d207f076bb5c4fc92 Mon Sep 17 00:00:00 2001 From: chenmengdi Date: Tue, 23 Apr 2013 10:29:12 +0800 Subject: [PATCH 1/3] Sync from Ark: mixins --- stylus/mixins/css3/effect.styl | 7 +++++++ stylus/mixins/css3/index.styl | 1 + stylus/mixins/polyfill.styl | 10 ++++++++++ 3 files changed, 18 insertions(+) create mode 100644 stylus/mixins/css3/effect.styl diff --git a/stylus/mixins/css3/effect.styl b/stylus/mixins/css3/effect.styl new file mode 100644 index 0000000..a961c97 --- /dev/null +++ b/stylus/mixins/css3/effect.styl @@ -0,0 +1,7 @@ +@import "vendor" + +transform-origin() + vendor('transform-origin', arguments) + +transform() + vendor('transform', arguments) diff --git a/stylus/mixins/css3/index.styl b/stylus/mixins/css3/index.styl index a92a138..f57c5b8 100644 --- a/stylus/mixins/css3/index.styl +++ b/stylus/mixins/css3/index.styl @@ -3,3 +3,4 @@ @import 'gradients' @import 'border' @import 'select' +@import 'effect' diff --git a/stylus/mixins/polyfill.styl b/stylus/mixins/polyfill.styl index 0056fbf..daafdd7 100644 --- a/stylus/mixins/polyfill.styl +++ b/stylus/mixins/polyfill.styl @@ -1,3 +1,13 @@ +clearfix() + *zoom: 1 + &:before + &:after + display: table + content: '' + line-height: 0 + &:after + clear: both + inline-block() display: inline-block *display: inline From 9d2c7eb8041818941b1f6d219d89283602f55f64 Mon Sep 17 00:00:00 2001 From: chenmengdi Date: Tue, 23 Apr 2013 10:30:04 +0800 Subject: [PATCH 2/3] Sync from Ark: rating stars --- pics/rating-stars-small.png | Bin 2196 -> 2545 bytes stylus/mod/rating.styl | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/pics/rating-stars-small.png b/pics/rating-stars-small.png index 23d66fdf8388f78913e854aefd3ebbf6b84c4dcd..81aa97cf003507eb08231b6dee093580559fddb8 100644 GIT binary patch delta 1956 zcmZ{leK^w#8^_JbIGP?WBl6NF8)~%8{OqNOk>fo>$-8WU56F`)DUJ@)FYf@fulK=V>7k)vCwyT+j1o*LDAOU*GTjx&Qdy*Ii`r&PcRTH&q9& zp`qbF%+W1C+rexKe1#Y%hXg!i#1FS zK-mSvCmiIar5t737jD(Gh;qjRbQdDtiQ)k`69`^J4+@!1p*s;=TmZ5M2~V;{9p|J5 z1W-Lw64E&=ZkmthPV2RfBl94W`adt}d)~rIP5l1>gzt&0QAg7ltVAmF`vBtiyoHWG zc!12O+5H+C@B|-E_t4{Gs!Jf-!VB5E@~DwvuUnkQ4*N|D^N2yhhFaSfq82ja4 zv<^jn)9=27GDTL@R9EVp0du{Aae4(NjC_y!X*UY{N95UESM-s(+UMeKU?LPN(H$F= zEl!QHko?*PDQ)uqbhHUYJS?cQIgOMj6FJ@3Q zKk<&+Ua2r9`!AXv(AJkxQFE+Sqtl#U_`tqVZW={1rl?0hEuj;#${z6FVT@AgZ@5Sq zhWqDss}Ssv9v2-DD<+2q!=(sUM&0dyLajb=$q(IqW2=Yhe`79owWLbMlU+c+)lPx> z%t*R==KYS#=Pq<62}(X%&bRNQPedI1?O+3PWmCuUR&@!lL)aQ3ITgvni-&J7T$moZ z^$t+$WSv$f>C^ICi&wL13~W2z!xeY2)0gFkdomLBGoKrdhcgypR!^*MdE~8#`GXI7 zN`m-8%#EH7(tTE4ml`JsSOjUn_~9&9J+O}~ZfT!2Y#J?F%CWSXUDuD=O;ObPieAVtb7!31KLWTBu`OfLMv;`P=b-MQ?JQ#~e(!yiyjGe&(@6}e?nTJ&Ga2FUA8sYH)Qu!yENchSorRU^~5A)Qt$lFuMX+(h<@Id(wZna zes9BqdGFgQ$9VQK8^#tXR;3t z(9Y!UuWaO3hgxs&wdqR_y zj4f;SZTR5m%9$m<{>lfW^@6v34ce)yc#Z{096@n5n(yirRO9&@?)A(y^Z(NFc`WA3 zDZ)3g3&Ep95U2j;XunnW{e?xVC^1V7(<0BXBgQ84z}7EAnA5F#syEnGbdUfEb0JAh z$mQM3R_(^Q8$w!8O2;R~unD)-V-?%zbFcmmi7VUIFqYgNS!~$cME*7>3KQ;)jEWk} zdKVhP3zfueySeVh%GLUM)!=!pLZMI?6UpB11^IkNKX~eOC=gkKtc=R;8d{(oId5c! zjUKoSmODFc^3TJyt4@V;@eWwRyL3qDEr ze9;g)?UuVM_y9wv2`ZI5SN;gxhzS*K>ALFdtx9=T6UHoAGRgkwr)yt^hNUvASA=+m zy(Q?IT+N_#kJ;`&S=jcZvg_(~7gplXx}1;EVC{?W-gJZ4uDYbl=9`ZhVynsR(MQc3 zy)mavcoBfxA;=yZW_W$(I{BN}o*vlYd2AECyu3U{dmp62v-*U;2SciQ41^oF8JDcY zGZC)2=#}N=H6;#VChxv0DsXQzCFYzjMANSnba#o+d?IsT`LSy}`yG+VEGE7L6Cun! z(f0fLrJlG748-RLL&++B^hyyrc0&lHBCz^=HNz~7z3;YZ2EZ~u>3#OqQjPp+AGb0B zLoi@6)(7J{Wv;-yE{I!0BaEA<|!KbxUYZ28Q z*=gbuw^H%o>SGu!qf74&D6FnqH^PgC$^MaJE}If%>W*wbw>G{+^BCszR$*S%OjBXB z94z4;h9)Kyx!-CKrRI(Od``!35t^1021&NGd@&kx9VYquo}rh338SrrSWr zv3L+Cvnj4Fg@w>%_iIsZsUyqu#jsz?g8@4(fMZ^riJl+SbLQ(=W}(# zl%UB%T=Z*|;4I!>go(+A>Ux>zwEJkpL!!jE~cf?H-p^@=!S9sRFotF@6-&n)PE6}snBks(<0XL~}O8@`> delta 1567 zcmZ{ldpOez7{^DZk;LTkG%{oE<~N(oh8>rUG)uV`(vVwjLyP0G60K6%CUw#}Pe-Gp zkf9|iVJ@pQ?Nmmo9JgeVheI6dcsiZu{MBFY`#kUG`Ml5fukW1Bd2NoqdIUrj1OhFs z<^0Jtu~b5Ecb-E6cF_P1faB08GzN>u<89#%02;6d9PH5!c4#~i<3I!e;Tl3|lOvo) zk4{L*OwEWdwN*BRJ2_$r?r29e!O7DRji#VIJUz%>I4?XNz&JX25XhzR|3eNxgapcf z)xRdJ*N-3sJR{TpU@S4Fl%cHi-(TQIbSbdGgSB6Wm)0IeO}d1$PZ_r9T=@ z(^Ws_7HJ)hkPAc*%12!(Q zVD9B=c;Ea4lW;r(I-LO?(WAS_nBq#yO{$k6Z^=%HX8fMiGpoL#2J|H)Jxn0gDO}Fx z&4c-NlBxHmfl)bR&XxCkDMCFedC}{0)ATevx7?91FKkxrm?T{Jcu?ZV6=mz+H9{Y$ z0I~(J>DS}_!H`3YV`bUR^;|m{i}bkjN%!^==$l=)N6iCGmfw0BM6GNaG5=yubtTm* zgrStrr_)aLanRy^mHYIiDSD4L#6mj~F#sts6rDJn0ON&4w>*Pxj(KJDlU8h8Z&O5) zE?#(iNngc)*IJ0e{hnN8A6t{TnZ(}RWV~n2Rz`I?{Z(Xeom*%-HzO)x1sN;f0&B4}&I(%$SU| zf)t>?FK)2L*TUj?AB&|P9TPfKyA9Y8A=6INI~3=Ffn#CB!m*|uvv$6u7*SiJrs4vx zQ4fEgCilrI4!Vsw-pFWDD6bBUGU-a;L&D3sexYP}Ny?$k_k2Z-nmHHi!NapQ>4?^M z(fEoSIWFQXJ*0D%mB>$Bl%vQTTyvg5d5=~n zh_cV%}3;7@(W9iYBK(u`t?dHAS8E%lWbY_ zvp6r0={IFl-TndA!aD=rmzAV0!e|G$-jvG3;=(-)>fV5>l4oPScLG;5w`Yy(6T+?i zawf6f-7=O#(P8mQIF}ogCV72NVg;oo4iGK;(ocJoJ~(mb>yZZY>pQU32QgG$1UFu` zH`MrI+2;t~(4EcF%%#$?_0!>eBE>CeaOrWj=^ui(RZbUB%%r@vvFZgAxKE<4L|E(+ zA5-4sTshs~<(khaRO$U(g6}c{@Kb#coPw+>!VhQDjw5OX8_PXrX;cI4(>R4@U ztRZJ_LX7kdFTJH?O=H8{(B-wMU@w++-q1kdES&fO5Q}z@L2WTPX;Pq+QPO{or4@1h!4ullA zeyY=ozL+$U{d7LZrhP_8CHkr{*^%GKJk==wf{5?V`34^>dzF>eF03$YNbjw%WGk#r zt_QPZC!P2Fb?diek4$XXhFKveg;dcel*{Du{W8x*Int=gu%YwTI{L(ky&8H{2^14c W`s>Q83rE(A0OUj2MXvKWQ1B0pr@ZX| diff --git a/stylus/mod/rating.styl b/stylus/mod/rating.styl index dc16055..d64dcfe 100644 --- a/stylus/mod/rating.styl +++ b/stylus/mod/rating.styl @@ -37,6 +37,9 @@ background-image: url(/pics/rating-stars-small.png) *vertical-align: -2px +.stars-small-0 + background-position: 0px -99px + .stars-small-1 background-position: 0px -79px @@ -89,3 +92,21 @@ inline-block() background-color: #825d5b height: 15px + +.star-region + float: left + opacity(0) + cursor: pointer +.stars-context + .star-region + width: 19px + height: 18px +.stars-small-context + .star-region + width: 13px + height: 13px + margin-right: 2px + +.rating + .label + margin-right: 5px From 7baf64a2f752e04da76149629b6f143d5e42b604 Mon Sep 17 00:00:00 2001 From: chenmengdi Date: Tue, 23 Apr 2013 10:30:34 +0800 Subject: [PATCH 3/3] Sync from Ark: buttons & tags --- stylus/button.styl | 25 ++++++++++++++++++++----- stylus/type.styl | 6 ++---- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/stylus/button.styl b/stylus/button.styl index 4e48e52..8525749 100644 --- a/stylus/button.styl +++ b/stylus/button.styl @@ -14,6 +14,9 @@ cursor: pointer vertical-align: middle text-decoration: none +.btn:hover + border-color: #8d5f5e + background-color: @border-color .btn-info .btn-info:hover @@ -24,16 +27,28 @@ .btn-info:hover background-color: #dbdbd4 +.btn-sample + border-color: #999995 + background-color: @border-color + &:hover + border-color: #b2b2ae + background-color: @border-color + .btn-minor -.btn-minor:hover color: #888 - border-color: #ddd + border-color: #ebebe5 background-color: @border-color + &:hover + color: @color + border-color: #f5f5ef + background-color: @border-color .btn-read -.btn-read:hover border-color: #6e839a background-color: @border-color + &:hover + border-color: #7a8ea3 + background-color: @border-color .btn-green .btn-green:hover @@ -66,7 +81,7 @@ button padding: 1px 0 vertical-align: middle font-size: $baseFontSize - border: none + border: none background: none &:hover color: #fff @@ -107,7 +122,7 @@ button.btn:hover input.btn _padding-top: 6px - _padding-bottom: 2px + _padding-bottom: 2px .btn-large .btn-large:hover diff --git a/stylus/type.styl b/stylus/type.styl index d22548c..856f7b0 100644 --- a/stylus/type.styl +++ b/stylus/type.styl @@ -58,7 +58,7 @@ ul, ol inline-block() vertical-align: top -.list-col2 +.list-col2 margin-right: -30px li width: 297px @@ -71,18 +71,16 @@ ul, ol margin: 0 43px 15px 0 text-align: center -.tags +.tags line-height: 0 li display: inline - font-size: 14px a inline-block() line-height: 1 margin: 0 6px 4px 0 padding: 6px 10px background-color: #ebebe4 - border-radius: 3px word-wrap: break-word overflow: hidden a:hover