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

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source 
# Conflicts:
#	composer.lock
#	core/email.class.inc.php
#	datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
#	lib/bin/generate-deps-for-config-factory
#	lib/bin/generate-deps-for-config-factory.bat
#	lib/bin/generate-factory-for-class
#	lib/bin/generate-factory-for-class.bat
#	lib/composer/autoload_classmap.php
#	lib/composer/autoload_files.php
#	lib/composer/autoload_psr4.php
#	lib/composer/autoload_real.php
#	lib/composer/autoload_static.php
#	lib/composer/installed.json
#	lib/composer/installed.php
#	lib/laminas/laminas-servicemanager/bin/generate-deps-for-config-factory
#	lib/laminas/laminas-servicemanager/bin/generate-factory-for-class
#	lib/laminas/laminas-servicemanager/src/AbstractPluginManager.php
#	lib/laminas/laminas-servicemanager/src/ServiceManager.php
#	lib/laminas/laminas-validator/src/Db/AbstractDb.php
#	lib/laminas/laminas-validator/src/Isbn/Isbn10.php
#	lib/laminas/laminas-validator/src/Isbn/Isbn13.php
#	sources/Core/Email/EmailFactory.php
#	templates/pages/backoffice/oauth/Wizard.html.twig
This commit is contained in:
Pierre Goiffon
2022-06-14 09:40:51 +02:00
parent 7176218a5f fb64fbab0b
commit 44a8bfd764
14 changed files with 600 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
css/backoffice/pages/_all.scss
View File

@@ -14,4 +14,5 @@
@import "csv-import";
@import "global-search";
@import "run-query";
@import "welcome-popup";
@import "welcome-popup";
@import "oauth.wizard";

16
css/backoffice/pages/_oauth.wizard.scss Normal file
View File

@@ -0,0 +1,16 @@
.ibo-oauth-wizard .ibo-panel--body{
.ibo-oauth-wizard--form--container{
display: flex;
flex-direction: row;
flex-grow: 1;
}
.ibo-oauth-wizard--form {
}
.ibo-oauth-wizard--illustration svg{
max-height: 400px;
}
}
#ibo-oauth-wizard--conf--result{
white-space: pre-wrap
}