diff --git a/css/backoffice/layout/_all.scss b/css/backoffice/layout/_all.scss index bf935712e..ea3a86c8f 100644 --- a/css/backoffice/layout/_all.scss +++ b/css/backoffice/layout/_all.scss @@ -32,4 +32,4 @@ @import "activity-panel/edits-entry"; @import "activity-panel/transition-entry"; @import "activity-panel/caselog-entry-form"; -@import "blocks-integrations/panel-with-tab-container"; +@import "blocks-integrations/all"; diff --git a/css/backoffice/layout/activity-panel/_activity-panel.scss b/css/backoffice/layout/activity-panel/_activity-panel.scss index b472560f1..89c54f189 100644 --- a/css/backoffice/layout/activity-panel/_activity-panel.scss +++ b/css/backoffice/layout/activity-panel/_activity-panel.scss @@ -57,6 +57,8 @@ $ibo-activity-panel--tab-toolbar--padding-x: 10px !default; $ibo-activity-panel--tab-toolbar--text-color: $ibo-color-grey-800 !default; $ibo-activity-panel--tab-toolbar--background-color: $ibo-activity-panel--tab-toggler--is-active--background-color !default; +$ibo-activity-panel--tab-toolbar-actions--margin-y: 4px !default; +$ibo-activity-panel--tab-toolbar-actions--margin-x: 0 !default; $ibo-activity-panel--tab-toolbar-actions--height: 32px !default; $ibo-activity-panel--tab-toolbar-right-actions--elements-spacing: 16px !default; @@ -87,7 +89,7 @@ $ibo-activity-panel--body--placeholder-hint--margin-top: 16px !default; $ibo-activity-panel--body--placeholder-hint--color: $ibo-color-grey-800 !default; $ibo-activity-panel--add-caselog-entry-button--right: 12px !default; -$ibo-activity-panel--add-caselog-entry-button--top: 66px + $ibo-activity-panel--add-caselog-entry-button--right !default; +$ibo-activity-panel--add-caselog-entry-button--top: 76px + $ibo-activity-panel--add-caselog-entry-button--right !default; $ibo-activity-panel--add-caselog-entry-button--diameter: 36px !default; $ibo-activity-panel--add-caselog-entry-button--background-color: $ibo-color-primary-600 !default; $ibo-activity-panel--add-caselog-entry-button--color: $ibo-color-white-100 !default; @@ -219,6 +221,7 @@ $ibo-activity-panel--entry-forms-confirmation-preference-input--spacing: 0.5rem @extend %ibo-fully-centered-content; justify-content: space-between; flex-wrap: nowrap; + margin: $ibo-activity-panel--tab-toolbar-actions--margin-y $ibo-activity-panel--tab-toolbar-actions--margin-x; height: $ibo-activity-panel--tab-toolbar-actions--height; } .ibo-activity-panel--tab-toolbar-left-actions, diff --git a/css/backoffice/layout/activity-panel/_caselog-entry-form.scss b/css/backoffice/layout/activity-panel/_caselog-entry-form.scss index d83b061ec..72a14ea2e 100644 --- a/css/backoffice/layout/activity-panel/_caselog-entry-form.scss +++ b/css/backoffice/layout/activity-panel/_caselog-entry-form.scss @@ -4,20 +4,20 @@ */ $ibo-caselog-entry-form--width: 100% !default; +$ibo-caselog-entry-form--padding-bottom: 12px default; $ibo-caselog-entry-form--background-color: $ibo-activity-panel--tab-toolbar--background-color !default; -$ibo-caselog-entry-form--actions--margin-top: 6px !default; -$ibo-caselog-entry-form--actions--margin-bottom: 8px !default; +$ibo-caselog-entry-form--actions--margin-top: 8px !default; +$ibo-caselog-entry-form--actions--margin-bottom: $ibo-caselog-entry-form--actions--margin-top !default; +.ibo-caselog-entry-form { + display: block; + width: 100%; + background-color: $ibo-caselog-entry-form--background-color; -.ibo-caselog-entry-form{ - display: block; - width: 100%; - background-color: $ibo-caselog-entry-form--background-color; - - &.ibo-is-closed{ - display: none; - } + &.ibo-is-closed { + display: none; + } } .ibo-caselog-entry-form--actions{ display: flex; diff --git a/css/backoffice/layout/blocks-integrations/_all.scss b/css/backoffice/layout/blocks-integrations/_all.scss new file mode 100644 index 000000000..d26605683 --- /dev/null +++ b/css/backoffice/layout/blocks-integrations/_all.scss @@ -0,0 +1,7 @@ +/*! + * @copyright Copyright (C) 2010-2021 Combodo SARL + * @license http://opensource.org/licenses/AGPL-3.0 + */ + +@import "caselog-entry-form-within-activity-panel"; +@import "panel-with-tab-container"; \ No newline at end of file diff --git a/css/backoffice/layout/blocks-integrations/_caselog-entry-form-within-activity-panel.scss b/css/backoffice/layout/blocks-integrations/_caselog-entry-form-within-activity-panel.scss new file mode 100644 index 000000000..01369af30 --- /dev/null +++ b/css/backoffice/layout/blocks-integrations/_caselog-entry-form-within-activity-panel.scss @@ -0,0 +1,14 @@ +/*! + * @copyright Copyright (C) 2010-2021 Combodo SARL + * @license http://opensource.org/licenses/AGPL-3.0 + */ + +$ibo-caselog-entry-form-within-activity-panel--padding-bottom: 14px !default; +$ibo-caselog-entry-form-within-activity-panel--border-bottom: 1px solid $ibo-color-grey-500 !default; + +.ibo-activity-panel--tab-entry-form { + .ibo-caselog-entry-form { + padding-bottom: $ibo-caselog-entry-form-within-activity-panel--padding-bottom; + border-bottom: $ibo-caselog-entry-form-within-activity-panel--border-bottom; + } +} \ No newline at end of file diff --git a/templates/base/layouts/activity-panel/caselog-entry-form/layout.html.twig b/templates/base/layouts/activity-panel/caselog-entry-form/layout.html.twig index 11ff0a8f9..77d1e800f 100644 --- a/templates/base/layouts/activity-panel/caselog-entry-form/layout.html.twig +++ b/templates/base/layouts/activity-panel/caselog-entry-form/layout.html.twig @@ -6,20 +6,21 @@ data-attribute-code="{{ oUIBlock.GetAttCode() }}" data-submit-mode="{{ oUIBlock.GetSubmitMode() }}" method="post"> -
- {{ render_block(oUIBlock.GetTextInput(), {aPage: aPage}) }} -
-
-
- {% for TextInputActionButton in oUIBlock.GetExtraActionButtons() %} - {{ render_block(TextInputActionButton, {aPage: aPage}) }} - {% endfor %} -
-
- {% for FormActionButton in oUIBlock.GetMainActionButtons() %} - {{ render_block(FormActionButton, {aPage: aPage}) }} - {% endfor %} - {{ render_block(oUIBlock.GetSendButtonPopoverMenu(), {aPage: aPage}) }} -
-
+
+
+ {% for TextInputActionButton in oUIBlock.GetExtraActionButtons() %} + {{ render_block(TextInputActionButton, {aPage: aPage}) }} + {% endfor %} +
+
+ {% for FormActionButton in oUIBlock.GetMainActionButtons() %} + {{ render_block(FormActionButton, {aPage: aPage}) }} + {% endfor %} + {{ render_block(oUIBlock.GetSendButtonPopoverMenu(), {aPage: aPage}) }} +
+
+
+ {{ render_block(oUIBlock.GetTextInput(), {aPage: aPage}) }} +
\ No newline at end of file diff --git a/templates/base/layouts/activity-panel/tab-toolbar/caselog.html.twig b/templates/base/layouts/activity-panel/tab-toolbar/caselog.html.twig index 6b45c3f94..1e844cf63 100644 --- a/templates/base/layouts/activity-panel/tab-toolbar/caselog.html.twig +++ b/templates/base/layouts/activity-panel/tab-toolbar/caselog.html.twig @@ -6,7 +6,7 @@ {% block bExtraDataAttributes %}data-caselog-attribute-code="{{ sCaseLogAttCode }}" data-caselog-rank="{{ loop.index }}"{% endblock %} -{% block bTabToolbarSecondRow %} +{% block bTabToolbarFirstRow %} {% if oUIBlock.HasCaseLogTabEntryForm(sCaseLogAttCode) %}
{{ render_block(oUIBlock.GetCaseLogTabEntryForm(sCaseLogAttCode)) }} diff --git a/templates/base/layouts/activity-panel/tab-toolbar/layout.html.twig b/templates/base/layouts/activity-panel/tab-toolbar/layout.html.twig index 681de8660..fbf990af0 100644 --- a/templates/base/layouts/activity-panel/tab-toolbar/layout.html.twig +++ b/templates/base/layouts/activity-panel/tab-toolbar/layout.html.twig @@ -3,72 +3,84 @@ data-tab-type="{% block bDataTabType %}{% endblock %}" {% block bExtraDataAttributes %}{% endblock %}> {% block bTabToolbarFirstRow %} -
- {% block bTabToolbarActions %} -
- {% block bTabToolbarLeftActions %} - - - - - - - {% endblock %} -
-
- {% if oUIBlock.HasCaseLogTabs() %} -
- {% endblock %} - {% block bTabToolbarSecondRow %} - {% endblock %} + {% endblock %} +
+ {% endblock %} +
+ {% endblock %} \ No newline at end of file