diff --git a/css/backoffice/pages/_about.scss b/css/backoffice/pages/_about.scss new file mode 100644 index 000000000..607613d13 --- /dev/null +++ b/css/backoffice/pages/_about.scss @@ -0,0 +1,20 @@ +/* + * @copyright Copyright (C) 2010-2021 Combodo SARL + * @license http://opensource.org/licenses/AGPL-3.0 + */ +$ibo-about-box--top-part--children--padding-y: $ibo-spacing-500 !default; +$ibo-about-box--top-part--children--padding-x: $ibo-spacing-400 !default; +$ibo-about-box--top-part--children--margin-y: auto !default; +$ibo-about-box--top-part--children--margin-x: auto !default; +$ibo-about-box--top-part--children--width: 50% !default; + +.ibo-about-box--top-part{ + display: flex; + flex-direction: row; + align-content: center; + > div{ + padding: $ibo-about-box--top-part--children--padding-y $ibo-about-box--top-part--children--padding-x; + margin: $ibo-about-box--top-part--children--margin-y $ibo-about-box--top-part--children--margin-x; + width: $ibo-about-box--top-part--children--width; + } +} \ No newline at end of file diff --git a/css/backoffice/pages/_all.scss b/css/backoffice/pages/_all.scss index 11f5a7599..d911ff390 100644 --- a/css/backoffice/pages/_all.scss +++ b/css/backoffice/pages/_all.scss @@ -3,6 +3,7 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ +@import "about"; @import "base"; @import "preferences"; @import "attachments"; diff --git a/css/login.css b/css/login.css index bd7a5e7d9..392f584fb 100644 --- a/css/login.css +++ b/css/login.css @@ -59,8 +59,8 @@ a:hover { padding-right: 20px; padding-top: 10px; padding-bottom: 10px; - height: 54px; - margin-top: 150px; + height: 94px; + margin-top: 110px; } #login-content { @@ -75,9 +75,10 @@ a:hover { { #login-logo { margin-top: 0; + padding-top: 0; } #login-content { - margin-top: 74px; + margin-top: 94px; } h1 { margin-top: 0; @@ -86,7 +87,7 @@ a:hover { #login-logo img { border: 0; - max-height: 54px; + max-height: 94px; } #login-form { diff --git a/images/favicon.ico b/images/favicon.ico index 0d812b0f7..0b3cd4586 100644 Binary files a/images/favicon.ico and b/images/favicon.ico differ diff --git a/images/itop-logo-external.png b/images/itop-logo-external.png index 8bd1b0439..40f1a0535 100644 Binary files a/images/itop-logo-external.png and b/images/itop-logo-external.png differ diff --git a/images/itop-logo-square-64.png b/images/itop-logo-square-64.png index c88cf302f..63a369352 100644 Binary files a/images/itop-logo-square-64.png and b/images/itop-logo-square-64.png differ diff --git a/images/itop-logo-square.png b/images/itop-logo-square.png index 5f77d84d4..090de8adb 100644 Binary files a/images/itop-logo-square.png and b/images/itop-logo-square.png differ diff --git a/images/itop-logo.png b/images/itop-logo.png index 0519b9de7..58c0f4c4f 100644 Binary files a/images/itop-logo.png and b/images/itop-logo.png differ diff --git a/images/logo-combodo.png b/images/logo-combodo.png old mode 100755 new mode 100644 index 66b1e07d2..ae3b82348 Binary files a/images/logo-combodo.png and b/images/logo-combodo.png differ diff --git a/images/logo-itop-dark-bg.svg b/images/logo-itop-dark-bg.svg index 98f047d9c..4ce457db7 100644 --- a/images/logo-itop-dark-bg.svg +++ b/images/logo-itop-dark-bg.svg @@ -1,59 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/images/logos/logo-combodo-dark.svg b/images/logos/logo-combodo-dark.svg new file mode 100644 index 000000000..aad057c3b --- /dev/null +++ b/images/logos/logo-combodo-dark.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + diff --git a/images/logos/logo-combodo-light.svg b/images/logos/logo-combodo-light.svg new file mode 100644 index 000000000..39687130a --- /dev/null +++ b/images/logos/logo-combodo-light.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + diff --git a/images/logos/logo-itop-baseline-dark.svg b/images/logos/logo-itop-baseline-dark.svg new file mode 100644 index 000000000..444ba89e7 --- /dev/null +++ b/images/logos/logo-itop-baseline-dark.svg @@ -0,0 +1,63 @@ + + + + + + + + + + + diff --git a/images/logos/logo-itop-baseline-light.svg b/images/logos/logo-itop-baseline-light.svg new file mode 100644 index 000000000..ffea897a0 --- /dev/null +++ b/images/logos/logo-itop-baseline-light.svg @@ -0,0 +1,62 @@ + + + + + + + + + + + diff --git a/images/logos/logo-itop-compact-dark.svg b/images/logos/logo-itop-compact-dark.svg new file mode 100644 index 000000000..1acc17bd3 --- /dev/null +++ b/images/logos/logo-itop-compact-dark.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/images/logos/logo-itop-compact-light.svg b/images/logos/logo-itop-compact-light.svg new file mode 100644 index 000000000..4a7532d6d --- /dev/null +++ b/images/logos/logo-itop-compact-light.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/images/logos/logo-itop-compact-orange.svg b/images/logos/logo-itop-compact-orange.svg new file mode 100644 index 000000000..cd71f0537 --- /dev/null +++ b/images/logos/logo-itop-compact-orange.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/images/logos/logo-itop-simple-dark.svg b/images/logos/logo-itop-simple-dark.svg new file mode 100644 index 000000000..c1a545cdb --- /dev/null +++ b/images/logos/logo-itop-simple-dark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/logos/logo-itop-simple-light.svg b/images/logos/logo-itop-simple-light.svg new file mode 100644 index 000000000..4ce457db7 --- /dev/null +++ b/images/logos/logo-itop-simple-light.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/setup/setuppage.class.inc.php b/setup/setuppage.class.inc.php index e89d85087..6a867ac6d 100644 --- a/setup/setuppage.class.inc.php +++ b/setup/setuppage.class.inc.php @@ -157,7 +157,7 @@ class SetupPage extends NiceWebPage public function output() { - $sLogo = utils::GetAbsoluteUrlAppRoot().'/images/itop-logo.png?t='.utils::GetCacheBusterTimestamp(); + $sLogo = utils::GetAbsoluteUrlAppRoot().'/images/logos/logo-itop-simple-dark.svg?t='.utils::GetCacheBusterTimestamp(); $oSetupPage = UIContentBlockUIBlockFactory::MakeStandard(); $oHeader = UIContentBlockUIBlockFactory::MakeStandard('header', ['ibo-setup--header']); $oSetupPage->AddSubBlock($oHeader); diff --git a/sources/Controller/AjaxRenderController.php b/sources/Controller/AjaxRenderController.php index 68ba32c0f..86c8f4baf 100644 --- a/sources/Controller/AjaxRenderController.php +++ b/sources/Controller/AjaxRenderController.php @@ -826,9 +826,8 @@ $('#about_box').dialog({ EOF ); $sVersionString = Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION); - $oPage->add("
"); - $oPage->add('
'); - $oPage->add(''); + $oPage->add('
'); + $oPage->add('
'); $oPage->add('
'.$sVersionString.'
'); $oPage->add("
"); self::DisplayAboutLicenses($oPage); @@ -909,18 +908,9 @@ EOF // Display // - $oPage->add("
"); - $oPage->add('
'); - $oPage->add(''); - $oPage->add(''); - $oPage->add(''); - $oPage->add(''); - $oPage->add(''); - $oPage->add('
'); - $oPage->add($sVersionString.'
'); - $oPage->add('MySQL: '.$sMySQLVersion.'
'); - $oPage->add('PHP: '.$sPHPVersion.'
'); - $oPage->add('
'); + $oPage->add('
'); + $oPage->add('
'); + $oPage->add('
'.$sVersionString.'
'.'MySQL: '.$sMySQLVersion.'
'.'PHP: '.$sPHPVersion.'
'); $oPage->add("
"); self::DisplayAboutLicenses($oPage); diff --git a/sources/application/Branding.php b/sources/application/Branding.php index d488dbba1..1785f68ba 100644 --- a/sources/application/Branding.php +++ b/sources/application/Branding.php @@ -44,16 +44,16 @@ class Branding /** @var \string[][] Relative paths to the logos from the current environment folder */ public static $aLogoPaths = [ self::ENUM_LOGO_TYPE_MAIN_LOGO_FULL => [ - 'default' => 'images/itop-logo.png', + 'default' => 'images/logos/logo-itop-simple-light.svg', ], self::ENUM_LOGO_TYPE_MAIN_LOGO_COMPACT => [ - 'default' => 'images/itop-logo-square.png', + 'default' => 'images/logos/logo-itop-compact-orange.svg', ], self::ENUM_LOGO_TYPE_PORTAL_LOGO => [ - 'default' => 'images/logo-itop-dark-bg.svg', + 'default' => 'images/logos/logo-itop-simple-light.svg', ], self::ENUM_LOGO_TYPE_LOGIN_LOGO => [ - 'default' => 'images/itop-logo.png', + 'default' => 'images/logos/logo-itop-baseline-dark.svg', ], ];