From 798457b7d9d2f9b488db2d37bf1eef9b24b4194f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Fri, 1 Aug 2014 12:48:52 +0200 Subject: [PATCH] Restyle for attachments --- app/coffee/modules/common/attachments.coffee | 32 ++++--- app/fonts/taiga.eot | Bin 5940 -> 6108 bytes app/fonts/taiga.svg | 20 +++-- app/fonts/taiga.ttf | Bin 5784 -> 5952 bytes app/fonts/taiga.woff | Bin 4320 -> 4452 bytes app/partials/views/modules/attachments.jade | 2 +- app/styles/dependencies/typography.scss | 24 +++-- app/styles/modules/common/attachments.scss | 89 +++++++++++++------ 8 files changed, 110 insertions(+), 57 deletions(-) diff --git a/app/coffee/modules/common/attachments.coffee b/app/coffee/modules/common/attachments.coffee index b39daa88..e092a99e 100644 --- a/app/coffee/modules/common/attachments.coffee +++ b/app/coffee/modules/common/attachments.coffee @@ -154,16 +154,23 @@ module.directive("tgAttachments", ["$tgRepo", "$tgResources", AttachmentsDirecti AttachmentDirective = ($log, $repo, $confirm) -> singleAttachment = _.template("""
- - <%- name %> + + + <%- name %> +
-
- (<%- size %>) +
+ <%- size %> +
+
+ <%- description %>
- - - +
+ + + +
""") #TODO: i18n singleAttachmentEditable = _.template(""" @@ -171,8 +178,10 @@ AttachmentDirective = ($log, $repo, $confirm) -> <%- name %>
+
+ <%- size %> +
- (<%- size %>) @@ -182,8 +191,10 @@ AttachmentDirective = ($log, $repo, $confirm) -> <% if (isDeprecated){ %>checked<% } %> />
- - +
+ + +
""") # TODO: i18n link = ($scope, $el, $attrs) -> @@ -208,6 +219,7 @@ AttachmentDirective = ($log, $repo, $confirm) -> if attachment.is_deprecated $el.addClass("deprecated") + $el.find(".deprecated-file").removeClass('hidden') if $scope.showDeprecatedAttachments $el.removeClass("hidden") else diff --git a/app/fonts/taiga.eot b/app/fonts/taiga.eot index b168712c2a2d285314d3792084ef4355961ef545..2c8a90f66fb9162967f99083261078aa0c56e69b 100644 GIT binary patch delta 868 zcmYk4T}V>_6vzMPe&6Zt-D9tJ|QHz z!Bu5#qHA>c=*JmA4+E&|-P7HJGz38B0Mw-SHO14*hu;FUAHdM?XeM`a>8b+IZ-53) zX3pn|MX-SO8-R2&d+Ef>_?K~jy$iT+of^p;C!=@9a#3JxogD+{1%STnx#7(2#*RgR z?FY~^nz@+6X-omsYS%rR86COSw7vj%>i{~FJ9qv9_mIm1+8qEVK!9y)%Ie?|we2U$ z7})Ze*nxk(SYWUbmuzP}r3MOGU+M9ITG+Y;wWve_Lr7r+b{}lXDmU^2ePB1J5*&8g z^KE7V(2dK*;zr3`$k~^pq|i(6=?%656bTtY(XFM(>(LVNPD;d0de5kZyDGyfDTgTY4c`=& z9=lwH6(uA(q#X(X1|ta3G%ceX9)Mb!>q&Hb5=Ok8YFiTVc1pNuT7Gm@rm$T2b4bq8 zJFj%5up~)i&Z-~s!NOB}oBc@9b6P|TU?0i(h<6$=}&asRj`IP@vC!mVk``c!oI6d`3ItAiA&^$ESW1MfUS_jFF zs~yw8`_aF6hOxA$&<-qr>mop zNz2L{aV%P;*NWY!Iz215M zi7LO(_b%KS4uw+j)M{_e8O8im5S1t(kfbmU_QJej%K>>vkU z)-O@d*(}R=n9i~jmBlP8cvxowg8}+5V8R&aGY8ccS0xq1sWI2oh+J6_uQ9)?DYIM) ii;&r-U6i84%$Hg)7DOP!;U6D1x7oG+_h - - - - - - - - - + + + + + + + + + + + diff --git a/app/fonts/taiga.ttf b/app/fonts/taiga.ttf index ce475328c84a303af1b6804adfae7bd16b486f20..96c7df22685a106ab31d5643a996db97f3d17a6c 100644 GIT binary patch delta 921 zcmYL|OKcle6o$VuGoFWoXX0XytvU(uBX%K8+SrX9$s_^MCYzR60V<%pOzSoRhZwbs zzyhd=khCIW=`5S7Z*)bl46-uPu5Vi}-k`slGKX3!y~0sS-29m>z#edR}x7lD(f=c|oR zw=dct4?$+nRnIqCEmUwH0_M5;duPAP|Got3Duh3qt5wfPa(W%u0g7{TwPsa2tf(Ln zATu|AVbOY^HbJfd$LkBHtIrHi+yb=%OwCsp8@$B|$e3TyJJtEx$A=!=gy;c~w;K!R zFKAzBb#Oli&bFHq_{+Zc!t2hHf77MlpWj5C-Lr~1ds)UM|fJ_hKaz)8x~ z@bjvj*VB#%$5GqVgT`UMQB3v%ALIR2tDWL$sy?-LT3;gGQKh2wJ=UM}-c=Ibma-ka z9Jr^SF*3%R#y7@}dC+{;Y?wc9Evu#A)~j|#Zwh6m<+l95qafLIGG&C_vP2_pAwMaF zd`WIA&hDzCsCGGMSb?EGZB?#xckljTr;VU_&;}H0q-9O+@(2--(IbOmgd>Gyeq07d z3;A&=gk{b8`l2NnYxmz%R$XpH&5w4sO|u#5yKlX``z;6+%5qh1F$$$rE?X*2N-^d- zk}DN+Sx0P%xus%hLQ2Iwhn~w$%7nyRLw7_sQudUn9xfQ#|2| zsaa?Q`J}@ET-H0R6Xd4nMo$Gs7-Gy@jAqo4p)qeGTJi2j`z7V=bH`5%kR``~w)E0! jp|mskD#Y79|F4on@Hc61Sp3c7&TBvY#H)(PQ0T&&x>CA|^vbg6vI{RF45XXIS%aR3m-qL)@ciHB<9+RXbQ%GaF@sDh zne6Ty?VH*H^)BE$d-_b0P83jkfk4;AW3jHUz3)I=0(u69)48#Y2e&}%gSb4D9?#|T z$e?xu_Mz;Z8*7grZh$-w2YzG*)7M4S-WIR}G-Wb_(`iecB!ln(q0I2aWXU7>5QsNG zM|N}|eWIgr9b{9mZ8$xdBf}hs<7Po4>EXe>{n0t_%zzlljgC)P?pc!H{R#9JniFv0 zoBaH0`N`inB~1I6-`@RqOWV6oM6(DO3Gw1efSQ84sKG}AJzzFdIKF}wbR!qYhXu0+ z2X-V(*;Y<7mCqMGXr-OB$@!i9m;92MVVsguGF5(KO!67a(&oW_>u04-d1cGmUfO=y zL-vW)r*hmeEeIgQcL|~ps*Z#k^%l_-(^OBnP^u$gy+vp?#iOY$qDha0tILHM#LQPw zF{|tPN+=r&hZieaD>N-po3L7)&PBJ|)#O?U2L0Fksc1^*vGeEj*P&4OX3aCLLTlF& z(S%ZJbvhT^WsPo^YdP2(3)dlSq>91{-}Q8H!8Kt(*Jwh-u(+qX_V>! diff --git a/app/fonts/taiga.woff b/app/fonts/taiga.woff index 34faeb3814fc9ffd7d323a56a0583573731c33fd..b91b99d58919ca4f00b986dbc132d5e299c02972 100644 GIT binary patch delta 4332 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 diff --git a/app/partials/views/modules/attachments.jade b/app/partials/views/modules/attachments.jade index a6935313..43224e16 100644 --- a/app/partials/views/modules/attachments.jade +++ b/app/partials/views/modules/attachments.jade @@ -4,7 +4,7 @@ section.attachments(tg-attachments, ng-model=attachModel) div.attachments-header h3.attachments-title - span.icon.icon-attachment + span.icon.icon-attachments span.attachments-num 0 span.attachments-text attachments a.button.button-gray.add-attach(href="", title="Add new attachment") diff --git a/app/styles/dependencies/typography.scss b/app/styles/dependencies/typography.scss index 92e420ea..b46480d3 100755 --- a/app/styles/dependencies/typography.scss +++ b/app/styles/dependencies/typography.scss @@ -185,30 +185,36 @@ a:visited { .icon-plus:before { content: 't'; } -.icon-attachment:before { +.icon-reload:before { content: 'u'; } -.icon-reload:before { +.icon-warning:before { content: 'v'; } -.icon-warning:before { +.icon-notification-error:before { content: 'w'; } -.icon-notification-error:before { +.icon-github:before { content: 'x'; } -.icon-github:before { +.icon-check-square:before { content: 'y'; } -.icon-check-square:before { +.icon-warning-alt:before { content: 'z'; } -.icon-warning-alt:before { +.icon-floppy:before { content: 'A'; } -.icon-floppy:before { +.icon-bulk:before { + content: 'B'; +} +.icon-comment:before { content: 'C'; } -.icon-bulk:before { +.icon-documents:before { content: 'D'; } +.icon-attachments:before { + content: 'E'; +} diff --git a/app/styles/modules/common/attachments.scss b/app/styles/modules/common/attachments.scss index 1536c9bf..fefd41ea 100644 --- a/app/styles/modules/common/attachments.scss +++ b/app/styles/modules/common/attachments.scss @@ -29,25 +29,70 @@ &:last-child { border: 0; } + &:hover { + .attachment-settings { + .settings { + @include transition (opacity .2s ease-in); + opacity: 1; + } + } + } + &.ui-sortable-helper { + @include transition (background .2s ease-in); + background: lighten($green-taiga, 60%); + box-shadow: 1px 1px 10px rgba($black, .1); + } + &.deprecated { + color: $gray-light; + .attachment-name a { + color: $gray-light; + } + } .attachment-name { @include ellipsis(200px); - @include table-flex-child(1, 200px); + @include table-flex-child(1, 300px); + @extend %bold; padding-right: 1rem; .icon { margin-right: .5rem; } } - .attachment-comment { + .attachment-size { + @include table-flex-child(1, 100px); + color: $gray-light; + margin-right: .5rem; + } + .attachment-comments { @include table-flex-child(10, 300px); - .attachment-size { + } + .attachment-settings { + @include table-flex-child(1, 100px); + .settings { + @extend %large; color: $gray-light; - margin-left: .5rem; + display: block; + opacity: 0; + position: absolute; + top: 1rem; + &:hover { + color: $green-taiga; + } + } + .icon-edit { + right: 4rem; + } + .icon-delete { + right: 2rem; + &:hover { + color: $red; + } + } + .icon-drag-v { + cursor: move; + right: 0; } } - .settings { - @extend %large; - color: $gray-light; - } + // REFACTOR // .editable { @include table-flex-child(10, 300px); } @@ -89,35 +134,23 @@ display: block; } } - &:hover { - &:not(.edit) { - @include transition (background .2s ease-in); - background: lighten($green-taiga, 60%); - .settings { - @include transition (opacity .2s ease-in); - display: block; - position: absolute; - top: 1rem; - } - .icon-edit { - right: 4rem; - } - .icon-drag-v { - cursor: move; - right: 1rem; - } - } - } + } .more-attachments { @extend %small; border-bottom: 1px solid $gray-light; - color: $gray-light; display: block; padding: 1rem 0 1rem 1rem; + span { + color: $gray-light; + } .more-attachments-num { color: $green-taiga; margin-left: .5rem; } + &:hover { + @include transition (background .2s ease-in); + background: lighten($green-taiga, 60%); + } }