From 9e916967c8b1d5faea32f3ae93471838fb79b537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Wed, 25 Apr 2018 12:19:00 +0200 Subject: [PATCH] Repair due-date icon styles --- .../card/card-templates/card-data.jade | 2 +- app/modules/components/card/card.scss | 9 ++++++ .../detail/header/detail-header.jade | 2 +- .../detail/header/detail-header.scss | 8 ++++- .../components/due-date/due-date-icon.jade | 13 ++++----- app/modules/components/due-date/due-date.scss | 29 +++++++++---------- 6 files changed, 38 insertions(+), 25 deletions(-) diff --git a/app/modules/components/card/card-templates/card-data.jade b/app/modules/components/card/card-templates/card-data.jade index 7138f257..e04bc53a 100644 --- a/app/modules/components/card/card-templates/card-data.jade +++ b/app/modules/components/card/card-templates/card-data.jade @@ -2,7 +2,7 @@ ng-if="vm.visible('extra_info')" ng-class="{'empty-tasks': !vm.item.getIn(['model', 'tasks']).size}" ) - span.card-estimation( + span.card-estimation.not-estimated( ng-if="vm.item.getIn(['model', 'total_points']) === null && vm.visible('empty_extra_info')", translate="US.NOT_ESTIMATED" ) diff --git a/app/modules/components/card/card.scss b/app/modules/components/card/card.scss index 469d3c15..5ec762f4 100644 --- a/app/modules/components/card/card.scss +++ b/app/modules/components/card/card.scss @@ -160,6 +160,9 @@ font-size: 14px; justify-content: space-between; padding: 0 1rem .5rem; + .card-estimation.not-estimated { + font-size: .8125rem; + } } .card-statistics { @@ -180,6 +183,12 @@ &.card-iocaine { cursor: help; } + &.card-votes { + margin-left: .2rem; + } + &.card-due-date { + margin-left: .1rem; + } } .icon { @include svg-size(.75rem); diff --git a/app/modules/components/detail/header/detail-header.jade b/app/modules/components/detail/header/detail-header.jade index 3ed3b10f..a01088a1 100644 --- a/app/modules/components/detail/header/detail-header.jade +++ b/app/modules/components/detail/header/detail-header.jade @@ -1,4 +1,4 @@ -.detail-title-wrapper.e2e-story-header +.detail-title-wrapper.e2e-story-header(ng-class="{readonly: !vm.permissions.canEdit}") h2.detail-title-text.ng-animate-disabled( ng-show="!vm.editMode" ng-hide="vm.editMode" diff --git a/app/modules/components/detail/header/detail-header.scss b/app/modules/components/detail/header/detail-header.scss index 09aa4e7c..3ac3786a 100644 --- a/app/modules/components/detail/header/detail-header.scss +++ b/app/modules/components/detail/header/detail-header.scss @@ -74,10 +74,16 @@ margin-left: .75rem; opacity: 0; transition: opacity .2s; + } + .detail-edit, + .due-date-icon { svg { - @include svg-size(1.25rem); + @include svg-size(1.3rem); } } + &.readonly .due-date-icon { + margin-left: 2.7rem; + } } .edit-title-wrapper { diff --git a/app/modules/components/due-date/due-date-icon.jade b/app/modules/components/due-date/due-date-icon.jade index 16d2b20c..fe74740d 100644 --- a/app/modules/components/due-date/due-date-icon.jade +++ b/app/modules/components/due-date/due-date-icon.jade @@ -1,7 +1,6 @@ -span.due-date-icon - tg-svg( - ng-if="vm.visible()" - svg-icon="icon-clock" - ng-class="vm.color()" - ng-attr-title="{{ vm.title() }}" - ) \ No newline at end of file +tg-svg.due-date-icon( + ng-if="vm.visible()" + svg-icon="icon-clock" + ng-class="vm.color()" + ng-attr-title="{{ vm.title() }}" +) \ No newline at end of file diff --git a/app/modules/components/due-date/due-date.scss b/app/modules/components/due-date/due-date.scss index b5aadc1b..103b7999 100644 --- a/app/modules/components/due-date/due-date.scss +++ b/app/modules/components/due-date/due-date.scss @@ -26,44 +26,43 @@ tg-due-date .due-date-button { } } -tg-due-date .due-date-icon { +.due-date-icon { display: inline-block; - line-height: .1rem; margin: 0 .25rem; position: relative; - top: .1rem; svg { fill: $gray-light; - height: 1.1rem; transition: fill .2s ease-in; - width: 1.1rem; } - .closed svg { + &.closed svg { fill: $gray-lighter; } - .due-set svg { + &.due-set svg { fill: $yellow-green; } - .due-soon svg { + &.due-soon svg { fill: $my-sin; } - .past-due svg { + &.past-due svg { fill: $red-light; } } -.backlog-table-body .user-story-name .due-date-icon { - top: .25rem; +.backlog-table-body .user-story-name, +.related-tasks .task-name { + .due-date-icon { + top: .1rem; + } } .issues-table .subject .due-date-icon { - top: 0; + top: .25rem; } .card-statistics .due-date-icon { - margin: 0; + margin: .1rem 0 0; svg { - height: 1rem; - width: 1rem; + height: .9rem; + width: .9rem; } }