From a91db557d345e9e1cb4761dc8e4769c612022f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Tue, 21 Oct 2014 10:56:32 +0200 Subject: [PATCH] Fix style and directives template refactor on right sidebar of details --- app/coffee/modules/common/components.coffee | 12 ++++--- app/partials/issues-detail.jade | 10 +++--- app/partials/task-detail.jade | 2 +- app/partials/us-detail.jade | 2 +- app/styles/components/watchers.scss | 2 +- app/styles/layout/us-detail.scss | 39 +++++++-------------- app/styles/modules/common/assigned-to.scss | 17 ++++++++- 7 files changed, 44 insertions(+), 40 deletions(-) diff --git a/app/coffee/modules/common/components.coffee b/app/coffee/modules/common/components.coffee index 4582712a..7eb8876c 100644 --- a/app/coffee/modules/common/components.coffee +++ b/app/coffee/modules/common/components.coffee @@ -272,11 +272,13 @@ AssignedToDirective = ($rootscope, $confirm, $repo, $loading) -> Assigned to - <% if (assignedTo) { %> - <%- assignedTo.full_name_display %> - <% } else { %> - Not assigned - <% } %> + + <% if (assignedTo) { %> + <%- assignedTo.full_name_display %> + <% } else { %> + Not assigned + <% } %> + <% if (assignedTo!==null) { %> diff --git a/app/partials/issues-detail.jade b/app/partials/issues-detail.jade index 3b2dfeb4..41b3eedf 100644 --- a/app/partials/issues-detail.jade +++ b/app/partials/issues-detail.jade @@ -43,12 +43,12 @@ block content h1(tg-issue-status-display, ng-model="issue") tg-created-by-display.us-created-by(ng-model="issue") div.issue-data - tg-issue-type-button(ng-model="issue") - tg-issue-severity-button(ng-model="issue") - tg-issue-priority-button(ng-model="issue") - tg-issue-status-button(ng-model="issue") + div.duty-data(tg-issue-type-button, ng-model="issue") + div.duty-data(tg-issue-severity-button, ng-model="issue") + div.duty-data(tg-issue-priority-button, ng-model="issue") + div.duty-data(tg-issue-status-button, ng-model="issue") - section.us-assigned-to(tg-assigned-to, ng-model="issue") + section.duty-assigned-to(tg-assigned-to, ng-model="issue") section.watchers(tg-watchers, ng-model="issue") diff --git a/app/partials/task-detail.jade b/app/partials/task-detail.jade index c61b8557..ba4a3508 100644 --- a/app/partials/task-detail.jade +++ b/app/partials/task-detail.jade @@ -47,7 +47,7 @@ block content tg-created-by-display.us-created-by(ng-model="task") tg-task-status-button.issue-data(ng-model="task") - section.us-assigned-to(tg-assigned-to, ng-model="task") + section.duty-assigned-to(tg-assigned-to, ng-model="task") section.watchers(tg-watchers, ng-model="task") diff --git a/app/partials/us-detail.jade b/app/partials/us-detail.jade index f458d391..3c840d15 100644 --- a/app/partials/us-detail.jade +++ b/app/partials/us-detail.jade @@ -53,7 +53,7 @@ block content tg-us-estimation(ng-model="us", save-after-modify="true") tg-us-status-button.issue-data(ng-model="us") - section.us-assigned-to(tg-assigned-to, ng-model="us") + section.duty-assigned-to(tg-assigned-to, ng-model="us") section.watchers(tg-watchers, ng-model="us") diff --git a/app/styles/components/watchers.scss b/app/styles/components/watchers.scss index 63afee95..303fa7f9 100644 --- a/app/styles/components/watchers.scss +++ b/app/styles/components/watchers.scss @@ -1,5 +1,5 @@ .watchers { - margin-top: 2rem; + margin-top: 1rem; .watchers-header { border-bottom: 2px solid $gray-light; padding: .5rem; diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss index 5fb06ab3..4dc1372f 100644 --- a/app/styles/layout/us-detail.scss +++ b/app/styles/layout/us-detail.scss @@ -271,23 +271,23 @@ .issue-data { @extend %small; - div { - @include clearfix(); - @include transition(background .2s ease-in); - background: darken($whitish, 5%); - padding: .5rem; - padding-right: 1rem; - div { - margin-bottom: .5rem; - } + margin-bottom: 1rem; + .duty-data { + margin-bottom: .5rem; &:last-child { margin: 0; } - } - .clickable { - &:hover { + div { @include transition(background .2s ease-in); - background: darken($whitish, 10%); + background: darken($whitish, 5%); + padding: .5rem; + padding-right: 1rem; + } + .clickable { + &:hover { + @include transition(background .2s ease-in); + background: darken($whitish, 10%); + } } } .level { @@ -377,16 +377,3 @@ } } } -.us-assigned-to { - &.loading { - width: 100%; - span { - font-size: 30px; - padding: 20px 0; - text-align: center; - width: 100%; - @include animation (loading .5s linear); - @include animation (spin 1s linear infinite); - } - } -} diff --git a/app/styles/modules/common/assigned-to.scss b/app/styles/modules/common/assigned-to.scss index 4b7be68b..a5afcaba 100644 --- a/app/styles/modules/common/assigned-to.scss +++ b/app/styles/modules/common/assigned-to.scss @@ -1,7 +1,18 @@ -.us-assigned-to { +.duty-assigned-to { @include table-flex(); margin-top: 1rem; position: relative; + &.loading { + width: 100%; + span { + font-size: 30px; + padding: 20px 0; + text-align: center; + width: 100%; + @include animation (loading .5s linear); + @include animation (spin 1s linear infinite); + } + } .user-avatar { @include table-flex-child(1, 0); img { @@ -26,6 +37,10 @@ cursor: pointer; } } + .assigned-name { + @include ellipsis(80%); + display: inline-block; + } .icon-delete { color: $gray-light; opacity: 1;