Epics table layout

stable
Xavier Julián 2016-07-26 11:09:40 +02:00 committed by David Barragán Merino
parent 6e6257f039
commit ad0b59f0a9
4 changed files with 32 additions and 8 deletions

View File

@ -394,7 +394,8 @@
"EPICS": { "EPICS": {
"TITLE": "EPICS", "TITLE": "EPICS",
"DASHBOARD": { "DASHBOARD": {
"ADD": "+ ADD EPIC" "ADD": "+ ADD EPIC",
"UNASSIGNED": "Unassigned"
}, },
"TABLE": { "TABLE": {
"VOTES": "Votes", "VOTES": "Votes",

View File

@ -23,15 +23,23 @@
translate="EPICS.TABLE.SPRINT" translate="EPICS.TABLE.SPRINT"
) )
.assigned( .assigned(
ng-if="vm.column.assigned && vm.epic.getIn(['assigned_to_extra_info', 'photo'])" ng-if="vm.column.assigned && vm.epic.get('assigned_to')"
) )
img( img(
ng-if="vm.epic.getIn(['assigned_to_extra_info', 'photo'])"
ng-src="{{vm.epic.getIn(['assigned_to_extra_info', 'photo'])}}" ng-src="{{vm.epic.getIn(['assigned_to_extra_info', 'photo'])}}"
alt="::vm.epic.getIn(['assigned_to_extra_info', 'name'])" alt="{{::vm.epic.getIn(['assigned_to_extra_info', 'full_name_display'])}}"
)
img(
ng-if="!vm.epic.getIn(['assigned_to_extra_info', 'photo'])"
ng-src="https://www.gravatar.com/avatar/{{vm.epic.getIn(['assigned_to_extra_info', 'gravatar_id'])}}"
alt="{{::vm.epic.getIn(['assigned_to_extra_info', 'full_name_display'])}}"
) )
.assigned( .assigned(
ng-if="vm.column.assigned && !vm.epic.getIn(['assigned_to_extra_info', 'photo'])" ng-if="vm.column.assigned && !vm.epic.get('assigned_to')"
) Unassigned ng-class="{'is-unassigned': !vm.epic.get('assigned_to')}"
translate="EPICS.DASHBOARD.UNASSIGNED"
)
.status( .status(
ng-if="vm.column.status && !vm.permissions.canEdit" ng-if="vm.column.status && !vm.permissions.canEdit"
) )

View File

@ -56,12 +56,20 @@
.vote { .vote {
color: $gray; color: $gray;
} }
.assigned {
img {
width: 40px;
}
}
.icon-upvote { .icon-upvote {
@include svg-size(.75rem); @include svg-size(.75rem);
fill: $gray; fill: $gray;
margin-right: .25rem; margin-right: .25rem;
vertical-align: middle; vertical-align: middle;
} }
.is-unassigned {
color: $gray-light;
}
.epic-statuses { .epic-statuses {
@include font-type(light); @include font-type(light);
@include font-size(small); @include font-size(small);

View File

@ -4,7 +4,9 @@
.epics-table-header, .epics-table-header,
.epics-table-body { .epics-table-body {
.assigned, .assigned {
padding: .5rem;
}
.project, .project,
.vote, .vote,
.status, .status,
@ -17,7 +19,7 @@
.assigned, .assigned,
.project, .project,
.vote { .vote {
flex-basis: 80px; flex-basis: 100px;
flex-grow: 0; flex-grow: 0;
flex-shrink: 0; flex-shrink: 0;
flex-wrap: wrap; flex-wrap: wrap;
@ -33,7 +35,9 @@
} }
.name, .name,
.progress { .progress {
flex: 1; flex-basis: 20vw;
flex-grow: 1;
flex-shrink: 2;
max-width: 40vw; max-width: 40vw;
} }
.name, .name,
@ -54,6 +58,9 @@
display: flex; display: flex;
padding: .5rem; padding: .5rem;
position: relative; position: relative;
.assigned {
padding: 1rem .5rem;
}
} }
.epics-table-options-wrapper { .epics-table-options-wrapper {