From 9a4f956153153baf2a664e4a1151da7507451053 Mon Sep 17 00:00:00 2001 From: Molkobain Date: Sat, 23 Jan 2021 11:41:14 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B03649=20-=20Activity=20panel:=20Code=20cl?= =?UTF-8?q?eanup=20-=20Move=20entry=20form=20toggler=20SCSS=20to=20proper?= =?UTF-8?q?=20file=20-=20Rename=20entry=20form=20toggler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity-panel/_caselog-entry-form.scss | 39 ------------------- css/print.css | 2 +- .../activity-panel/caselog-entry-form.js | 2 +- .../layouts/activity-panel/layout.html.twig | 2 +- 4 files changed, 3 insertions(+), 42 deletions(-) diff --git a/css/backoffice/layout/activity-panel/_caselog-entry-form.scss b/css/backoffice/layout/activity-panel/_caselog-entry-form.scss index 206c16fcb..d83b061ec 100644 --- a/css/backoffice/layout/activity-panel/_caselog-entry-form.scss +++ b/css/backoffice/layout/activity-panel/_caselog-entry-form.scss @@ -9,18 +9,7 @@ $ibo-caselog-entry-form--background-color: $ibo-activity-panel--tab-toolbar--bac $ibo-caselog-entry-form--actions--margin-top: 6px !default; $ibo-caselog-entry-form--actions--margin-bottom: 8px !default; -$ibo-activity-panel--body--add-caselog-entry--toggler--right: 4px !default; -$ibo-activity-panel--body--add-caselog-entry--toggler--margin-top: calc(#{$ibo-activity-panel--tab-toolbar-actions--height} + 4px) !default; -$ibo-activity-panel--body--add-caselog-entry--toggler--diameter: 36px !default; -$ibo-activity-panel--body--add-caselog-entry--toggler--background-color: $ibo-color-primary-600 !default; -$ibo-activity-panel--body--add-caselog-entry--toggler--color: $ibo-color-white-100 !default; -$ibo-activity-panel--body--add-caselog-entry--toggler--border-radius: $ibo-border-radius-full !default; -$ibo-activity-panel--body--add-caselog-entry--toggler--box-shadow: $ibo-elevation-100 !default; -$ibo-activity-panel--body--add-caselog-entry--toggler--icon--height: 100% !default; -$ibo-activity-panel--body--add-caselog-entry--toggler--icon--width: $ibo-activity-panel--body--add-caselog-entry--toggler--icon--height !default; -$ibo-activity-panel--body--add-caselog-entry--toggler--icon--font-size: 16px !default; -$ibo-activity-panel--body--add-caselog-entry--toggler--icon--line-height: 33px !default; .ibo-caselog-entry-form{ display: block; width: 100%; @@ -37,34 +26,6 @@ $ibo-activity-panel--body--add-caselog-entry--toggler--icon--line-height: 33px ! margin-bottom: $ibo-caselog-entry-form--actions--margin-bottom; } -.ibo-activity-panel--body--add-caselog-entry--toggler{ - @extend %ibo-baseline-centered-content; - position: absolute; - right: $ibo-activity-panel--body--add-caselog-entry--toggler--right; - margin-top: $ibo-activity-panel--body--add-caselog-entry--toggler--margin-top; - - width: $ibo-activity-panel--body--add-caselog-entry--toggler--diameter; - height: $ibo-activity-panel--body--add-caselog-entry--toggler--diameter; - - background-color: $ibo-activity-panel--body--add-caselog-entry--toggler--background-color; - color: $ibo-activity-panel--body--add-caselog-entry--toggler--color; - - border-radius: $ibo-activity-panel--body--add-caselog-entry--toggler--border-radius; - box-shadow: $ibo-activity-panel--body--add-caselog-entry--toggler--box-shadow; - > i{ - text-align: center; - height: $ibo-activity-panel--body--add-caselog-entry--toggler--icon--height; - width: $ibo-activity-panel--body--add-caselog-entry--toggler--icon--width; - font-size: $ibo-activity-panel--body--add-caselog-entry--toggler--icon--font-size; - line-height: $ibo-activity-panel--body--add-caselog-entry--toggler--icon--line-height; - } - &:hover { - color: $ibo-activity-panel--body--add-caselog-entry--toggler--color; - } - &.ibo-is-hidden{ - display: none; - } -} .ibo-caselog-entry-form--action-buttons--main-actions > .ibo-popover-menu{ z-index: 1; } \ No newline at end of file diff --git a/css/print.css b/css/print.css index 837c1d34a..79fbabb77 100644 --- a/css/print.css +++ b/css/print.css @@ -207,7 +207,7 @@ div.explain-printable button{ .printable-content .ibo-field--fullscreen-toggler, .printable-content .ibo-activity-panel--expand-icon, .printable-content .ibo-activity-panel--collapse-icon, -.printable-content .ibo-activity-panel--body--add-caselog-entry--toggler, +.printable-content .ibo-activity-panel--add-caselog-entry-button, #ibo-top-container, #ibo-navigation-menu, .itop_popup { display: none; } diff --git a/js/layouts/activity-panel/caselog-entry-form.js b/js/layouts/activity-panel/caselog-entry-form.js index 7632e1ae2..9ece04a2f 100644 --- a/js/layouts/activity-panel/caselog-entry-form.js +++ b/js/layouts/activity-panel/caselog-entry-form.js @@ -38,7 +38,7 @@ $(function() { activity_panel: '[data-role="ibo-activity-panel"]', activity_panel_toolbar: '[data-role="ibo-activity-panel--tab-toolbar"]', form: '[data-role="ibo-caselog-entry-form"]', // Any caselog entry form - toggler: '[data-role="ibo-activity-panel--body--add-caselog-entry--toggler"]', + toggler: '[data-role="ibo-activity-panel--add-caselog-entry-button"]', main_actions: '[data-role="ibo-caselog-entry-form--action-buttons--main-actions"]', cancel_button: '[data-role="ibo-caselog-entry-form--action-buttons--main-actions"] [data-role="ibo-button"][name="cancel"]', send_button: '[data-role="ibo-caselog-entry-form--action-buttons--main-actions"] [data-role="ibo-button"][name="send"]', diff --git a/templates/base/layouts/activity-panel/layout.html.twig b/templates/base/layouts/activity-panel/layout.html.twig index 00007ced2..65afb1ec6 100644 --- a/templates/base/layouts/activity-panel/layout.html.twig +++ b/templates/base/layouts/activity-panel/layout.html.twig @@ -43,7 +43,7 @@ {% if oUIBlock.HasAnEditableCaseLogTab() and oUIBlock.IsCaseLogsSubmitAutonomous() %} - + {% endif %}
{% if oUIBlock.GetGroupedEntries()|length > 0 %}