diff --git a/resources/www/common/images/icons/Basket-Settings.png b/resources/www/common/images/icons/Basket-Settings.png index bcc21f08b9..77372631c4 100644 Binary files a/resources/www/common/images/icons/Basket-Settings.png and b/resources/www/common/images/icons/Basket-Settings.png differ diff --git a/resources/www/common/images/icons/basket.png b/resources/www/common/images/icons/basket.png index 83704f5f20..13cb9dbcc2 100644 Binary files a/resources/www/common/images/icons/basket.png and b/resources/www/common/images/icons/basket.png differ diff --git a/resources/www/common/images/icons/basket_push.png b/resources/www/common/images/icons/basket_push.png index 47b45185f2..97e038241c 100644 Binary files a/resources/www/common/images/icons/basket_push.png and b/resources/www/common/images/icons/basket_push.png differ diff --git a/resources/www/common/images/icons/basket_push_unread.png b/resources/www/common/images/icons/basket_push_unread.png index e2a0770cf7..b09552bcf7 100644 Binary files a/resources/www/common/images/icons/basket_push_unread.png and b/resources/www/common/images/icons/basket_push_unread.png differ diff --git a/resources/www/common/images/icons/basket_validation.png b/resources/www/common/images/icons/basket_validation.png index 3b96c1d263..cddaac1db1 100644 Binary files a/resources/www/common/images/icons/basket_validation.png and b/resources/www/common/images/icons/basket_validation.png differ diff --git a/resources/www/common/images/icons/feedback-icon.png b/resources/www/common/images/icons/feedback-icon.png new file mode 100644 index 0000000000..5af3da366a Binary files /dev/null and b/resources/www/common/images/icons/feedback-icon.png differ diff --git a/resources/www/common/images/icons/file-edit-hover.png b/resources/www/common/images/icons/file-edit-hover.png new file mode 100644 index 0000000000..376590d59c Binary files /dev/null and b/resources/www/common/images/icons/file-edit-hover.png differ diff --git a/resources/www/common/images/icons/file-edit.png b/resources/www/common/images/icons/file-edit.png index 3dc4964946..3522e518b3 100644 Binary files a/resources/www/common/images/icons/file-edit.png and b/resources/www/common/images/icons/file-edit.png differ diff --git a/resources/www/common/images/icons/green-check.png b/resources/www/common/images/icons/green-check.png new file mode 100644 index 0000000000..481800b2a3 Binary files /dev/null and b/resources/www/common/images/icons/green-check.png differ diff --git a/resources/www/common/images/icons/no-response.png b/resources/www/common/images/icons/no-response.png new file mode 100644 index 0000000000..a0e448c614 Binary files /dev/null and b/resources/www/common/images/icons/no-response.png differ diff --git a/resources/www/common/images/icons/no-valid.png b/resources/www/common/images/icons/no-valid.png index 907301cf5e..2956a36e6a 100644 Binary files a/resources/www/common/images/icons/no-valid.png and b/resources/www/common/images/icons/no-valid.png differ diff --git a/resources/www/common/images/icons/red-cross.png b/resources/www/common/images/icons/red-cross.png new file mode 100644 index 0000000000..5ccccf40f6 Binary files /dev/null and b/resources/www/common/images/icons/red-cross.png differ diff --git a/resources/www/common/images/icons/story.png b/resources/www/common/images/icons/story.png index 58e84a6e07..0ac43bc62c 100644 Binary files a/resources/www/common/images/icons/story.png and b/resources/www/common/images/icons/story.png differ diff --git a/resources/www/common/images/icons/valid.png b/resources/www/common/images/icons/valid.png index fb79ee47ea..81066e219a 100644 Binary files a/resources/www/common/images/icons/valid.png and b/resources/www/common/images/icons/valid.png differ diff --git a/resources/www/common/images/icons/vote-admin.png b/resources/www/common/images/icons/vote-admin.png new file mode 100644 index 0000000000..8e16be2027 Binary files /dev/null and b/resources/www/common/images/icons/vote-admin.png differ diff --git a/resources/www/common/images/icons/workzone32.png b/resources/www/common/images/icons/workzone32.png index 97598e4e02..089f438feb 100644 Binary files a/resources/www/common/images/icons/workzone32.png and b/resources/www/common/images/icons/workzone32.png differ diff --git a/resources/www/common/styles/main.scss b/resources/www/common/styles/main.scss index ad1e9e34cd..f8ec587305 100644 --- a/resources/www/common/styles/main.scss +++ b/resources/www/common/styles/main.scss @@ -38,5 +38,17 @@ $mainMenuLinkBackgroundHoverColor: transparent; } } +.macroFileEdit { + width: 24px; + height: 24px; + background: url(../images/icons/file-edit.png) no-repeat center; + cursor: help; + display: inline-block; + transition: 0.3s all; + &:hover, &:focus { + background-image: url(../images/icons/file-edit-hover.png); + } +} + diff --git a/templates/web/prod/WorkZone/Macros.html.twig b/templates/web/prod/WorkZone/Macros.html.twig index cbb022a8d3..3d16fabf1f 100644 --- a/templates/web/prod/WorkZone/Macros.html.twig +++ b/templates/web/prod/WorkZone/Macros.html.twig @@ -27,8 +27,8 @@ @@ -385,19 +385,19 @@ {% if choice.getParticipant().getCanAgree() %} {% if choice.getAgreement() == true %} - + {% elseif choice.getAgreement() is null %} - + {% else %} - + {% endif %} {% else %} - + {% endif %} {% if choice.getNote() != '' %} - +   {% endif %} diff --git a/templates/web/prod/actions/Push.html.twig b/templates/web/prod/actions/Push.html.twig index 13270f08f3..720db4c0f6 100644 --- a/templates/web/prod/actions/Push.html.twig +++ b/templates/web/prod/actions/Push.html.twig @@ -19,7 +19,7 @@ {% if context == 'Push' %} {% else %} - + {% endif %}
diff --git a/templates/web/prod/tab_headers.html.twig b/templates/web/prod/tab_headers.html.twig index d4b5ae850f..c93d5fbd66 100644 --- a/templates/web/prod/tab_headers.html.twig +++ b/templates/web/prod/tab_headers.html.twig @@ -17,7 +17,8 @@ {% endif %}
  • - + +
    ▼