taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1444 from dangarbar/ft/minor-fixes 

Repair due-date icon styles
stable
Alex Hermida 2018-04-25 14:15:27 +02:00 committed by GitHub
parent ff987a79af 9e916967c8
commit 9222d43ec8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/modules/components/card/card-templates/card-data.jade
View File

@ -2,7 +2,7 @@
ng-if="vm.visible('extra_info')" ng-if="vm.visible('extra_info')"
ng-class="{'empty-tasks': !vm.item.getIn(['model', 'tasks']).size}" 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')", ng-if="vm.item.getIn(['model', 'total_points']) === null && vm.visible('empty_extra_info')",
translate="US.NOT_ESTIMATED" translate="US.NOT_ESTIMATED"
) )

9
app/modules/components/card/card.scss
View File

@ -160,6 +160,9 @@
font-size: 14px; font-size: 14px;
justify-content: space-between; justify-content: space-between;
padding: 0 1rem .5rem; padding: 0 1rem .5rem;
.card-estimation.not-estimated {
font-size: .8125rem;
}
} }
.card-statistics { .card-statistics {
@ -180,6 +183,12 @@
&.card-iocaine { &.card-iocaine {
cursor: help; cursor: help;
} }
&.card-votes {
margin-left: .2rem;
}
&.card-due-date {
margin-left: .1rem;
}
} }
.icon { .icon {
@include svg-size(.75rem); @include svg-size(.75rem);

2
app/modules/components/detail/header/detail-header.jade
View File

@ -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( h2.detail-title-text.ng-animate-disabled(
ng-show="!vm.editMode" ng-show="!vm.editMode"
ng-hide="vm.editMode" ng-hide="vm.editMode"

10
app/modules/components/detail/header/detail-header.scss
View File

@ -74,9 +74,15 @@
margin-left: .75rem; margin-left: .75rem;
opacity: 0; opacity: 0;
transition: opacity .2s; transition: opacity .2s;
svg {
@include svg-size(1.25rem);
} }
.detail-edit,
.due-date-icon {
svg {
@include svg-size(1.3rem);
}
}
&.readonly .due-date-icon {
margin-left: 2.7rem;
} }
} }

5
app/modules/components/due-date/due-date-icon.jade
View File

@ -1,7 +1,6 @@
span.due-date-icon tg-svg.due-date-icon(
tg-svg(
ng-if="vm.visible()" ng-if="vm.visible()"
svg-icon="icon-clock" svg-icon="icon-clock"
ng-class="vm.color()" ng-class="vm.color()"
ng-attr-title="{{ vm.title() }}" ng-attr-title="{{ vm.title() }}"
) )

29
app/modules/components/due-date/due-date.scss
View File

@ -26,44 +26,43 @@ tg-due-date .due-date-button {
} }
} }
tg-due-date .due-date-icon { .due-date-icon {
display: inline-block; display: inline-block;
line-height: .1rem;
margin: 0 .25rem; margin: 0 .25rem;
position: relative; position: relative;
top: .1rem;
svg { svg {
fill: $gray-light; fill: $gray-light;
height: 1.1rem;
transition: fill .2s ease-in; transition: fill .2s ease-in;
width: 1.1rem;
} }
.closed svg { &.closed svg {
fill: $gray-lighter; fill: $gray-lighter;
} }
.due-set svg { &.due-set svg {
fill: $yellow-green; fill: $yellow-green;
} }
.due-soon svg { &.due-soon svg {
fill: $my-sin; fill: $my-sin;
} }
.past-due svg { &.past-due svg {
fill: $red-light; fill: $red-light;
} }
} }
.backlog-table-body .user-story-name .due-date-icon { .backlog-table-body .user-story-name,
top: .25rem; .related-tasks .task-name {
.due-date-icon {
top: .1rem;
}
} }
.issues-table .subject .due-date-icon { .issues-table .subject .due-date-icon {
top: 0; top: .25rem;
} }
.card-statistics .due-date-icon { .card-statistics .due-date-icon {
margin: 0; margin: .1rem 0 0;
svg { svg {
height: 1rem; height: .9rem;
width: 1rem; width: .9rem;
} }
} }