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

Fixes color selector layout for empty and full color list

stable
Xavier Julián 2016-09-15 09:41:21 +02:00 committed by David Barragán Merino
parent d16ece1e80
commit 9bae924dce
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/modules/components/tags/components/add-tag-input.jade
View File

@ -22,6 +22,7 @@
tg-color-selector( tg-color-selector(
ng-if="!vm.disableColorSelection" ng-if="!vm.disableColorSelection"
on-select-color="vm.selectColor(color)" on-select-color="vm.selectColor(color)"
is-color-required="false"
) )
tg-svg.save( tg-svg.save(

23
app/partials/includes/modules/admin/project-tags.jade
View File

@ -6,16 +6,11 @@ section
.admin-tags-section-wrapper .admin-tags-section-wrapper
form.add-tag-container.new-value.hidden form.add-tag-container.new-value.hidden
tg-color-selection.color-column( tg-color-selector.color-column(
tg-allow-empty="true" is-color-required="false"
ng-model="newValue" ng-model="newValue"
on-select-color="newValue.color = color"
) )
.current-color(
ng-style="{background: newValue.color}"
ng-if="newValue.color"
)
.current-color.empty-color(ng-if="!newValue.color")
include ../../components/select-color
.tag-name .tag-name
input( input(
@ -115,17 +110,11 @@ section
) )
.row.tag-row.table-main.edition.hidden .row.tag-row.table-main.edition.hidden
.color-column( tg-color-selector.color-column(
tg-color-selection is-color-required="false"
tg-allow-empty="true"
ng-model="tag" ng-model="tag"
on-select-color="tag.color = color"
) )
.current-color(
ng-style="{background: tag.color}"
ng-if="tag.color"
)
.current-color.empty-color(ng-if="!tag.color")
include ../../components/select-color
.status-name .status-name
input( input(

3
app/styles/layout/admin-project-tags.scss
View File

@ -27,9 +27,12 @@
background: $white; background: $white;
} }
.icon { .icon {
&.icon-close,
&.icon-save {
opacity: 1; opacity: 1;
} }
} }
}
.tags-table { .tags-table {
.table-tags-editor { .table-tags-editor {