From c4660f1cafa06951512af1d62cef446ce8ec5164 Mon Sep 17 00:00:00 2001 From: Guillaume Lajarige Date: Thu, 16 Jun 2016 09:51:18 +0000 Subject: [PATCH] Customers portal : CSS is now separated into a Bootstrap theme stylesheet and another one specific to the template. It is also based on SASS like the console CSSs SVN:trunk[4220] --- .../helpers/applicationhelper.class.inc.php | 6 + .../src/views/bricks/browse/layout.html.twig | 2 +- .../src/views/bricks/manage/layout.html.twig | 2 +- .../portal/src/views/layout.html.twig | 2 +- .../web/css/bootstrap-theme-combodo.scss | 369 +++++++++--------- .../portal/web/css/bootstrap-theme.min.css | 11 - .../portal/web/css/portal.scss | 350 ++--------------- .../portal/web/css/variables.scss | 14 +- 8 files changed, 230 insertions(+), 526 deletions(-) delete mode 100644 datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme.min.css diff --git a/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php index 23877e5985..3fdb994dcf 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php @@ -313,6 +313,12 @@ class ApplicationHelper 'bricks' => array(), 'bricks_total_width' => 0 ); + $aPortalConf['properties']['themes']['bootstrap'] = 'itop-portal-base/portal/web/css/bootstrap-theme-simplex.min.css'; + $aPortalConf['properties']['themes']['bootstrap'] = 'itop-portal-base/portal/web/css/bootstrap-theme-darkly.min.css'; + $aPortalConf['properties']['themes']['bootstrap'] = 'itop-portal-base/portal/web/css/bootstrap-theme-flatly.min.css'; + $aPortalConf['properties']['themes']['bootstrap'] = 'itop-portal-base/portal/web/css/bootstrap-theme-slate.min.css'; + $aPortalConf['properties']['themes']['bootstrap'] = 'itop-portal-base/portal/web/css/bootstrap-theme-superhero.min.css'; + $aPortalConf['properties']['themes']['bootstrap'] = 'itop-portal-base/portal/web/css/bootstrap-theme-united.min.css'; // - Global portal properties foreach ($oDesign->GetNodes('/module_design/properties/*') as $oPropertyNode) { diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/layout.html.twig index bb6c583807..e2721483b6 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/layout.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/layout.html.twig @@ -8,7 +8,7 @@ {% block pMainHeaderActions %} {% if aBrowseButtons|length > 1 %} -
+
{% for sBrowseButton in aBrowseButtons %} {{ ('Brick:Portal:Browse:Mode:'~sBrowseButton|capitalize)|dict_s }} {% endfor %} diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/manage/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/manage/layout.html.twig index dfd8e82bfb..e771c41553 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/manage/layout.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/manage/layout.html.twig @@ -8,7 +8,7 @@ {% block pMainHeaderActions %} {% if aGroupingTabsValues|length > 1 %} -
+
{% for aGroupingTab in aGroupingTabsValues %} {{ aGroupingTab.label|raw }} {% endfor %} diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig index 424ffda15b..02a9ad24e7 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig @@ -169,7 +169,7 @@ {# Sidebar navigation menu for normal screens #}