From b93b0e90eb013c0b47ec1c16c73afe02565995e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Wed, 2 Jul 2014 12:01:07 +0200 Subject: [PATCH] refactorized tags --- app/partials/issues-detail-edit.jade | 5 ++++- app/partials/issues-detail.jade | 5 ++++- app/styles/components/tag.scss | 10 ++++++++-- app/styles/layout/us-detail.scss | 8 ++++++++ 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/app/partials/issues-detail-edit.jade b/app/partials/issues-detail-edit.jade index 59600f1c..0b8be0a2 100644 --- a/app/partials/issues-detail-edit.jade +++ b/app/partials/issues-detail-edit.jade @@ -22,7 +22,10 @@ block content // a.button.button-red.button-block(href="", title="Unblock US") Unblock div.user-story-tags(tg-tag-line="editable", ng-model="issue.tags") - span.tags-container + div.tags-container + div.tag + span.tag-name attachments + a.icon.icon-delete.hidden(href="", title="delete tag") input.hidden(type="text", placeholder="Write tag...") section.us-content diff --git a/app/partials/issues-detail.jade b/app/partials/issues-detail.jade index 3d5db965..03a2412d 100644 --- a/app/partials/issues-detail.jade +++ b/app/partials/issues-detail.jade @@ -23,7 +23,10 @@ block content // a.button.button-red.button-block(href="", title="Unblock US") Unblock div.user-story-tags(tg-tag-line="editable", ng-model="issue.tags") - span.tags-container + div.tags-container + div.tag + span.tag-name attachments + a.icon.icon-delete(href="", title="delete tag") input.hidden(type="text", placeholder="Write tag...") section.us-content(tg-bind-html="issue.description_html") diff --git a/app/styles/components/tag.scss b/app/styles/components/tag.scss index 74ff5863..bcac487a 100644 --- a/app/styles/components/tag.scss +++ b/app/styles/components/tag.scss @@ -3,7 +3,13 @@ color: $white; display: inline-block; margin: 0 .5rem .5rem 0; - padding: 3px; + padding: .2rem .5rem; text-align: center; - width: 7rem; + .icon-delete { + color: $white; + margin-left: 1rem; + &:hover { + color: $red; + } + } } diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss index 5267fba1..fcf4218f 100644 --- a/app/styles/layout/us-detail.scss +++ b/app/styles/layout/us-detail.scss @@ -14,6 +14,7 @@ @extend %large; @extend %text; background: $whitish; + margin-bottom: 1rem; padding: 2rem 1rem; text-transform: uppercase; .us-number { @@ -72,10 +73,17 @@ } .user-story-tags { + .tags-container { + display: inline-block; + vertical-align: middle; + } input { display: inline-block; width: 14rem; } + .tag { + padding: .6rem .5rem; + } } .us-activity-tabs {