composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Customers portal : Added some IDs in the layout to create new hooks

Browse Source 
SVN:trunk[4221]
This commit is contained in:
Guillaume Lajarige
2016-06-16 12:03:42 +00:00
parent c4660f1caf
commit ff5a96f92d
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php
View File

@@ -313,12 +313,6 @@ 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)
{

4
datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig
View File

@@ -44,9 +44,9 @@
<link href="{{ app['combodo.portal.base.absolute_url'] }}lib/typeahead/css/typeaheadjs.bootstrap.css" rel="stylesheet">
<link href="{{ app['combodo.absolute_url'] }}css/magnific-popup.css" rel="stylesheet">
{# - Bootstrap theme #}
<link href="{{ app['combodo.portal.instance.conf'].properties.themes.bootstrap }}" rel="stylesheet">
<link href="{{ app['combodo.portal.instance.conf'].properties.themes.bootstrap }}" rel="stylesheet" id="css_bootstrap_theme">
{# - Portal adjustments for BS theme #}
<link href="{{ app['combodo.portal.instance.conf'].properties.themes.portal }}" rel="stylesheet">
<link href="{{ app['combodo.portal.instance.conf'].properties.themes.portal }}" rel="stylesheet" id="css_portal">
{# Custom CSS that is supposed to do adjustments to the portal #}
{% if app['combodo.portal.instance.conf'].properties.themes.custom is defined %}
<link href="{{ app['combodo.portal.instance.conf'].properties.themes.custom }}" rel="stylesheet">

4
datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss vendored
View File

@@ -3457,9 +3457,6 @@ select[multiple].input-group-sm>.input-group-btn>.btn {
color: $white;
border-bottom: 1px solid #7D7D7D;
}
.navbar-nav>li.active {
box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.8) inset;
}
.navbar-nav>li.active:after{
content: " ";
position: absolute;
@@ -3471,6 +3468,7 @@ select[multiple].input-group-sm>.input-group-btn>.btn {
}
.navbar-nav>li.active>a{
margin-top: -1px; /* To mask border from previous li item */
box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.8) inset;
}
.navbar-nav>li>a {
padding-top: 11px;