From 3cb509edc145f8ea258a40e916a75c1c5a7ce5f2 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Sat, 30 Nov 2013 17:13:19 +0100 Subject: [PATCH] navbar with site search prototype --- Gemfile | 3 +- Gemfile.lock | 4 + Gruntfile.js | 3 +- README.md | 12 ++- _src/_includes/header.html | 35 +++++---- _src/assets/fonts/entypo.dev.svg | 85 --------------------- _src/assets/fonts/entypo.eot | Bin 3704 -> 4724 bytes _src/assets/fonts/entypo.svg | 102 ++++++------------------- _src/assets/fonts/entypo.ttf | Bin 3544 -> 4560 bytes _src/assets/fonts/entypo.woff | Bin 4892 -> 4636 bytes _src/assets/js/app.js | 28 ++++++- _src/assets/less/forms.less | 16 +--- _src/assets/less/grid.less | 10 +-- _src/assets/less/icons.less | 48 ++++++------ _src/assets/less/kremalicious3.less | 2 +- _src/assets/less/mixins.less | 10 +-- _src/assets/less/navigation.less | 113 ++++++++++++++++++++++++---- _src/assets/less/scaffolding.less | 19 ++--- _src/assets/less/typography.less | 4 - _src/assets/less/utilities.less | 1 - _src/search.json | 12 +++ bower.json | 3 +- 22 files changed, 244 insertions(+), 266 deletions(-) delete mode 100644 _src/assets/fonts/entypo.dev.svg mode change 100644 => 100755 _src/assets/fonts/entypo.eot mode change 100644 => 100755 _src/assets/fonts/entypo.svg mode change 100644 => 100755 _src/assets/fonts/entypo.ttf mode change 100644 => 100755 _src/assets/fonts/entypo.woff create mode 100644 _src/search.json diff --git a/Gemfile b/Gemfile index 565d7e2c..c3031905 100644 --- a/Gemfile +++ b/Gemfile @@ -3,4 +3,5 @@ source "https://rubygems.org" # gem "rails" gem 'jekyll', '~>1.3.0' -gem 'mini_magick', '~>3.6.0' \ No newline at end of file +gem 'mini_magick', '~>3.6.0' +gem 'fileutils', '~>0.7' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 6d22ef93..f78303d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,6 +8,8 @@ GEM highline (~> 1.6.11) fast-stemmer (1.0.2) ffi (1.9.3) + fileutils (0.7) + rmagick (>= 2.13.1) highline (1.6.20) jekyll (1.3.1) classifier (~> 1.3) @@ -38,6 +40,7 @@ GEM rb-kqueue (0.2.0) ffi (>= 0.5.0) redcarpet (2.3.0) + rmagick (2.13.2) safe_yaml (0.9.7) subexec (0.2.3) syntax (1.0.0) @@ -47,5 +50,6 @@ PLATFORMS ruby DEPENDENCIES + fileutils (~> 0.7) jekyll (~> 1.3.0) mini_magick (~> 3.6.0) diff --git a/Gruntfile.js b/Gruntfile.js index 8e057213..fd89c59d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -103,6 +103,7 @@ module.exports = function(grunt){ 'bower_components/infinitescroll/index.js', 'bower_components/masonry/index.js', 'bower_components/imagesloaded/imagesloaded.js', + 'bower_components/simpleJekyllSearch/index.js', '<%= config.src %>/<%= config.assets.js %>/helper.js', '<%= config.src %>/<%= config.assets.js %>/app.js' ] @@ -144,7 +145,7 @@ module.exports = function(grunt){ options: { port: 1337, hostname: '*', - base: '_site' + base: '<%= config.site %>' } } }, diff --git a/README.md b/README.md index 773cc802..2f7f09e3 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,19 @@ kremalicious3 -============= +================== Requirements ------------------ [https://npmjs.org/](NPM), [http://bower.io/](Bower), [http://bundler.io/](Bundler) -Get up and running: +Get up and running +------------------ +Install dependencies `npm install && bower install && bundle install` -`grunt server` \ No newline at end of file +Local development +`grunt server` + +Production build +`grunt build` \ No newline at end of file diff --git a/_src/_includes/header.html b/_src/_includes/header.html index 41b2c5c6..136896aa 100644 --- a/_src/_includes/header.html +++ b/_src/_includes/header.html @@ -1,18 +1,27 @@ - + + + - \ No newline at end of file + + + \ No newline at end of file diff --git a/_src/assets/fonts/entypo.dev.svg b/_src/assets/fonts/entypo.dev.svg deleted file mode 100644 index 618d95cf..00000000 --- a/_src/assets/fonts/entypo.dev.svg +++ /dev/null @@ -1,85 +0,0 @@ - - - - -This is a custom SVG font generated by IcoMoon. - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/_src/assets/fonts/entypo.eot b/_src/assets/fonts/entypo.eot old mode 100644 new mode 100755 index cc6c3de13af9fff60e61a7e8f2e5429ba2ad7fdd..e473d61762518b8f3da0ac3c1f4cb818333cff3e GIT binary patch literal 4724 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 literal 3704 zcmdrPTWlQF^`1MkGy9zN+PgdJU3+(SW_QN+X5YIrj_s@+JANo}giBJI2LwBbW2bQ( z<2b4l7379MMEgNc;ei8nulKBr8pnt&P+~rmI2a2-&XZtb;}h#NX|f^qkQEc}UA_GL z9o}8&CDUY{ERoY>ft*0LK<-7(3^_&S$P`&bPMF+>oJDey97TzFB9S7=kplL7c`UL_ z9ensbhD?l%?A|%M`Q{~LTt;r&=(gbzvXyX1KZ~?<&#ru_IQP+eIA{;j_Z>PuweXX< zUp#>HAF(aXOr2a=%?73z{?Q{BuE|79jFFld|Yma*-s-0Qx%HuEua&TMU#js%l}v9LDO|6b$^mh~JVb++!VH`Rlm6O1H2by9cMz4hih zbYd;hNZf8(AMG_I?1x2LInqp8P*t4gj>Ew8jM+9mcRDxn{$Fu{>>JP38gyj@J#2R~4BH z1;rd_2*RSOnQu;!wK!NHTrSmUwNlmTkz`5}Qk_b*G|KMyRyNSy+8#B!`~i>0Q_}`_ z3&QT{iN|;4Qt$^qD`rAYb+jb-*un0$WL$3ofo6uBEKTL1LiO6=uP%zGvOXknes}(d;tyWA-)pVoAYym}JTf!XAshVo&28x9l zlT_q&hK>wJRS7Afa;S_N4dmmUtiut3fTDNAW2t=13zRa|t{tu6U?P$U#F((x-Qs%6 z5iWHk{!A;GY(J&#?VC8Jvz&5AqZ}`0TrQ6%%5jM_Fk2=kw@kvzWAPwJ5+g+N2`Mk4 z)~P+wq8MoN`oe0zmKA`Z;BYxupiQyOjW^^R!=#gPG|F~CLfz(sOfsF2c$#>6a5Sg=71l*>|PO?ouXn1SL;f^v6)4yO<`+h9A66ruCv>fmb0TO5| zrmc~HB(AJLFkDWS^lG4@GRdkT_Jc@MTiF&@W2f864j1H;Puz2^QS=Cc2d=sWA=g;x z-Mi~p4$l0_?P8v1TijQUD21u1&3;egn#b?=K-S}L+%&#D|5bIy%zuWouKf+y^eEwp zAGd2l?4VLvt>~q2P{ZUE4F%q~b?MTrOYdAcfBwq(OG{&C&yLX%WL&z{xQLwdS5_ZA za|TBP*8C&zGOU_&L7XjygFMFzxNiEf8G0C+S*f!l=J7o0b0<8J$ntU|;z__&M$UA$ zyW{RBd~WcFv4Qq5Kv`5 zdQaxLU;?eKP_<*RBbCBeHv8$PS@>!w2&+~ zLNyjnfA(3=pp}JuZ-5e^ZTpcRP=2FJqg;iIT^sT{Fi(Pn0ZMAh(it3bO~3Z zA{!N*k^4c%O3Q0CD3|=eVQmxzfM4HwiFp-U;|sMtlA-M-ty$zahvac9M0sGRm=}6e0lyQ$%u_o`sn(SJy>KdB5C=cz|;NbP^kKB0du^Z8e#qI3bv+VXotnYa8!2FJ4 zyo=->@-;l%*%^+DTh#>0qhE87$AII;h2`E+?m@F^4y-u}7D_DlHNgF#h(AQca40A+ zsyzk#Ms97DBeOugUM@1OwSB!!8w&)yUJCiJRP3xqn_Tz1nxfUtq7-g?Ks$PRQli{k zI2Zs34y7}KEGoS{4=a&~68Wo~m*xEH?$lr$xMa-fj3pU1KA3V>#`5C@CE%je6;KM} z`LV{I*rv9koJ|CrP6xPsiL6{~Yhr(CO<*Pu9#NwGWgKHD4 VJIDH&+RC?gx4dxGl-PK$`3GL - -This is a custom SVG font generated by IcoMoon. - - +Generated by IcoMoon - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/_src/assets/fonts/entypo.ttf b/_src/assets/fonts/entypo.ttf old mode 100644 new mode 100755 index 2b0182b636207fa281870cfd28342bf1c48e6e46..11f735129c49974ebc5f1c8fc33f81dbae668251 GIT binary patch literal 4560 zcmZuU3vg7|b@%h$z3=V&?!Mi(yV8E1cC}x@veIg`2qB42B|soz5LU5cV$1$6${%*Pf`6nzKiJwSWMXO12EjqsoU2bci#c6b#3{vur@#n>M|+0zY~UZMbs~ zxQjxdiXDT{ikAu^3FQGYfEY%B!^#TK-kWG;W##7`q%jLR0Ad)iZqp53wL!rI`U+?# z{W0BvjsRg&K0<5ImS{RNG5T^@c!$_KxKsHoR+{E=V=^A2!@n<%c*iIohp&$$xCFQ zw+PZLkz9$2uHH&0XcEp+CguqcG~g|Hx2Q}yl&*@KS3;GL3~R;KG?bt<*cDEL|60~< zN5_N`BCGI_gkVA>=<{JpDE9ePB9#umbZ+O)b1xlk!FFT&5CNW!15Lisf2Z+S$7k{`GIbT7nh7WiY15 z6kCyGAP@_JsC6f1lfAZUz?QP2F=m*iVuWoK(?B#~1i zW`i59$uQOeVbcJ;6>_F%4prz0I*fGiIVFUgP+x+CD*YteosQ!s4*K;03C}(CZ(p5z zKBHD#erbKJm5dt!Lb?xN zf{K4b8N$qEZn`TqkR8auv>f^GH5;-4j7>Yps9_rvgUCRzGNsrk-L-kcRF6d&l|b|i z9>cUi=>nia*v^lZOCPExg;ropZ#H3aU}x!{{Hbg?=>&qQl*!eoXZTgg-|3mo&|sl3 zIOLdKr(aUR%|umhrc%LxlPqUbet+7F>v|>?jixfX9{18I*lLW&f zw6`p5Ab|(q!o3M109+VL9NXJ=B; zP9T%^%p!~`VwQq$CC0`#clO`zsF1PZtl?ghTbkc-noI_Jk+Giv?5=q(tCunu>ep8ig zgIRV!RsFWbpN~1jlErnn6AUQ2V=&c;InSHPbjAs0Ql8PUJ-YI$gy;nn25&zI`anyR z%R(s};T>yX@ymb^LCc40*s9x);sE$=@FUGQ!KR5dlNQFri63 zjXBL=b~|k0R&1yUM+3T({y+yL7i$aAXko3_hWO%Hu4^hu5>+!;{R%TQg?K>d{A?%_ zv+Y-}zX0~fy{u;o|tWBY*dSfMZm8|)j)<8!j_UB-&x6K)L^R{jg}oGb8N z1=Ra%Ud#XfXK*0yg=^_5L9;I`PE0JmFx!SZK6!B6x`UtG(T4Y3J$dWaNqS{s@x__; zoS7FFC;sp1x`R(n?s!tnesaeoKr-;!&6}@*>@cdJ6ZBPDKqe3&6^B4Xy(6?jK8!z7 z|MZ{y=xnKc>QldeAD;UMJdL-1_w#>wY0qq*3G2?I!*qeXgCel5=^=992%1)|Hr)eV z@OJIl<*i%S0NqgV0$vc1yc190ShBxA8N-QqYWLo$RQ)S>S88hS?$rCb* zA|}&aFX)f@xfV)A&gu}Ol`LcsR0_BepPd*PTx02`EU_L)+9XP?U|4tJL;XEEy@Dqf zzbv?olkLC#;_S=|k8UHM$ErVMn6aRVv1)}4qa$qM<>#;xEu@~+AV&nN^65Ml$#+;7 z(t>R0ifSuhU$SB;;Y7YugKU_fVdSGX=x2}*h2ZvG8t#&5M*Mj#CmaC}=je_4)w5^n zU&F?J9LAx2SgVg*+VHzys|~(%e&ktF!+Yz0{Jr`Ye)vOt;CuhE`1RBBty}WxuP=hg z!Db6+72V78zV0D489*Ng&{b=d8LW}vT~<>hcYwS$#? zZe=a*gN(0lE$;0b=o9H-!=fp05>ceRDork%k$|Rw902-!0N*Br*;d!^bXAL|x*exG z71yfM!(Eom2o1y?ZT9iU;@k;$m}W=V;qk{FpVgeWzy2`U_UQdpW`xY}=)|59#-%+I zqhTv(uKaPs}E;mrv;inh>C z(HWFQLlAF4PelL}PuqTwS|j8NRfdATV|WLrKjUt^E3AMilqJ`TDeGFvF^(>91!W1=rNW{G=)FK*!k@GUKz z0^Z%iCBW});WBc8YTlC}j`~`-5Awuc#~%nZ}M#7O`c7h!P>#r z+9uB{{yG;s@wno literal 3544 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 diff --git a/_src/assets/js/app.js b/_src/assets/js/app.js index afc0ae28..c99bdd47 100644 --- a/_src/assets/js/app.js +++ b/_src/assets/js/app.js @@ -16,16 +16,40 @@ $(ASAP = function(){ photoGrid.init(); + siteNavigation.init(); }); $(window).load( AfterLoad = function() { - //siteEffects.init(); infiniteScroll.init(); }); +var siteNavigation = { + + siteSearch: function() { + $('.search-field').simpleJekyllSearch({ + searchResults : '.search-results', + searchResultsTitle : '', + template : '{title}', + }); + }, + + siteMenu: function() { + $('.menu-btn').click(function(e) { + e.preventDefault(); + $('.nav-main .nav-popover').toggleClass('show').toggleClass('hide'); + }); + }, + + init: function(){ + this.siteSearch(); + this.siteMenu(); + } + +} + var photoGrid = { masonryLayout: function() { @@ -49,7 +73,7 @@ var photoGrid = { } var siteEffects = { - + init: function(){ } diff --git a/_src/assets/less/forms.less b/_src/assets/less/forms.less index c945026f..583da1b2 100644 --- a/_src/assets/less/forms.less +++ b/_src/assets/less/forms.less @@ -21,20 +21,8 @@ label { select, textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"] { +.input-text, +.input-search { font-size: @font-size-base; line-height: @line-height-computed; font-family: @font-family-base; diff --git a/_src/assets/less/grid.less b/_src/assets/less/grid.less index a905de48..c26e340b 100644 --- a/_src/assets/less/grid.less +++ b/_src/assets/less/grid.less @@ -5,7 +5,7 @@ // 320px and up .container { - padding: 0 5%; + padding: 0 7%; width: 100%; } .row { @@ -23,7 +23,6 @@ .container:before, .row:before, .container:after, .row:after { display: table; content: ""; } .container:after, .row:after { clear: both; } -.container, .row { *zoom: 1; } @media @breakpoint1 { @@ -33,14 +32,13 @@ .col4, .col5, .col6 { } - - .container { - padding: 0 15%; } } @media @breakpoint2 { - + + .container { padding: 0 15%; } + .row { max-width: 35em; margin: @line-height-computed*2 auto; diff --git a/_src/assets/less/icons.less b/_src/assets/less/icons.less index 9489e78c..576099e5 100644 --- a/_src/assets/less/icons.less +++ b/_src/assets/less/icons.less @@ -13,6 +13,7 @@ font-style: normal; } +.topbar, .hentry, .footer { [class*="icon-"]:before { @@ -26,6 +27,7 @@ text-transform: none; line-height: 1; -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } } @@ -43,60 +45,60 @@ } .icon-twitter:before { - content: "\e000"; + content: "\e600"; } .icon-facebook:before { - content: "\e001"; + content: "\e601"; } .icon-googleplus:before { - content: "\e002"; + content: "\e602"; } .icon-rss:before { - content: "\e008"; + content: "\e603"; } .icon-user:before, .icon-personal:before { - content: "\e009"; + content: "\e604"; } .icon-leaf:before, .icon-design:before { - content: "\e00a"; + content: "\e605"; } .icon-link:before { - content: "\e00b"; + content: "\e606"; } .icon-pictures:before, .icon-photos:before { - content: "\e00c"; + content: "\e607"; } .icon-camera:before, .icon-photography:before { - content: "\e010"; + content: "\e608"; } .icon-arrow-down:before, .icon-download:before, .icon-download-alt:before { - content: "\e00d"; -} -.icon-arrow-right:before { - content: "\e00e"; -} -.icon-arrow-left:before { - content: "\e00f"; -} -.icon-heart:before { - content: "\e012"; + content: "\e609"; } .icon-forward:before { - content: "\e013"; + content: "\e60a"; +} +.icon-heart:before { + content: "\e60b"; } .icon-info:before { - content: "\e014"; + content: "\e60c"; } .icon-star:before, .entry-content li:before { - content: "\e003"; + content: "\e60d"; } .icon-github:before { - content: "\e004"; + content: "\e60e"; +} +.icon-search:before { + content: "\e60f"; +} +.icon-arrow-down:before { + content: "\e610"; } \ No newline at end of file diff --git a/_src/assets/less/kremalicious3.less b/_src/assets/less/kremalicious3.less index 56d7e5fb..9e38b64e 100644 --- a/_src/assets/less/kremalicious3.less +++ b/_src/assets/less/kremalicious3.less @@ -34,7 +34,7 @@ @import 'icons.less'; // Forms & Buttons -//@import 'forms.less'; +@import 'forms.less'; @import 'buttons.less'; // Media: images, video etc. diff --git a/_src/assets/less/mixins.less b/_src/assets/less/mixins.less index 764fd1eb..188c9a3f 100644 --- a/_src/assets/less/mixins.less +++ b/_src/assets/less/mixins.less @@ -9,7 +9,7 @@ background-image: data-uri('../img/logo.png'); background-repeat: no-repeat; background-position: center top; - height: 60px; + height: 31px; @media @highDPI { background-image: url('../img/logo@2x.png'); @@ -101,19 +101,19 @@ } // Single side border-radius -.border-top-radius(@radius) { +.border-top-radius(@radius: @border-radius-base) { border-top-right-radius: @radius; border-top-left-radius: @radius; } -.border-right-radius(@radius) { +.border-right-radius(@radius: @border-radius-base) { border-bottom-right-radius: @radius; border-top-right-radius: @radius; } -.border-bottom-radius(@radius) { +.border-bottom-radius(@radius: @border-radius-base) { border-bottom-right-radius: @radius; border-bottom-left-radius: @radius; } -.border-left-radius(@radius) { +.border-left-radius(@radius: @border-radius-base) { border-bottom-left-radius: @radius; border-top-left-radius: @radius; } diff --git a/_src/assets/less/navigation.less b/_src/assets/less/navigation.less index 208b99df..653e3a7a 100644 --- a/_src/assets/less/navigation.less +++ b/_src/assets/less/navigation.less @@ -2,24 +2,109 @@ // NAVIGATION ///////////////////////////////////// - -// Main Navigation -///////////////////////////////////// - -.nav-main { - margin-top: 0; - .textcenter; - - .row { - margin-top: 0; - margin-bottom: 0; - } - li { display: inline-block; } +// +// Topbar +// +.topbar { + .clearfix; + background: #f1f4f7; + padding: @line-height-computed/3 @line-height-computed; } +// +// Main Navigation +// + +.nav-main { + position: relative; + float: right; + width: 5%; + + li { display: inline-block; } + + .nav-popover { + right: 0; + top: 100%; + } +} + +.nav-link { + display: block; + padding: .5em 1em; + + &:hover { + background: rgba(255,255,255,.5); + } +} + +.nav-popover { + position: absolute; + z-index: 5; // so it's always above page content + .border-bottom-radius; + background: rgba(255,255,255,.85); + box-shadow: 0 2px 7px rgba(0,0,0,.05); +} + +.menu-btn, +.search-btn { + line-height: 1em; + text-align: center; + vertical-align: middle; + display: inline-block; + padding: .6em .7em .5em .7em; + margin: 0; +} + +// +// Site Search +// + +.site-search { + position: relative; + clear: both; + width: 80%; + float: left; + + @media @breakpoint2 { + clear: none; + margin-right: 1%; + width: 60%; + } + // loupe icon + .search-btn { + position: absolute; + left: 0; + z-index: 2; + } +} + +.search-field { + padding-left: 40px; + position: relative; + width: 90%; + border: none; + .box-shadow(none); + background: transparent; + + .placeholder(rgba(46, 79, 92, .1)); + + &:hover, + &:focus { + background: rgba(255,255,255,.7) !important; + .placeholder(rgba(46, 79, 92, .2)); + } +} + +.search-results { + left: 0; + width: 100%; +} + + +// // Pager -///////////////////////////////////// +// .pager { .clearfix; diff --git a/_src/assets/less/scaffolding.less b/_src/assets/less/scaffolding.less index 91164809..6d99a9c1 100644 --- a/_src/assets/less/scaffolding.less +++ b/_src/assets/less/scaffolding.less @@ -12,16 +12,14 @@ body { ///////////////////////////////////// .banner { - - .row { - margin-top: @line-height-computed; - margin-bottom: @line-height-computed; - } - + float: left; + width: 15%; + min-width: 160px; + .banner-title { - margin: 0 auto; width: 128px; - + margin-top: .1em; + margin-bottom: 0; // display toned down logo // by default .logo; @@ -33,10 +31,8 @@ body { // repeat logo // but display hover version .logo; - background-position: center bottom; + background-position: center -61px; width: 128px; - margin-left: auto; - margin-right: auto; // hide by default opacity: 0; @@ -44,7 +40,6 @@ body { &:hover { opacity: 1 } &:active { top: 0 } } - } diff --git a/_src/assets/less/typography.less b/_src/assets/less/typography.less index 2e9ef81f..182fe1a8 100644 --- a/_src/assets/less/typography.less +++ b/_src/assets/less/typography.less @@ -11,12 +11,8 @@ body { font-size: @font-size-base; line-height: @line-height-base; - padding-left: 2%; - padding-right: 2%; - @media @breakpoint1 { line-height: @line-height-computed; - padding: 0; } @media @breakpoint3 { diff --git a/_src/assets/less/utilities.less b/_src/assets/less/utilities.less index 9909d6da..7f762e76 100644 --- a/_src/assets/less/utilities.less +++ b/_src/assets/less/utilities.less @@ -4,7 +4,6 @@ // Clear stuff .clearfix { - *zoom: 1; clear: both; &:before, &:after { diff --git a/_src/search.json b/_src/search.json new file mode 100644 index 00000000..5af325b3 --- /dev/null +++ b/_src/search.json @@ -0,0 +1,12 @@ +--- +--- +[ + {% for post in site.posts %} + { + "title" : "{{ post.title | escape }}", + "category" : "{{ post.category }}", + "url" : "{{ post.url }}", + "date" : "{{ post.date }}" + } {% if forloop.last %}{% else %},{% endif %} + {% endfor %} +] \ No newline at end of file diff --git a/bower.json b/bower.json index e6654b12..29ea2c97 100644 --- a/bower.json +++ b/bower.json @@ -14,7 +14,8 @@ "picturefill": "~1.2.1", "masonry": "http://masonry.desandro.com/masonry.pkgd.min.js", "imagesloaded": "~3.0.4", - "infinitescroll": "https://raw.github.com/paulirish/infinite-scroll/master/jquery.infinitescroll.js" + "infinitescroll": "https://raw.github.com/paulirish/infinite-scroll/master/jquery.infinitescroll.js", + "simpleJekyllSearch": "https://raw.github.com/christian-fei/Simple-Jekyll-Search/master/simpleJekyllSearch.js" }, "ignore": [