From 41c833d0c600697b143d75960fb023d856220ec2 Mon Sep 17 00:00:00 2001 From: Molkobain Date: Fri, 2 Oct 2020 11:05:43 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B02847=20-=20Work=20on=20TabContainer:=20M?= =?UTF-8?q?ove=20SCSS=20and=20HTML=20files=20to=20the=20layout=20folder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/backoffice/components/_all.scss | 2 -- .../components/tab-container/_tab.scss | 28 ------------------- css/backoffice/layout/_all.scss | 2 ++ .../tab-container/_tab-container.scss | 6 ++++ css/backoffice/layout/tab-container/_tab.scss | 4 +++ .../layouts/tab-container/layout.html.twig | 2 +- 6 files changed, 13 insertions(+), 31 deletions(-) delete mode 100644 css/backoffice/components/tab-container/_tab.scss rename css/backoffice/{components => layout}/tab-container/_tab-container.scss (87%) create mode 100644 css/backoffice/layout/tab-container/_tab.scss diff --git a/css/backoffice/components/_all.scss b/css/backoffice/components/_all.scss index 2c9b5438d..d2f30fb49 100644 --- a/css/backoffice/components/_all.scss +++ b/css/backoffice/components/_all.scss @@ -13,8 +13,6 @@ @import "popover-menu/popover-menu-item"; @import "newsroom-menu"; -@import "tab-container/tab-container"; -@import "tab-container/tab"; @import "title"; @import "form"; @import "input"; diff --git a/css/backoffice/components/tab-container/_tab.scss b/css/backoffice/components/tab-container/_tab.scss deleted file mode 100644 index 7dd76f768..000000000 --- a/css/backoffice/components/tab-container/_tab.scss +++ /dev/null @@ -1,28 +0,0 @@ -/*! - * @copyright Copyright (C) 2010-2020 Combodo SARL - * @license http://opensource.org/licenses/AGPL-3.0 - */ - -.ibo-tab--header { - a { - @extend %ibo-font-ral-med-200; - color: $ibo-color-grey-700; - - :hover { - color: $ibo-color-grey-900; - } - } - - &.ui-state-active a { - color: $ibo-color-blue-800; - @extend %ibo-font-ral-bol-200; - - :hover { - color: $ibo-color-blue-800; - } - } -} - -.ibo-tab--content { - background: $ibo-color-white-100; -} \ No newline at end of file diff --git a/css/backoffice/layout/_all.scss b/css/backoffice/layout/_all.scss index 10d74647e..801788e08 100644 --- a/css/backoffice/layout/_all.scss +++ b/css/backoffice/layout/_all.scss @@ -19,6 +19,8 @@ @import "navigation-menu"; @import "top-bar"; @import "content"; +@import "tab-container/tab-container"; +@import "tab-container/tab"; @import "multi-column/multi-column"; @import "multi-column/column"; @import "object-details"; diff --git a/css/backoffice/components/tab-container/_tab-container.scss b/css/backoffice/layout/tab-container/_tab-container.scss similarity index 87% rename from css/backoffice/components/tab-container/_tab-container.scss rename to css/backoffice/layout/tab-container/_tab-container.scss index 69b3919aa..d642e78d8 100644 --- a/css/backoffice/components/tab-container/_tab-container.scss +++ b/css/backoffice/layout/tab-container/_tab-container.scss @@ -16,6 +16,9 @@ $ibo-tab-container--tab-header--background-color--on-hover: $ibo-color-grey-200 $ibo-tab-container--tab-toggler--padding-x: 24px !default; +$ibo-tab-container--tab-container--padding-x: 32px !default; +$ibo-tab-container--tab-container--padding-y: 32px !default; + /* Rules */ .ibo-tab-container--tabs-list { @extend %ibo-full-height-content; @@ -52,3 +55,6 @@ $ibo-tab-container--tab-toggler--padding-x: 24px !default; } } +.ibo-tab-container--tab-container{ + padding: $ibo-tab-container--tab-container--padding-y $ibo-tab-container--tab-container--padding-x; +} \ No newline at end of file diff --git a/css/backoffice/layout/tab-container/_tab.scss b/css/backoffice/layout/tab-container/_tab.scss new file mode 100644 index 000000000..129f70444 --- /dev/null +++ b/css/backoffice/layout/tab-container/_tab.scss @@ -0,0 +1,4 @@ +/*! + * @copyright Copyright (C) 2010-2020 Combodo SARL + * @license http://opensource.org/licenses/AGPL-3.0 + */ diff --git a/templates/layouts/tab-container/layout.html.twig b/templates/layouts/tab-container/layout.html.twig index 6bc633130..b25550094 100644 --- a/templates/layouts/tab-container/layout.html.twig +++ b/templates/layouts/tab-container/layout.html.twig @@ -19,7 +19,7 @@ {% block iboTabContainerTabsContainers %} {% for oTab in oUIBlock.GetSubBlocks() %} - {% if oTab.GetType() == 'html' %} + {% if oTab.GetType() == constant('TabManager::ENUM_TAB_TYPE_HTML') %}
{{ render_block(oTab, {aPage: aPage}) }}