From 711074eed98294bd3b7c341cf0ec6e1bedb200aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Wed, 11 Jun 2014 16:17:58 +0200 Subject: [PATCH] Attachments module --- app/fonts/taiga.eot | Bin 5432 -> 5432 bytes app/fonts/taiga.ttf | Bin 5276 -> 5276 bytes app/fonts/taiga.woff | Bin 3652 -> 3652 bytes app/partials/views/modules/attachments.jade | 9 ++-- app/styles/dependencies/typography.scss | 2 +- app/styles/modules/attachments.scss | 43 +++++++++++++++++++- 6 files changed, 48 insertions(+), 6 deletions(-) diff --git a/app/fonts/taiga.eot b/app/fonts/taiga.eot index 775eee9d0b86b82eb569555832ca692bc8e12c4e..50000c398ba6dc7e03bae93708534dd1deab800f 100644 GIT binary patch delta 72 zcmdm?wL@!y4fBT|dK2yQnQm)N+z`t=J5+PB0Ar!F-j5IQ{5D@1xS1G0;QT%=aTvXM L4&y{&ZX^K!rXCi9 delta 72 zcmdm?wL@!y4YNX(;Y9mH^ef}+H!ZY0Ar!FVUSm&CI+xL2ZRCu{W=J$v-b>50cPnQi2wiq delta 74 zcmV-Q0JZnv-b>50mVrmjsO4v diff --git a/app/partials/views/modules/attachments.jade b/app/partials/views/modules/attachments.jade index f7a4cd08..4dac8daa 100644 --- a/app/partials/views/modules/attachments.jade +++ b/app/partials/views/modules/attachments.jade @@ -11,9 +11,12 @@ section.attachments div.single-attachment div.attachment-name span.icon.icon-document - a(href="", title="Attachment pefildeusuario.png") pefildeusuario.png + a(href="", title="Attachment pefildeusuario.png") pefildeusuariopefildeusuariopefildeusuario.png div.attachment-comment span Comentario sobre el contenido span.attachment-size (125kb.) - a.icon.icon-edit(href="","Edit") - a.icon.icon-drag-v(href="","Drag") + a.settings.icon.icon-edit(href="","Edit") + a.settings.icon.icon-drag-v(href="","Drag") + a.more-attachments(href="", title="show atachments history") + span + show atachments history + span.more-attachments-num (3 more) diff --git a/app/styles/dependencies/typography.scss b/app/styles/dependencies/typography.scss index e390eeab..547435f0 100755 --- a/app/styles/dependencies/typography.scss +++ b/app/styles/dependencies/typography.scss @@ -177,7 +177,7 @@ a:visited { .icon-fontawesome-webfont:before { content: 'u'; } -.icon-fontawesome-webfont-1:before { +.icon-document:before { content: 'v'; } .icon-clipboard-notes:before { diff --git a/app/styles/modules/attachments.scss b/app/styles/modules/attachments.scss index 3fb65111..cb4e44b6 100644 --- a/app/styles/modules/attachments.scss +++ b/app/styles/modules/attachments.scss @@ -1,3 +1,7 @@ +.attachments { + margin-bottom: 2rem; +} + .attachments-header { background: $whitish; @include clearfix; @@ -21,22 +25,57 @@ @extend %small; border-bottom: 1px solid #cdcdcd; padding: 1rem 0 1rem 1rem; + position: relative; &:last-child { border: 0; } .attachment-name { + @include ellipsis(200px); @include table-flex-child(1, 200px); + padding-right: 1rem; + .icon { + margin-right: .5rem; + } } .attachment-comment { - @include table-flex-child(3, 300px); + @include table-flex-child(10, 300px); .attachment-size { color: $gray-light; margin-left: .5rem; } } - .icon { + .settings { @extend %large; color: $gray-light; display: none; } + &:hover { + @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; + .more-attachments-num { + color: $green-taiga; + margin-left: .5rem; + } }