From fb1ea25ce923c6db130d5b38b790f8ddf5f7c36c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Tue, 10 Jun 2014 13:01:53 +0200 Subject: [PATCH 1/8] Taskboard single task --- app/fonts/taiga.eot | Bin 3860 -> 4184 bytes app/fonts/taiga.svg | 2 + app/fonts/taiga.ttf | Bin 3704 -> 4028 bytes app/fonts/taiga.woff | Bin 2704 -> 2880 bytes app/styles/components/taskboard-task.scss | 61 ++++++++++++++++++++++ app/styles/dependencies/colors.scss | 3 ++ app/styles/dependencies/helpers.scss | 17 ++++++ app/styles/dependencies/mixins.scss | 20 +++++++ app/styles/dependencies/typography.scss | 6 +++ app/styles/main.scss | 1 + app/styles/modules/taskboard-table.scss | 16 ------ app/views/components/taskboard-task.jade | 14 +++++ app/views/modules/taskboard-table.jade | 2 +- 13 files changed, 125 insertions(+), 17 deletions(-) create mode 100644 app/styles/components/taskboard-task.scss create mode 100644 app/views/components/taskboard-task.jade diff --git a/app/fonts/taiga.eot b/app/fonts/taiga.eot index 7c1775dded76649ec7c1bbaad9723c8c5808505a..74a60d0fb00e643b575c3f5669c62dd55835fdf7 100644 GIT binary patch delta 821 zcmZXS!An#@9LGQN-rL>r?e5zp-M2)mX<15Yt)}mZ8iZKpp%eo1V92tm9bDbggP!aX zUOJ>B71Tk5IzFDy%q&*?tPBps zVI?*nbc~J7`nLJYx$KX{0>qYpRCm{vt8@{B*aM)l_vVGB-tEB;AO?W`Y%Y`USi1fh z#5#!kqnXM4?k+mSrU5xRHZxK^+4&IkM_|_99nRe0nN?76Q9iq>WkI|JoUw^)CK)-t z4Ei9D&Sj?a4Dl31t9R~rCO5pfHL(cM_aMge6O&VVg&u`iEzpMmZ?@HMZVbgbwg_u@ zGQW*3BK@5anXiB}& z+VupsTGwW@gsn3A6ZJJhgrW=+r9(GMrE=U=1B2va9P9(k{r7!vsadF-Y*yD2c@XlW9ejUHd z0zJYNYs9Fc18X~$b*=C zQTMD;^(lHyZzQcutG1*u-QYAdr5l@7-YQc!ELTHQJK9N+RIjW$y`Nj^n^i7swPBqI IANodr0a6l;DF6Tf delta 571 zcmYL_KWGzi6vsdB_q!bDMej;U#UW}ykfN1_QfiACg8wR5s8|(;w(=v^v@~gBnjwNv z7dHjVPZ7!B=;9y>c5n=I&Eg<}o2aXUOR=8Z<)9B9@ADpy?|Xc|6rLY*b0M^YEqB7{ zW{dt-xnBAFvjf3Ake|MI=`!bWAt(Wb*}2iN*}eH~klVnmO5HR{t+Q`HzJsh)%|;`N z&=8CRUbXh%UU9DT4fG@M{w^<>ySy+RJ0M3lwHg6=2aMI$D`v2qdjk3fFj6<|1`E6d znT+qQnflV>3EhQ*4?$KN>l-b#qdvl+U%(6kar(t<_fA;)Lsk(-@6*7w{TlsKBy%q= z_N|~Gb!_w_Sd)SeaR#D`&L z&$Bm!lbZ!f3ek Ny~Ul~eG~hp{s(CAW8VM( diff --git a/app/fonts/taiga.svg b/app/fonts/taiga.svg index 07f72bc7..ee2f5202 100644 --- a/app/fonts/taiga.svg +++ b/app/fonts/taiga.svg @@ -25,4 +25,6 @@ + + diff --git a/app/fonts/taiga.ttf b/app/fonts/taiga.ttf index b6400351af20e0bf0538a39a664964da6ae846df..0dfcb41e06f91cba6e1b281f51336e77392c4f25 100644 GIT binary patch delta 861 zcmZXSK}Zx~6vuzx%_fZMJ6 zKgUB|2Lu(|YkMQTTa8M3cS&@MsB=e*iGs5#`fu2{fVeii74y2lG^(d!Xbb~>Gz4zL zf>W<_su3*bo-(gQEa$7T=#&)Q8B;H5+Lq6HUs4ZcQN?CQl*It`G-AW)NJGHiA}%&v z=@vJWouWNzMgL8m%-C*~^;YV-9h5R0v~^uBNogbvDZ@t62ro(LCB2HUxaJmAwJaWg zQ~mU)kLR?^fUw05A>wqv%zVS5VPxeK)BB;76J{t TgQtqH{dDtpb)1gID!uy$yq$|* delta 511 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 delta 2589 zcmV+&3gY#^7LXMbcTYw}PgGP-000V*01E&B000j3krX3;G5`Py4=6kN3Pwg$O#lE0 zJOBUy82|tP9B$O-n@2=NMgRZ^SO5S39RL6TAOJuB1W!{hG5`PwcmMzZNB{r;U{D`k z*kf&BZ~y=ZzyJUMW&i*IZZcXfhG=DBWB>pOC;$KeD*ylhHUO1jn`mfdVE_OLQ~&?~ z8~^|SBm^*j0s&}kba(&&32*=a04V?f04fFo0xE4`cyIs!37h}`00sa600saPPylXW zZDjxe38Vl30Nelo0c(Xe1H*7{b94Xz3V;9r01yBG03ZMZ00DTMg;rf`99I>dwfFAa z#AY2*k5dbKH*Q6!n$$QAMrwJXfp*(8kPxRyrL@R@QE1wfpoHMWjlJt;XXpRS|IRkv zwNpbVfkvbes)#^A`2#AERtgUYfq;j$Aw1Zj4Hdluv!a~YwN3nhdaty)d(OG%eCPL0 zf=ed3L?V$I*}d=C-CUxDOK=Z`pK1wvTEjb&W_tqKTcJIfS7MGxnEvWLs|EIYN5Yl+pQxVDDUre<6lxi4{F<{suA;d0!g+$QdEZZr24 z?lJDG+!k&t_cd-CH^ki$-)!MFa5e5yB9-`j;$UmK^|#5se@&fr|>cP}h>K%Ru zy_pV!WEj+Or!I!Og-^5GE&f7Ry`Sa6e!hNxU(_%3vD`oTC>O04?qRvV^J(_yuq?2< zqPrlv^)wL0Ry@fs`C?EiOTOeOF5NaX^!qLM4*z=VGstHH7P}4^_D+430Pymm@4i6U ztLu0JbTCZA1QRR@x1#SDQ189^^B;ZVjk&i5FI*tE;kpp+5$fwd2-owMyXqTmh8y^Q zOS(|+e;)y+*+>`&tmD1Aqs}ZmRTv)GOW$AfiEn*SSRaz?*rD6 z{bq9Y;Qdi+)cW@QAAb1ub=JyS2d}Trrl(O!4Z`h44WPa%IuFr`Xa%s2tw7GRIU%}u z`7!>DtFFVQ0N5`On;&Cy8!>xYsILou?+e%Q^-l~6&#}4J_-HP-aClUBmd&00A0^HH z!U6$CrLjUjUl@}{VHC#ve6>)MreOwV{OM|~R-N`|fX=|QR4Y{T{uqo>w&t_|Hdwl4 zSh}eJ-B~7DMGcg|ab4dJyt3=tj%7i-V>wf`(RK`RCtiUl;fnUC#Sv7})Gy;vf)=oDR1RTN1Q<&q+4YC}|S%K62q@$Vm| zRznqIF{*IfqlaML0|`V*`=@VC&)G|a3Juj zlhtZaaeWIl#rh0ew+hq6NhzR??*vYTUMv&av`jSA2ph$kV;hBqz@Rmt_1-I~+X?fL z92g)v9^$_-CVFFlG;v!oZnJ5UUI}~oB?PuN33jZE4%{Hk)aVU`4P`oi-CpnIml80B zO{ZgoH0<4;x}DIlXVDvfBe53^51tCYD5$>Tln{GMssxIvN?OUpzND-#>VqgtK(SOu zrN7%qY}GNmX3dybKOU4Ru;*AG>m#0P`dXQ$*#lvx07X@laEWRWiXb}J=e`<11u9P9 z>Q#^rQ) z_hKQ?sGD`qHv%R+&VJM#bvN^`H?u)&1!6V|Z@z9>GTu>gu_|oL53NSI;72{xFaEmEt6`D%~V$3|m4iw5S{zZMJ>svn1+#grw=stZ^fjbqX%$w=(e zq5%xil?4O&8Zk_NZJ|938e@$w5bTadjcbNs(0u;mj4tsY+{OMQxC)4hLL)!&0aw(y z5Aey+WK(f8NB1m;0=&k$OiVHJn2)&+z(x6&qkjv3m>K#d&gw_l=LAOuSygE+N8-*} z2q9fNyLK&7v_>aureV?CHN-qWe{4iFJG*w4EauR*OnU8q8nGQ8uz`>@OC0PPJYUO^ zc^jxP9daQjoO$t;=iwO|8T{z@_>qhe9mm7;OqLlu{N$A%pE*A5O;+6#^lVDmH*#=) z@raZkg%R3!_FZ=51P>?kGe`XWm621*85D7jRtwWIT@!T+2M!-TkcGTAQ4uk^_>NMY zkK>#v%M}fO`_N5cC)$BWX8vWtO_YP#_a3%q7%8a@HCqk3^zaM4r6gCfyw%~C%3oy!<;5fpb;^0MmcXW+^9tuvs6xRX{cN+DxKMA^S+S&7b zY%X*BWXiT|C&TVcIhLknM~)+1*R#8L4eKd07?lNI_N0<5OOhv-(YT*E*AV0ssy42}G0o z2|<4VFSZ0R0000008jt`6952soNbQHYQjJig}-Q`)Rrz>bUnB%BqTuuUAgiBx^SPx z5CS2AF+PUdLRUV956}njm3l@8y3m0;_dAz!e}Ff>iSREXk-GDUDT}~k3~k_8o}a)8 zuUrC8q^@#C@rx?6TbJh%@5}>_+431UmgjvGIN^hH;EC$L3{*7K`WdRGR{Fw9A9Y8C zleG1*tpq!II{AHea#-D3l94NK6#tX%dQHkoQOZ%U)PTMlcD<{uDYM*c%x$0YI$fn@ zUdZuy%wB682UY!Yqd|Tld+QEO-c${NkW Date: Tue, 10 Jun 2014 13:19:48 +0200 Subject: [PATCH 2/8] taiga drag&drop styles --- app/styles/components/taskboard-task.scss | 6 +++++- app/styles/dependencies/mixins.scss | 4 ++++ app/views/components/taskboard-task.jade | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/styles/components/taskboard-task.scss b/app/styles/components/taskboard-task.scss index 2bc366cd..e1e7cedf 100644 --- a/app/styles/components/taskboard-task.scss +++ b/app/styles/components/taskboard-task.scss @@ -7,7 +7,7 @@ } .taskboard-tag { @include table-flex-child(1, 0, 0, 0); - background: $grayer; //Fallback + background: $postit-hover; //Fallback height: .2rem; } .taskboard-task-inner { @@ -59,3 +59,7 @@ right: 45%; } } + +.task-drag { + @include box-shadow(); +} diff --git a/app/styles/dependencies/mixins.scss b/app/styles/dependencies/mixins.scss index 68171a47..be90c214 100644 --- a/app/styles/dependencies/mixins.scss +++ b/app/styles/dependencies/mixins.scss @@ -28,3 +28,7 @@ width: #{$width}; } } + +@mixin box-shadow($h-shadow: 1px, $v-shadow: 1px, $blur: 15px, $spread: 6px, $color: rgba(0, 0, 0, .1)) { + box-shadow: $h-shadow $v-shadow $blur $spread $color; +} diff --git a/app/views/components/taskboard-task.jade b/app/views/components/taskboard-task.jade index f35373e8..0451cd19 100644 --- a/app/views/components/taskboard-task.jade +++ b/app/views/components/taskboard-task.jade @@ -1,7 +1,7 @@ div.taskboard-task div.taskboard-tagline - - for(var y = 0; y < 5; y++) - div.taskboard-tag + - for(var y = 0; y < 3; y++) + a.taskboard-tag(href="", title="tasboard-tag") div.taskboard-task-inner figure.avatar a(href="", title="UserName") From 9fd9f54aa0900d167cebed25d7d2533a766ec644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Tue, 10 Jun 2014 13:31:53 +0200 Subject: [PATCH 3/8] Minor style fixes --- app/styles/components/taskboard-task.scss | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/styles/components/taskboard-task.scss b/app/styles/components/taskboard-task.scss index e1e7cedf..c5369db4 100644 --- a/app/styles/components/taskboard-task.scss +++ b/app/styles/components/taskboard-task.scss @@ -8,7 +8,7 @@ .taskboard-tag { @include table-flex-child(1, 0, 0, 0); background: $postit-hover; //Fallback - height: .2rem; + height: .3rem; } .taskboard-task-inner { @include table-flex(); @@ -45,6 +45,7 @@ @extend %large; bottom: .2rem; color: $postit-hover; + display: none; position: absolute; &:hover { @include transition(color, .3s, linear); @@ -58,6 +59,12 @@ @extend %xlarge; right: 45%; } + &:hover { + .icon-edit, + .icon-drag-h { + display: block; + } + } } .task-drag { From 0b7f311ea027faa193ef7d473e9712456a59db8e Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 10 Jun 2014 17:02:16 +0200 Subject: [PATCH 4/8] Update README.md --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c0764a85..f03b3420 100644 --- a/README.md +++ b/README.md @@ -8,12 +8,12 @@ Setup initial environment Install requirements: -.. code-block:: console - - sudo npm install -g gulp - npm install - sudo npm install -g bower - bower install - gulp +```bash +sudo npm install -g gulp +npm install +sudo npm install -g bower +bower install +gulp +``` And go in your browser to: http://localhost:8080/ From 926e85d0136a34eddd4fe679a9365b8e9d3230b5 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Tue, 10 Jun 2014 16:19:48 +0200 Subject: [PATCH 5/8] update git scss-lint --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d2480e7a..8545bf31 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "gulp-newer": "^0.3.0", "gulp-notify": "^1.2.5", "gulp-ruby-sass": "^0.4.3", - "gulp-scss-lint": "0.0.5", + "gulp-scss-lint": "0.0.6", "gulp-styledocco": "0.0.1", "gulp-watch": "^0.5.4" } From 1f823abffc780da16d037d5cee320b79994b2b54 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Wed, 11 Jun 2014 09:21:12 +0200 Subject: [PATCH 6/8] search module --- app/search.jade | 12 +++++++++++ app/styles/main.scss | 1 + app/styles/modules/search-filter.scss | 21 ++++++++++++++++++ app/views/modules/search-filter.jade | 31 +++++++++++++++++++++++++++ app/views/modules/search-in.jade | 6 ++++++ gulpfile.js | 6 +++--- package.json | 1 + 7 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 app/search.jade create mode 100644 app/styles/modules/search-filter.scss create mode 100644 app/views/modules/search-filter.jade create mode 100644 app/views/modules/search-in.jade diff --git a/app/search.jade b/app/search.jade new file mode 100644 index 00000000..8e5580c8 --- /dev/null +++ b/app/search.jade @@ -0,0 +1,12 @@ +extends layout + +block head + title Taiga Project management web application with scrum in mind! + +block content + sidebar.menu-secondary.sidebar + include views/modules/search-in + + section.main.search-result + include views/components/mainTitle + include views/modules/search-filter diff --git a/app/styles/main.scss b/app/styles/main.scss index 77883d90..c2dc4bf9 100755 --- a/app/styles/main.scss +++ b/app/styles/main.scss @@ -39,6 +39,7 @@ $prefix-for-spec: true; @import 'modules/filters'; @import 'modules/lightbox'; @import 'modules/taskboard-table'; +@import 'modules/search-filter'; // Responsive @import 'responsive/mobile'; diff --git a/app/styles/modules/search-filter.scss b/app/styles/modules/search-filter.scss new file mode 100644 index 00000000..d0bf2653 --- /dev/null +++ b/app/styles/modules/search-filter.scss @@ -0,0 +1,21 @@ +.search-filter { + ul { + display: flex; + } + li { + margin-right: 1rem; + } + a { + @extend %large; + font-family: 'ostrichSans'; + opacity: .2; + &:hover { + @include transition (opacity .3s linear); + color: $blackish; + opacity: 1; + } + } + .icon { + margin-right: .4rem; + } +} diff --git a/app/views/modules/search-filter.jade b/app/views/modules/search-filter.jade new file mode 100644 index 00000000..a1e9dd57 --- /dev/null +++ b/app/views/modules/search-filter.jade @@ -0,0 +1,31 @@ +section.search-filter + ul + li + a.active(href="#") + span.icon.icon-bulk + | 20 User Stories + + li + a(href="#") + span.icon.icon-issues + | 3 Issues + + li + a(href="#") + span.icon.icon-bulk + | 23 Task + + li + a(href="#") + span.icon.icon-wiki + | 2 Wiki pages + + li + a(href="#") + span.icon.icon-edit + | 12 Documents + + li + a(href="#") + span.icon.icon-edit + | 3 Users \ No newline at end of file diff --git a/app/views/modules/search-in.jade b/app/views/modules/search-in.jade new file mode 100644 index 00000000..5caa8f5f --- /dev/null +++ b/app/views/modules/search-in.jade @@ -0,0 +1,6 @@ +section.search + header + form + fieldset + input(type="text", placeholder="Search in...") + a.icon.icon-search(href="", title="search") diff --git a/gulpfile.js b/gulpfile.js index 67155945..b43f6546 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -28,12 +28,12 @@ var paths = { gulp.task('jade', function() { return gulp.src(paths.jade) - .on('error', function(err) { - console.log(err); - }) .pipe(jade({ pretty: true })) + .on('error', function(err) { + console.log(err); + }) .pipe(gulp.dest(paths.dist)) .pipe(size()); }); diff --git a/package.json b/package.json index 8545bf31..57bac52d 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "gulp-minify-html": "^0.1.3", "gulp-newer": "^0.3.0", "gulp-notify": "^1.2.5", + "gulp-plumber": "^0.6.2", "gulp-ruby-sass": "^0.4.3", "gulp-scss-lint": "0.0.6", "gulp-styledocco": "0.0.1", From 1693f3fcb1b42e4e7ef3ac7c210a5d469d43b697 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Wed, 11 Jun 2014 10:07:59 +0200 Subject: [PATCH 7/8] search result table --- app/search.jade | 1 + app/styles/main.scss | 1 + app/styles/modules/backlog-table.scss | 2 +- app/styles/modules/search-filter.scss | 3 + app/styles/modules/search-result-table.scss | 72 +++++++++++++++++++++ app/views/modules/search-result-table.jade | 14 ++++ csslintrc.json | 3 +- 7 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 app/styles/modules/search-result-table.scss create mode 100644 app/views/modules/search-result-table.jade diff --git a/app/search.jade b/app/search.jade index 8e5580c8..43de05f0 100644 --- a/app/search.jade +++ b/app/search.jade @@ -10,3 +10,4 @@ block content section.main.search-result include views/components/mainTitle include views/modules/search-filter + include views/modules/search-result-table \ No newline at end of file diff --git a/app/styles/main.scss b/app/styles/main.scss index c2dc4bf9..a4d2d3bf 100755 --- a/app/styles/main.scss +++ b/app/styles/main.scss @@ -40,6 +40,7 @@ $prefix-for-spec: true; @import 'modules/lightbox'; @import 'modules/taskboard-table'; @import 'modules/search-filter'; +@import 'modules/search-result-table'; // Responsive @import 'responsive/mobile'; diff --git a/app/styles/modules/backlog-table.scss b/app/styles/modules/backlog-table.scss index 6a5d0096..ac605440 100644 --- a/app/styles/modules/backlog-table.scss +++ b/app/styles/modules/backlog-table.scss @@ -13,7 +13,7 @@ flex-direction: row; flex-wrap: nowrap; justify-content: flex-start; - padding: .5em 0; + padding: 1rem 0 1rem 1rem; text-align: left; width: 100%; @for $i from 1 through 8 { diff --git a/app/styles/modules/search-filter.scss b/app/styles/modules/search-filter.scss index d0bf2653..f7c4db00 100644 --- a/app/styles/modules/search-filter.scss +++ b/app/styles/modules/search-filter.scss @@ -1,6 +1,8 @@ .search-filter { ul { + border-bottom: 3px solid $gray-light; display: flex; + padding-bottom: .5rem; } li { margin-right: 1rem; @@ -9,6 +11,7 @@ @extend %large; font-family: 'ostrichSans'; opacity: .2; + &.active, &:hover { @include transition (opacity .3s linear); color: $blackish; diff --git a/app/styles/modules/search-result-table.scss b/app/styles/modules/search-result-table.scss new file mode 100644 index 00000000..a0140714 --- /dev/null +++ b/app/styles/modules/search-result-table.scss @@ -0,0 +1,72 @@ +.search-result-table { + align-content: stretch; + align-items: center; + display: flex; + flex-direction: column; + flex-wrap: wrap; + justify-content: flex-start; + width: 100%; + .row { + align-content: stretch; + align-items: stretch; + display: flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: flex-start; + padding: 1rem 0 1rem 1rem; + text-align: left; + width: 100%; + @for $i from 1 through 8 { + .width-#{$i} { + flex-basis: 50px; + flex-grow: $i; + flex-shrink: 0; + } + } + &:hover { + background: lighten($green-taiga, 60%); + @include transition (background .2s ease-in); + } + } + .row-selected { + background: lighten($green-taiga, 60%); + @include transition (background .2s ease-in); + } + .user-story-name { + flex-basis: 500px; + input { + vertical-align: top; + } + span { + display: inline-block; + max-width: 70%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + .icon { + @extend %medium; + color: $gray-light; + &:hover { + color: $grayer; + @include transition (color .3s linear); + } + } + } + .title { + @extend %medium; + border-bottom: 1px solid $gray-light; + font-family: 'DroidSans-Bold'; + &:hover { + background: transparent; + } + } + .table-main { + @extend %small; + border-bottom: 1px solid $gray-light; + } + .status, + .points { + position: relative; + } +} diff --git a/app/views/modules/search-result-table.jade b/app/views/modules/search-result-table.jade new file mode 100644 index 00000000..5ab6d748 --- /dev/null +++ b/app/views/modules/search-result-table.jade @@ -0,0 +1,14 @@ +section.search-result-table + div.row.title + div.user-stories.width-4 User Stories + div.status.width-2 Status + div.points.width-1 Points + div.points.width-1 Sprints + - for (var x = 0; x < 50; x++) + div.row.table-main + div.user-stories.width-4 + div.user-story-name + a(href="") Crear el perfil de usuario Senior en el admin + div.status.width-2 Status + div.points.width-1 12 + div.points.width-1 54 \ No newline at end of file diff --git a/csslintrc.json b/csslintrc.json index 39936c38..0616cb74 100644 --- a/csslintrc.json +++ b/csslintrc.json @@ -18,5 +18,6 @@ "unqualified-attributes": false, "regex-selectors": false, "floats": false, - "fallback-colors": false + "fallback-colors": false, + "adjoining-classes": false } From 7cec5f2141c1727dd68fb3f061b55aafef677995 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Wed, 11 Jun 2014 10:22:34 +0200 Subject: [PATCH 8/8] jade plumber --- gulpfile.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index b43f6546..4bb24597 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -11,7 +11,8 @@ var gulp = require('gulp'), notify = require("gulp-notify"), connect = require('gulp-connect'), scsslint = require('gulp-scss-lint'), - newer = require('gulp-newer') + newer = require('gulp-newer'), + plumber = require('gulp-plumber'), cache = require('gulp-cached'); var paths = { @@ -28,12 +29,10 @@ var paths = { gulp.task('jade', function() { return gulp.src(paths.jade) + .pipe(plumber()) .pipe(jade({ pretty: true })) - .on('error', function(err) { - console.log(err); - }) .pipe(gulp.dest(paths.dist)) .pipe(size()); });