From f38635fd1f1ae11a0d8c01e36f25f5005b76f49a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Tue, 29 Jul 2014 17:15:36 +0200 Subject: [PATCH] Blocked warning refactor --- app/fonts/taiga.eot | Bin 7216 -> 7368 bytes app/fonts/taiga.svg | 1 + app/fonts/taiga.ttf | Bin 7060 -> 7212 bytes app/fonts/taiga.woff | Bin 4952 -> 5076 bytes app/partials/issues-detail-edit.jade | 12 ++-- app/partials/issues-detail.jade | 12 ++-- app/partials/task-detail-edit.jade | 12 ++-- app/partials/task-detail.jade | 12 ++-- app/partials/us-detail-edit.jade | 12 ++-- app/partials/us-detail.jade | 12 ++-- app/styles/dependencies/typography.scss | 3 + app/styles/layout/us-detail.scss | 83 +++++++++++++++--------- 12 files changed, 89 insertions(+), 70 deletions(-) diff --git a/app/fonts/taiga.eot b/app/fonts/taiga.eot index e241754a0d06fef4c6b45aaa540fa5014bfe1364..4e72611cd5ad853bf7f2ecd303284ee0c5b703d6 100644 GIT binary patch delta 557 zcmYk2KWGzi6vsdB?!1OvdTFG&VDH-0Xi~(`LTqCL1r`4xf*m4as~AE(>(HcuN~t(> zP&3t`{t9&v1*bYxDp?CoLI=^ITcKMAhYm$4F51XNL?3+lJ|5rq@4Gg0)#~065CdLXS@HznR@`a0+C}M)U2lS2>2Xdp^w?BZ~1a3@J%C%Lm@eMQsCLLk-J^vr`pBgRv3=YT2#0mjXxtx|MkA4?;MFTV=8f80FK zXw^f1NWGJjl2KdoalnJ%<`%rxG?@TzSa;Nh{gMFEl+*z;J*Xyqqe1E}TjX7Gxa3Y7LUF*tNR-`=|wybcE z?9>C*!4E%>ZE9|8Hla&2G8?jE&bDPot#H_i+E!TEUHei{hI>K^s^6WFjC$i<)w7^> O-EK*%u;*I;8TcCohj+yQ delta 447 zcmYL_ODIHf6vlu5d#_0;6jQi2ZwpyqYD6i@v&d+sq)Bueuf@#VshPyeLdpWsUmj&k zlZ7Vslp-s$RLai6nlxoGSN9G%^>rSd$M>Dbo=mr=!+-;Q-_xaqeb4^={#azNG6(u9 zV2lh74HLuz`ZQ1<2(|kHuQRtGoO~)0GZRcv= z^&Pz1%M0eb&~|gOT-2@afXD#Bs1-3MZbE5LPl556xthS@2t>DYHEzZhK6BO)RHs11 z6IL=+RHki0%^MI!fCK-tFFaS)`$dU@W7&`M{J*#J3U0l);N+!f6D{&Z+_yVT>Msm; z8|laajpCjt1*%-ePOj37K!XC!0-fya!}q_Gg0vs$^J9Pj diff --git a/app/fonts/taiga.svg b/app/fonts/taiga.svg index 8bfe4808..3d754751 100644 --- a/app/fonts/taiga.svg +++ b/app/fonts/taiga.svg @@ -41,4 +41,5 @@ + diff --git a/app/fonts/taiga.ttf b/app/fonts/taiga.ttf index d6db0a2889ea37837454df0171e2ae9c7c360a53..79b6f95f70ef21578758e487896cc78ec30e10eb 100644 GIT binary patch delta 587 zcmX|-KWGyH7{!0z-I<15npjCMGYHa2t+xOi@8%z+j=cSPzxe*C20!nT7J4 zGy5^O3hHy3j^fSOgk{n`?A@7#*NQS)kO5FRUta`81GnyWO^&Ry|cSFO%l5N?hgDAa>0Lehi zurp~TnM!ADBQ_k7elg-k=9G*ck&ZxjEN&dP$1NNu+c=+!+n&dZ(do?Xd$ gg~VaWddrEbq`ZK6Q5^wq+U%7fuVk9~{}QwIUq{w^6951J delta 453 zcmXw$JxE(&6o#MgepiW=;$oo9z4+5ci<4Don?VI3M#1`nmLjDppEgZ~BsY*C(ItYo zRS`c?kZy$#ij-pa76)A&UF_CDp_3v3X%o3O@xbA{=Wu@Bmva!>d6h>14_QSr8Hv0Z zbHdFfuyTMs93F}=MLk$EK-$N*@-#`N1$j?8a0kU8x|!ngo2Y z#PY|?lKKkr0{oxiQT0KXn0ANwt zUd>}|VQ>Hd5xf8Z0FnRz0hpWLp}=TmVPpUR5>NmD04o3h05$;`vtMXvWnlmS5_|vv z02}}S03-xQFaiN+ZFG1501}u0002S&002w~ZUd)nVR&!=0215)000I6000I6Bv1fu zVQpmq021T?007oFQhGt<+r)9)EcGb33t60&S#2R}l9uo%o{lj2d3AK6`R zk*ySgg>qp+47Itl+bXi>_KajHhD}dZt92jeoO|v$=lkxh;Hs*)ii!%Mt!c}Tnz)Ke zu7ZENwfNVS#l`cAU#l|bSHS#vFuy8N%`Lir;hz9zKIV&{7qi7IznI&)U@^yCxR^V7 z(PD1#;)^d@$W<~i0#_3XElI}bHtu%rTimy~JGe&fJKUYzUEJN=J=}M>?{W8X_i_Kg zeV@CZdw^Tbt>M;k>$nHGf8;LZ)^nF}mvev1xCZX)+!fs4a947dGuf5g^<05_r9!Cq z+luY;YUll`YH8K8{Kb3+{~yBN2}8o~#5LsO3tBJutmcXNyS~!+m5*yz*S@#l^9%bf zy62)p3%~i*#=5hTR$o_J%vKe%Q}`2JE;dQaXyaM&ME%qX+E`p6PAv~sNK0wse~W)X zV{ol>1#SGjSWACX%t-Xo;8FS76CWXIkPLJwRm8lZz=8YY-v5jY#{G+=7U>o4rz{EIVht~zmopJmsH z;wEY8+RuvDiYM!*uK&1rz4(eQO|5_U0~%OM+lpCp-t)q3Hd`1^UAFH}#)pfzVVBWje{qc|QzE9`Td8^*PBw9O+LJClP zz$gGrT^zg!!G*zvKo{Hx{EPIA6uf-$yW%ficO5zeK>rDC^Oepk3~YcX!9TF26e;FUZ3%3ZwpT zzEH>y`=dZcVOTE2^WA1 zXQumOLp#QZ9uC()H*}qBdYpexIY~Qdlhi9bFj4r!J|K4q3aGk~){|PN)|%9kT1p|C z4)WM->YzeWj>qFY$%G>7nxW$i-Nde3cYjZ&k0?nM$CEWF9<>;#hz-!l-6GR#v5|%i z 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 H0FD3!RTm99 diff --git a/app/partials/issues-detail-edit.jade b/app/partials/issues-detail-edit.jade index 2b2a6ab9..3ddbb40d 100644 --- a/app/partials/issues-detail-edit.jade +++ b/app/partials/issues-detail-edit.jade @@ -12,14 +12,12 @@ block content a.button.button-green.save-issue(href="", title="Save") Save section.us-story-main-data - div.us-title + div.us-title(ng-class="{blocked: issue.is_blocked}") input(type="text", ng-model="issue.subject") - - div.blocked-warning(ng-show="issue.is_blocked") - span.icon.icon-warning - p.blocked Blocked! - p(tg-bind-html="issue.blocked_note || 'This issue is blocked'") - a.button.button-red.button-block.unblock(ng-click="ctrl.unblock()", href="", title="Unblock US") Unblock + p.block-desc-container(ng-show="issue.is_blocked") + span.block-description-title Blocked + span.block-description(tg-bind-html="issue.blocked_note || 'This issue is blocked'") + a.unblock(ng-click="ctrl.unblock()", href="", title="Unblock issue") Unblock div.user-story-tags(tg-tag-line, editable="true", ng-model="issue.tags") diff --git a/app/partials/issues-detail.jade b/app/partials/issues-detail.jade index 0cfdaae5..8f972ffb 100644 --- a/app/partials/issues-detail.jade +++ b/app/partials/issues-detail.jade @@ -12,20 +12,18 @@ block content a.button.button-green(href="", title="Edit", tg-nav="project-issues-detail-edit:project=project.slug,ref=issue.ref") Edit section.us-story-main-data - div.us-title + div.us-title(ng-class="{blocked: issue.is_blocked}") h2.us-title-text span.us-number(tg-bo-html="issue.ref") span.us-name(ng-bind="issue.subject") + p.block-desc-container(ng-show="issue.is_blocked") + span.block-description-title Blocked + span.block-description(tg-bind-html="issue.blocked_note || 'This issue is blocked'") div.issue-nav a.icon.icon-arrow-left(ng-show="nextUrl", href="{{ nextUrl }}", title="next issue") a.icon.icon-arrow-right(ng-show="previousUrl",href="{{ previousUrl }}", title="previous issue") - div.blocked-warning(ng-show="issue.is_blocked") - span.icon.icon-warning - p.blocked Blocked! - p(tg-bind-html="issue.blocked_note || 'This issue is blocked'") - - div.user-story-tags(tg-tag-line, ng-model="issue.tags") + div.user-story-tags(tg-tag-line, ng-model="issue.tags", ng-show="issue.tags") section.us-content.wysiwyg(tg-bind-html="issue.description_html") diff --git a/app/partials/task-detail-edit.jade b/app/partials/task-detail-edit.jade index e6bdefe1..5731466b 100644 --- a/app/partials/task-detail-edit.jade +++ b/app/partials/task-detail-edit.jade @@ -12,14 +12,12 @@ block content a.button.button-green.save-task(href="", title="Save") Save section.us-story-main-data - div.us-title + div.us-title(ng-class="{blocked: task.is_blocked}") input(type="text", ng-model="task.subject") - - div.blocked-warning(ng-show="task.is_blocked") - span.icon.icon-warning - p.blocked Blocked! - p(tg-bind-html="task.blocked_note || 'This task is blocked'") - a.button.button-red.button-block.unblock(ng-click="ctrl.unblock()", href="", title="Unblock US") Unblock + p.block-desc-container(ng-show="task.is_blocked") + span.block-description-title Blocked + span.block-description(tg-bind-html="task.blocked_note || 'This task is blocked'") + a.unblock(ng-click="ctrl.unblock()", href="", title="Unblock task") Unblock div.user-story-tags(tg-tag-line, editable="true", ng-model="task.tags") diff --git a/app/partials/task-detail.jade b/app/partials/task-detail.jade index d5bb6339..bd7dae91 100644 --- a/app/partials/task-detail.jade +++ b/app/partials/task-detail.jade @@ -12,20 +12,18 @@ block content a.button.button-green(href="", title="Edit", tg-nav="project-tasks-detail-edit:project=project.slug,ref=task.ref") Edit section.us-story-main-data - div.us-title + div.us-title(ng-class="{blocked: task.is_blocked}") h2.us-title-text span.us-number(tg-bo-html="task.ref") span.us-name(ng-bind="task.subject") + p.block-desc-container(ng-show="task.is_blocked") + span.block-description-title Blocked + span.block-description(tg-bind-html="task.blocked_note || 'This task is blocked'") div.issue-nav a.icon.icon-arrow-left(ng-show="nextUrl", href="{{ nextUrl }}", title="next task") a.icon.icon-arrow-right(ng-show="previousUrl",href="{{ previousUrl }}", title="previous task") - div.blocked-warning(ng-show="task.is_blocked") - span.icon.icon-warning - p.blocked Blocked! - p(tg-bind-html="task.blocked_note || 'This task is blocked'") - - div.user-story-tags(tg-tag-line, ng-model="task.tags") + div.user-story-tags(tg-tag-line, ng-model="task.tags", ng-show="task.tags") section.us-content.wysiwyg(tg-bind-html="task.description_html") diff --git a/app/partials/us-detail-edit.jade b/app/partials/us-detail-edit.jade index af572dc8..bc6b1bda 100644 --- a/app/partials/us-detail-edit.jade +++ b/app/partials/us-detail-edit.jade @@ -12,14 +12,12 @@ block content a.button.button-green.save-us(href="", title="Save") Save section.us-story-main-data - div.us-title + div.us-title(ng-class="{blocked: us.is_blocked}") input(type="text", ng-model="us.subject") - - div.blocked-warning(ng-show="us.is_blocked") - span.icon.icon-warning - p.blocked Blocked! - p(tg-bind-html="us.blocked_note || 'This user story is blocked'") - a.button.button-red.button-block.unblock(ng-click="ctrl.unblock()", href="", title="Unblock US") Unblock + p.block-desc-container(ng-show="us.is_blocked") + span.block-description-title Blocked + span.block-description(tg-bind-html="us.blocked_note || 'This US is blocked'") + a.unblock(ng-click="ctrl.unblock()", href="", title="Unblock US") Unblock div.user-story-tags(tg-tag-line, editable="true", ng-model="us.tags") diff --git a/app/partials/us-detail.jade b/app/partials/us-detail.jade index bceb6c69..1099a4a5 100644 --- a/app/partials/us-detail.jade +++ b/app/partials/us-detail.jade @@ -12,20 +12,20 @@ block content a.button.button-green(href="", title="Edit", tg-nav="project-userstories-detail-edit:project=project.slug,ref=us.ref") Edit section.us-story-main-data - div.us-title + div.us-title(ng-class="{blocked: us.is_blocked}") h2.us-title-text span.us-number(tg-bo-html="us.ref") span.us-name(ng-bind="us.subject") + + p.block-desc-container(ng-show="us.is_blocked") + span.block-description-title Blocked + span.block-description(tg-bind-html="us.blocked_note || 'This user story is blocked'") div.issue-nav a.icon.icon-arrow-left(ng-show="nextUrl", href="{{ nextUrl }}", title="next user story") a.icon.icon-arrow-right(ng-show="previousUrl",href="{{ previousUrl }}", title="previous user story") - div.blocked-warning(ng-show="us.is_blocked") - span.icon.icon-warning - p.blocked Trolrororo! - p(tg-bind-html="us.blocked_note || 'This user story is blocked'") - div.user-story-tags(tg-tag-line, ng-model="us.tags") + div.user-story-tags(tg-tag-line, ng-model="us.tags", ng-show="us.tags") section.us-content.wysiwyg(tg-bind-html="us.description_html") diff --git a/app/styles/dependencies/typography.scss b/app/styles/dependencies/typography.scss index 1756ebc8..28f693a0 100755 --- a/app/styles/dependencies/typography.scss +++ b/app/styles/dependencies/typography.scss @@ -227,3 +227,6 @@ a:visited { .icon-check-square:before { content: 'H'; } +.icon-warning-alt:before { + content: 'I'; +} diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss index 59ddbf48..f78f9cfb 100644 --- a/app/styles/layout/us-detail.scss +++ b/app/styles/layout/us-detail.scss @@ -13,10 +13,33 @@ .us-title { @extend %large; @extend %text; + @include transition(all .2s linear); background: $whitish; - margin-bottom: 1rem; - padding: 2rem 1rem; + margin-bottom: .5rem; + padding: 1rem; position: relative; + &.blocked { + background: $red; + vertical-align: middle; + @include transition(all .2s linear); + .us-title-text, + input { + margin-bottom: .5rem; + } + .us-number, + .us-name { + color: $white; + } + .unblock { + @extend %bold; + color: $white; + float: right; + &:hover { + @include transition(color .3s linear); + color: $red-light; + } + } + } input { background: $white; } @@ -37,42 +60,44 @@ text-transform: uppercase; white-space: nowrap; } - } - .blocked-warning { - background: $red; - color: $white; - margin-bottom: 1rem; - padding: 1rem; - position: relative; - .icon { - @extend %xxlarge; - display: inline; - left: 1rem; - position: absolute; - top: 1rem; - } - .blocked { - @extend %xlarge; - @extend %bold; - margin-bottom: .3em; - } - p { + .block-desc-container { + @extend %small; margin-bottom: 0; - margin-left: 4rem; - margin-right: 10rem; } - .button-block { - position: absolute; - right: 1rem; - top: 1rem; + .block-description-title { + @extend %bold; + color: $white; + margin-right: .5rem; } + .block-description { + color: $white; + } + } +} + +.blocked-warning { + margin-bottom: 1rem; + .blocked { + @extend %title; + @extend %xlarge; + color: $red; + line-height: 2.5rem; + margin-bottom: .5rem; + } + .icon { + @extend %xlarge; + vertical-align: middle; + } + .block-description { + color: $grayer; + margin: 0; } } .issue-nav { position: absolute; right: 1rem; - top: 1.5rem; + top: .7rem; a { @extend %xlarge; }