diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
index b74797a03..0a5cd001d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
@@ -11,14 +11,13 @@
box-shadow: rgba(0, 0, 0, 0.12) 0px 1px 3px, rgba(0, 0, 0, 0.24) 0px 1px 2px !important;
padding:1.7rem;
margin-top: .5rem;
- h1, h2, h3 {
+ margin-bottom: .5rem;
+ .subtitle {
background-color: $chill-ll-gray;
border-radius:3px;
padding:.5rem;
+ margin-top: 1rem;
}
- // margin-left: auto;
- // margin-right: auto;
- // width: 97%;
&:last-child {
margin-bottom: 1rem;
}
diff --git a/src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-statuses.scss b/src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-statuses.scss
index 4f598fc7b..946688285 100644
--- a/src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-statuses.scss
+++ b/src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-statuses.scss
@@ -7,15 +7,12 @@
&.place-new {
background-color: $chill-yellow;
}
-
&.place-in_progress {
background-color: $chill-green;
}
-
&.place-closed {
background-color: $chill-blue;
}
-
&.place-canceled {
background-color: $chill-beige;
}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_show.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_show.html.twig
index 26d269191..e37c4eae1 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_show.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_show.html.twig
@@ -1,71 +1,68 @@
-
{{ 'Task'|trans }}
+ {#
{{ 'Task'|trans }}
#}
-
{{ task.title }}
+ {{ task.title }}
{% for place in workflow_marked_places(task) %}
- {{ place|trans }}
+ {{ place|trans }}
{% endfor %}
-
-
- - {{ 'Description'|trans }}
- -
- {% if task.description is empty %}
- {{"No description"|trans}}
- {% else %}
-
- {{ task.description|chill_markdown_to_html }}
-
- {% endif %}
-
-
- - {{ 'Assignee'|trans }}
- -
- {% if task.assignee is null %}
- {{"No one assignee"|trans}}
- {% else %}
- {{ task.assignee }}
- {% endif %}
-
-
- {% if task.scope is not null %}
- - {{ 'Scope'|trans }}
+
+
+ - {{ 'Description'|trans }}
-
- {{ task.scope.name|localize_translatable_string }}
+ {% if task.description is empty %}
+ {{"No description"|trans}}
+ {% else %}
+
+ {{ task.description|chill_markdown_to_html }}
+
+ {% endif %}
- {% endif %}
-
- {{"Dates"|trans}}
- {% if task.startDate is null and task.endDate is null and task.warningDate is null %}
-
- -
- {{"No dates specified"|trans}}
+
- {{ 'Assignee'|trans }}
+ -
+ {% if task.assignee is null %}
+ {{"No one assignee"|trans}}
+ {% else %}
+ {{ task.assignee }}
+ {% endif %}
-
- {% else %}
- {% if task.startDate is not null %}
- - {{ 'Start'|trans }}
- - {{ task.startDate|format_date('long') }}
+ {% if task.scope is not null %}
+ - {{ 'Scope'|trans }}
+ -
+ {{ task.scope.name|localize_translatable_string }}
+
+ {% endif %}
+ {{"Dates"|trans}}
+ {% if task.startDate is null and task.endDate is null and task.warningDate is null %}
+
+ -
+ {{"No dates specified"|trans}}
+
+
+ {% else %}
+ {% if task.startDate is not null %}
+ - {{ 'Start'|trans }}
+ - {{ task.startDate|format_date('long') }}
+ {% endif %}
+ {% if task.endDate is not null %}
+ - {{ 'End'|trans }}
+ - {{ task.endDate|format_date('long') }}
+ {% endif %}
+ {% if task.warningDate is not null %}
+ - {{ 'Warning'|trans }}
+ - {{ task.warningDate|format_date('long') }}
+ {% endif %}
{% endif %}
-
- {% if task.endDate is not null %}
- - {{ 'End'|trans }}
- - {{ task.endDate|format_date('long') }}
- {% endif %}
-
- {% if task.warningDate is not null %}
- - {{ 'Warning'|trans }}
- - {{ task.warningDate|format_date('long') }}
- {% endif %}
-
- {% endif %}
-
+
+
{% if timeline is not null %}
- {{"Timeline"|trans}}
- {{ timeline|raw }}
+
+
{{"Timeline"|trans}}
+ {{ timeline|raw }}
+
{% endif %}