From 408ad757a62a861244b259346a37477189aa6ec1 Mon Sep 17 00:00:00 2001 From: brecht Date: Fri, 19 Feb 2021 13:34:09 +0100 Subject: [PATCH 1/4] KAS-2232 replaced Attach-tooltip with EmberTooltip --- .../components/access-level-pill/template.hbs | 18 +++--------- .../agenda-detail/sidebar-item/template.hbs | 18 +++--------- .../agenda-overview-item/template.hbs | 18 +++--------- .../news-item/edit-item/template.hbs | 9 ++---- .../button-toolbar/template.hbs | 18 +++--------- .../web-components/vl-document/template.hbs | 9 ++---- .../vl-table-actions/template.hbs | 29 +++++-------------- app/pods/settings/ministers/template.hbs | 9 ++---- app/styles/app.scss | 1 + .../custom-utilities/_ember-tooltip.scss | 4 +++ app/styles/custom-utilities/_text.scss | 1 + 11 files changed, 35 insertions(+), 99 deletions(-) create mode 100644 app/styles/custom-utilities/_ember-tooltip.scss diff --git a/app/pods/components/access-level-pill/template.hbs b/app/pods/components/access-level-pill/template.hbs index 89a052054d..d1824e4c0f 100644 --- a/app/pods/components/access-level-pill/template.hbs +++ b/app/pods/components/access-level-pill/template.hbs @@ -45,16 +45,11 @@ {{action "toggleConfidential"}} > {{#if lastPiece.confidential}} - {{#attach-tooltip - arrow="true" - animation="shift" - placement="top" - class="ember-attacher-tooltip" - }} +

{{t "document-is-confidential"}}

- {{/attach-tooltip}} +
{{else}} @@ -66,16 +61,11 @@ {{action "toggleConfidential"}} > {{#if lastPiece.confidential}} - {{#attach-tooltip - arrow="true" - animation="shift" - placement="top" - class="ember-attacher-tooltip" - }} +

{{t "document-is-confidential"}}

- {{/attach-tooltip}} +
{{else}} diff --git a/app/pods/components/agenda/agenda-detail/sidebar-item/template.hbs b/app/pods/components/agenda/agenda-detail/sidebar-item/template.hbs index e5416bacbe..7f3edcb965 100644 --- a/app/pods/components/agenda/agenda-detail/sidebar-item/template.hbs +++ b/app/pods/components/agenda/agenda-detail/sidebar-item/template.hbs @@ -42,32 +42,22 @@ {{#if (await @agendaitem.checkAdded)}} - {{#attach-tooltip - arrow="true" - animation="shift" - placement="top" - class="ember-attacher-tooltip" - }} +

{{t "added-agendaitem-text"}}

- {{/attach-tooltip}} +
{{/if}} {{#if (not newsletterInfo.inNewsletter)}} - {{#attach-tooltip - arrow="true" - animation="shift" - placement="top" - class="ember-attacher-tooltip" - }} +

{{t "not-visible-in-newsletter"}}

- {{/attach-tooltip}} +
{{/if}} diff --git a/app/pods/components/agenda/agenda-overview/agenda-overview-item/template.hbs b/app/pods/components/agenda/agenda-overview/agenda-overview-item/template.hbs index d9981e953c..f28996155e 100644 --- a/app/pods/components/agenda/agenda-overview/agenda-overview-item/template.hbs +++ b/app/pods/components/agenda/agenda-overview/agenda-overview-item/template.hbs @@ -185,30 +185,20 @@
{{#if (not newsletterInfo.inNewsletter)}} - {{#attach-tooltip - arrow="true" - animation="shift" - placement="top" - class="ember-attacher-tooltip" - }} +

{{t "not-visible-in-newsletter"}}

- {{/attach-tooltip}} +
{{/if}} {{#if (await @agendaitem.checkAdded)}} - {{#attach-tooltip - arrow="true" - animation="shift" - placement="top" - class="ember-attacher-tooltip" - }} +

{{t "added-agendaitem-text"}}

- {{/attach-tooltip}} +
{{/if}}
diff --git a/app/pods/components/news-item/edit-item/template.hbs b/app/pods/components/news-item/edit-item/template.hbs index c51cde7fd4..c9b4b982ff 100644 --- a/app/pods/components/news-item/edit-item/template.hbs +++ b/app/pods/components/news-item/edit-item/template.hbs @@ -20,14 +20,9 @@ {{else}} {{/if}} diff --git a/app/pods/components/newsletter-table/button-toolbar/template.hbs b/app/pods/components/newsletter-table/button-toolbar/template.hbs index d355621073..0fbf3f1985 100644 --- a/app/pods/components/newsletter-table/button-toolbar/template.hbs +++ b/app/pods/components/newsletter-table/button-toolbar/template.hbs @@ -8,14 +8,9 @@ {{#if (is-pending (await @agendaitem.nota))}} {{else}} {{/if}}
{{#if (not (await piece.file.downloadLink))}} - {{#attach-tooltip - arrow="true" - animation="shift" - placement="top" - class="ember-attacher-tooltip" - }} + {{t "document-not-consultable"}} - {{/attach-tooltip}} + {{/if}} {{await piece.name}}
diff --git a/app/pods/components/web-components/vl-table-actions/template.hbs b/app/pods/components/web-components/vl-table-actions/template.hbs index 4776b4b30b..5132c02cc1 100644 --- a/app/pods/components/web-components/vl-table-actions/template.hbs +++ b/app/pods/components/web-components/vl-table-actions/template.hbs @@ -9,40 +9,25 @@ {{action "openDocument" row bubbles=false}} > - {{#attach-tooltip - arrow="true" - animation="shift" - placement="bottom" - class="ember-attacher-tooltip" - }} + {{t "no-nota"}} - {{/attach-tooltip}} + {{else}} {{/if}} {{else}} {{/if}} {{#link-to diff --git a/app/pods/settings/ministers/template.hbs b/app/pods/settings/ministers/template.hbs index cb9eb11c46..81c0c58627 100644 --- a/app/pods/settings/ministers/template.hbs +++ b/app/pods/settings/ministers/template.hbs @@ -105,14 +105,9 @@ {{action "toggleProperty" "isResigningMandatee" mandatee}} > - {{#attach-tooltip - arrow="true" - animation="shift" - placement="bottom" - class="ember-attacher-tooltip" - }} + {{t "resign"}} - {{/attach-tooltip}} + {{/if}} From 8173883993f06570c9a3bda08f1db676f3bae18e Mon Sep 17 00:00:00 2001 From: brecht Date: Mon, 22 Feb 2021 10:24:08 +0100 Subject: [PATCH 4/4] added align-items: center to the status holder --- app/styles/custom-components/_vlc-agenda-meta.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/styles/custom-components/_vlc-agenda-meta.scss b/app/styles/custom-components/_vlc-agenda-meta.scss index e491cc0c51..1244668e26 100644 --- a/app/styles/custom-components/_vlc-agenda-meta.scss +++ b/app/styles/custom-components/_vlc-agenda-meta.scss @@ -23,6 +23,7 @@ .vlc-agenda-items__status { font-size: 1.4rem; white-space: nowrap; + align-items: center; .formally-ok-icon { &::before {