From 75ba506b2ffc5e21b67301950b6867ca20f1cab0 Mon Sep 17 00:00:00 2001 From: Wesley Moore Date: Wed, 30 Jun 2010 17:56:37 +1000 Subject: [PATCH] Simplify search on articles pages --- content/screen.sass | 29 +++-------------------- layouts/articles.html | 48 +++++++++++--------------------------- output/images/srch_bg.gif | Bin 65 -> 0 bytes output/images/srch_l.gif | Bin 303 -> 0 bytes output/images/srch_r.gif | Bin 357 -> 0 bytes output/js/application.js | 17 -------------- 6 files changed, 16 insertions(+), 78 deletions(-) delete mode 100755 output/images/srch_bg.gif delete mode 100755 output/images/srch_l.gif delete mode 100644 output/images/srch_r.gif diff --git a/content/screen.sass b/content/screen.sass index a4c65d7..c41cfd4 100644 --- a/content/screen.sass +++ b/content/screen.sass @@ -279,7 +279,7 @@ a margin: 1em 2em 1em 0 -ul.menu +body.articles #content nav padding-bottom: 1em @@ -289,8 +289,6 @@ ul.menu display: none float: left margin-right: 20px - background: #fff url(/images/srch_l.gif) 0 0 no-repeat - padding-left: 19px fieldset margin: 0 @@ -298,32 +296,11 @@ ul.menu border: 0 label - color: #999 - display: none + font-weight: normal + padding-right: 10px input - border: 0 - margin: 0 - outline: 0 - vertical-align: middle - height: 19px width: 180px - width: 132px - padding: 3px - background: #fff url(/images/srch_bg.gif) 0 0 repeat-x - float: left - font: 11px/13px "Lucida Grande", Helvetica, "Liberation Sans", "Bitstream Vera Sans", Tahoma, Geneva, Arial, sans-serif - color: #000 - - span.clear - background: #fff url(/images/srch_r.gif) 0 0 no-repeat - float: left - width: 19px - height: 19px - clear: none - - .active - background-position: 0 -19px #respond diff --git a/layouts/articles.html b/layouts/articles.html index d73e499..7325518 100644 --- a/layouts/articles.html +++ b/layouts/articles.html @@ -2,37 +2,22 @@ <%= render '_head' %> - - - - - @@ -48,7 +33,7 @@ ['Personal', personal_articles.size], ] %> - + - <%= render '_footer' %> diff --git a/output/images/srch_bg.gif b/output/images/srch_bg.gif deleted file mode 100755 index 6a523ba8fcf1400053a9725a5e6d6c5c6976ee21..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmZ?wbhEHbWMmL#Sj50kUS9tH|Nk2|Zk#!D=HthYKsEyyDE?$&6=7gy&;jv4Y8jZ> NIGiv33s7OO1^`K570Uns diff --git a/output/images/srch_l.gif b/output/images/srch_l.gif deleted file mode 100755 index 6d95bf35d9a2681b02edff0614d715f1e77e6944..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 303 zcmZ?wbhEHb6lM@+IKse?mX`MY`}b?tt}S1_yt=yj=+UE3pFZvE>?|!U-MV$_`}gnv z|NlR8=FEHd?wvVvrnR+o&z?PN*RBPM0L2-I0E$0ZSVe$V>44ON>||hF^FXP~_mGXp zs&$Je%J{H|mgG)m4(4ck^xxsAlVIlurV|r`I3+nm7>{xncyLVTRljn8p<-{(>lF-! zEMlAom@hThFm$Fm6~xIf2&`aoiglAJjZ0Hviz`)PZsyKsP0lJ}Qx*(iWn?X9PA_Hc z;*E`uV@cv>Dp6wO70l;nW?@*Q%a;_$wv~-{-3BG525;pREG!e1xZL+G=iRG(wCi~L U{*$)nk9%=#UwY%_Qbh)90GP#U5&!@I diff --git a/output/images/srch_r.gif b/output/images/srch_r.gif deleted file mode 100644 index 7a6d1c49bbd4eda0646185d5c903773085082684..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmZ?wbhEHb6lPFkIKlt||NsC0@#Dw$@893QfB)>+v!_p=-n)12+O=zE&YU@V^yr>F zd$w%ZvUcs-#fuluoH?_#wY9Xgbp7^YV6B7+#h)yU3=BdHIv}MWI~iCXC8+eNe9>`V zu*&Q8KJU*qJR5~7)(NvMvgy5&<-x;K)!VlA1do6~uj}TYB^=9L4m&mK@(K0m6&7T4 zbh3Q@sTRAMC+0gtV}Z3W+wX<%-sv87XRi-tZfw#n>Fg?DZ+BLiAgHF{qCbtx(3pqS z+}fJe&LKRQY3TybW^=n}4i+Z=Kv&io+*_kr*K>q9vuxS6m1`Yqv@^$6M)oONOPM$l zwYO+qI>5-3>b(E*HZ9gHovoKnTwy$X^!Q25({~EB_U_+y@M?+6=J#B4%75%x&9zqR aTFtcvFW0OEGs0P={ze`NP@E{hU=0Av4vMb; diff --git a/output/js/application.js b/output/js/application.js index e929ca8..a0c5a83 100644 --- a/output/js/application.js +++ b/output/js/application.js @@ -12,23 +12,6 @@ var WezM = { if(navigator.userAgent.toLowerCase().indexOf('webkit') >= 0) { // TODO: This is too generic (iPhone) $('#search input').css('paddingTop', 0); } - // The following should be triggered onchange for the input as well - // (to handle things like Cut with the mouse) - // $('#search input').keyup(function(e) { - // var input = $(this); - // var clear_search = $('#search .clear'); - // var value = input.attr('value'); - // if(value && (value != '')) { - // clear_search.addClass('active'); - // } - // else { - // clear_search.removeClass('active'); - // } - // }); - $('#search .clear.active').live('click', function() { - $('#search input').attr('value', '').keyup(); // Simulate keypress to clear results - - }); }, _searchItemSelected: function(article) { document.location.href = article.path;