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 b168712c..2c8a90f6 100644 Binary files a/app/fonts/taiga.eot and b/app/fonts/taiga.eot differ diff --git a/app/fonts/taiga.svg b/app/fonts/taiga.svg index 1b5bb70f..67ec4c4d 100644 --- a/app/fonts/taiga.svg +++ b/app/fonts/taiga.svg @@ -27,13 +27,15 @@ - - - - - - - - - + + + + + + + + + + + diff --git a/app/fonts/taiga.ttf b/app/fonts/taiga.ttf index ce475328..96c7df22 100644 Binary files a/app/fonts/taiga.ttf and b/app/fonts/taiga.ttf differ diff --git a/app/fonts/taiga.woff b/app/fonts/taiga.woff index 34faeb38..b91b99d5 100644 Binary files a/app/fonts/taiga.woff and b/app/fonts/taiga.woff differ 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%); + } }