From 96faad7539de0dbfd547a93211c3c02eda6a026c Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 8 Feb 2021 11:30:25 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B03565=20-=20Migrate=20backoffice=20pages?= =?UTF-8?q?=20to=20new=20UIBlock=20system=20:=20Setup=20(fix=20some=20font?= =?UTF-8?q?s)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/setup.css | 14 +++++++++++++- css/setup.scss | 4 ++++ setup/wizardsteps.class.inc.php | 6 +++--- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/css/setup.css b/css/setup.css index 256e53965..fa8c7f6a3 100644 --- a/css/setup.css +++ b/css/setup.css @@ -462,7 +462,7 @@ -moz-font-feature-settings: "lnum"; font-feature-settings: "lnum"; } -.ibo-alert, .ibo-button, .ui-dialog .ui-button, .ui-datepicker-current, .ui-datepicker-close, .ibo-prop--apply > span, .ibo-prop--cancel > span, .sf_results_placeholder button, .sfc_fg_button, .ibo-dashlet--delete, .ibo-dashlet-badge--action-create, .sf_results_placeholder, .ibo-dashboard--properties--subtitle, .ibo-dashboard--available-dashlet--title, .ibo-dashlet--properties--title { +.ibo-alert, .ibo-dashlet-badge--action-create, .sf_results_placeholder, .ibo-dashboard--properties--subtitle, .ibo-dashboard--available-dashlet--title, .ibo-dashlet--properties--title { font-size: 1.17rem; font-family: "Raleway"; font-weight: 500; @@ -518,6 +518,14 @@ ul.cke_autocomplete_panel .ibo-vendors-ckeditor--autocomplete-item-title, .ibo-n -moz-font-feature-settings: "lnum"; font-feature-settings: "lnum"; } +.ibo-button, .ui-dialog .ui-button, .ui-datepicker-current, .ui-datepicker-close, .ibo-prop--apply > span, .ibo-prop--cancel > span, .sf_results_placeholder button, .sfc_fg_button, .ibo-dashlet--delete { + font-size: 1rem; + font-family: "Raleway"; + font-weight: 600; + -webkit-font-feature-settings: "lnum"; + -moz-font-feature-settings: "lnum"; + font-feature-settings: "lnum"; +} .ibo-navigation-menu--menu-filter-hint { font-size: 0.83rem; font-family: "Raleway"; @@ -10930,6 +10938,7 @@ a:active { } .ibo-button, .ui-dialog .ui-button, .ui-datepicker-current, .ui-datepicker-close, .ibo-prop--apply > span, .ibo-prop--cancel > span, .sf_results_placeholder button, .sfc_fg_button, .ibo-dashlet--delete { cursor: pointer; + text-transform: uppercase; padding: 6px 9px; border: 0; border-radius: 4px; @@ -14984,4 +14993,7 @@ body { .ibo-setup--button-bar .ibo-setup--full-width { width: 100%; } +.ibo-setup-summary-title { + font-size: 1.17rem; +} /* integrityCheck: end (do not remove/edit) */ diff --git a/css/setup.scss b/css/setup.scss index 2c8e4badb..7c4078746 100644 --- a/css/setup.scss +++ b/css/setup.scss @@ -468,4 +468,8 @@ body { } } +.ibo-setup-summary-title { + font-size: $ibo-font-size-150; +} + /* integrityCheck: end (do not remove/edit) */ \ No newline at end of file diff --git a/setup/wizardsteps.class.inc.php b/setup/wizardsteps.class.inc.php index 0490c1ce6..9bf3ebc48 100644 --- a/setup/wizardsteps.class.inc.php +++ b/setup/wizardsteps.class.inc.php @@ -2213,7 +2213,7 @@ CSS $oPage->add('
Installation Parameters'); $oPage->add('
'); - $oPage->add('
Database Parameters
    '); + $oPage->add('
    Database Parameters
      '); $oPage->add('
    • Server Name: '.$aInstallParams['database']['server'].'
    • '); $oPage->add('
    • DB User Name: '.$aInstallParams['database']['user'].'
    • '); $oPage->add('
    • DB user password: '.$aInstallParams['database']['pwd'].'
    • '); @@ -2235,11 +2235,11 @@ CSS } $oPage->add('
    '); - $oPage->add('
    Data Model Configuration'); + $oPage->add('
    Data Model Configuration'); $oPage->add($this->oWizard->GetParameter('display_choices')); $oPage->add('
    '); - $oPage->add('
    Other Parameters
      '); + $oPage->add('
      Other Parameters
        '); if ($sMode == 'install') { $oPage->add('
      • Default language: '.$aInstallParams['language'].'
      • ');