From 2824b66f07bfaea9a6a9d8796988943acc1e4955 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 20 May 2015 15:13:57 +0200 Subject: [PATCH] Issue #2708 - Colors for attributes in admin are not shown properly --- app/partials/includes/components/select-color.jade | 2 +- app/partials/includes/modules/admin/project-status.jade | 6 +++--- app/partials/includes/modules/admin/project-types.jade | 6 +++--- app/partials/includes/modules/admin/project-us-status.jade | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/partials/includes/components/select-color.jade b/app/partials/includes/components/select-color.jade index 0a519b2d..3f9f4306 100644 --- a/app/partials/includes/components/select-color.jade +++ b/app/partials/includes/components/select-color.jade @@ -23,4 +23,4 @@ div.popover.select-color li.color(style="background: #2e3436", data-color="#2e3436") input(type="text", placeholder="personalized colors", ng-model="color") - div.selected-color(style="background-color: {{ color }}") + div.selected-color(ng-style="{'background-color': color}") diff --git a/app/partials/includes/modules/admin/project-status.jade b/app/partials/includes/modules/admin/project-status.jade index c7824865..087ddc65 100644 --- a/app/partials/includes/modules/admin/project-status.jade +++ b/app/partials/includes/modules/admin/project-status.jade @@ -18,7 +18,7 @@ section.colors-table.admin-status-table div.row.table-main.visualization span.icon.icon-drag-v div.color-column - div.current-color(style="background: {{ value.color }}") + div.current-color(ng-style="{background: value.color}") div.status-name span {{ value.name }} @@ -35,7 +35,7 @@ section.colors-table.admin-status-table div.row.table-main.edition.hidden div.color-column(tg-color-selection, ng-model="value") - div.current-color(style="background: {{ value.color }}") + div.current-color(ng-style="{background: value.color}") include ../../components/select-color div.status-name @@ -53,7 +53,7 @@ section.colors-table.admin-status-table form div.row.table-main.new-value.hidden div.color-column(tg-color-selection, ng-model="newValue") - div.current-color(style="background: {{ newValue.color }}") + div.current-color(ng-style="{background: newValue.color}") include ../../components/select-color div.status-name diff --git a/app/partials/includes/modules/admin/project-types.jade b/app/partials/includes/modules/admin/project-types.jade index 5cf626fd..9d5b1f00 100644 --- a/app/partials/includes/modules/admin/project-types.jade +++ b/app/partials/includes/modules/admin/project-types.jade @@ -18,7 +18,7 @@ section.colors-table span.icon.icon-drag-v div.color-column - div.current-color(style="background: {{ value.color }}") + div.current-color(ng-style="{background: value.color}") div.status-name span {{ value.name }} @@ -29,7 +29,7 @@ section.colors-table div.row.table-main.edition.hidden div.color-column(tg-color-selection, ng-model="value") - div.current-color(style="background: {{ value.color }}") + div.current-color(ng-style="{background: value.color}") include ../../components/select-color div.status-name @@ -43,7 +43,7 @@ section.colors-table form div.row.table-main.new-value.hidden div.color-column(tg-color-selection, ng-model="newValue") - div.current-color(style="background: {{ newValue.color }}") + div.current-color(ng-style="{background: newValue.color}") include ../../components/select-color div.status-name diff --git a/app/partials/includes/modules/admin/project-us-status.jade b/app/partials/includes/modules/admin/project-us-status.jade index dd1adf63..98eea63f 100644 --- a/app/partials/includes/modules/admin/project-us-status.jade +++ b/app/partials/includes/modules/admin/project-us-status.jade @@ -23,7 +23,7 @@ section.project-us-status span.icon.icon-drag-v div.color-column - div.current-color(style="background: {{ value.color }}") + div.current-color(ng-style="{background: value.color}") div.status-name span {{ value.name }} @@ -46,7 +46,7 @@ section.project-us-status div.row.table-main.edition.hidden div.color-column(tg-color-selection, ng-model="value") - div.current-color(style="background: {{ value.color }}") + div.current-color(ng-style="{background: value.color}") include ../../components/select-color @@ -74,7 +74,7 @@ section.project-us-status form div.row.table-main.new-value.hidden div.color-column(tg-color-selection, ng-model="newValue") - div.current-color(style="background: {{ newValue.color }}") + div.current-color(ng-style="{background: newValue.color}") include ../../components/select-color div.status-name