diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css b/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css index 5ebd444045..df015a3c25 100644 --- a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css +++ b/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css @@ -4971,6 +4971,16 @@ label { padding: 4px 10px; font-size: 12px; } + .form_field_compact { + /* Small fields */ + /* CKEditor */ + } + .form_field_compact div.cke .cke_contents { + height: 180px !important; + } + .form_field_dense { + /* CKEditor */ + } .form_field_dense .form-group.form_group_small { display: flex; display: -webkit-flex; @@ -4985,4 +4995,7 @@ label { -webkit-flex-grow: 1; -ms-flex-grow: 1; } + .form_field_dense div.cke .cke_contents { + height: 120px !important; + } } diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss b/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss index 737b9bec5b..bb8629d9c5 100644 --- a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss +++ b/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss @@ -6059,30 +6059,44 @@ label { } } /* Compact mode */ - .form_field_compact .form-group.form_group_small{ - @extend .row; + .form_field_compact{ + /* Small fields */ + .form-group.form_group_small{ + @extend .row; - .form_field_label{ - @extend .col-sm-3; + .form_field_label{ + @extend .col-sm-3; + } + .form_field_control{ + @extend .col-sm-9; + } } - .form_field_control{ - @extend .col-sm-9; + /* CKEditor */ + div.cke .cke_contents{ + height: 180px !important; } } /* Dense mode */ - .form_field_dense .form-group.form_group_small{ - display: flex; - display: -webkit-flex; - display: -ms-flex; + .form_field_dense{ + .form-group.form_group_small{ + display: flex; + display: -webkit-flex; + display: -ms-flex; - .form_field_label{ - margin-right: 0.7em; - white-space: nowrap; + .form_field_label{ + margin-right: 0.7em; + white-space: nowrap; + } + .form_field_control{ + flex-grow: 1; + -webkit-flex-grow: 1; + -ms-flex-grow: 1; + } } - .form_field_control{ - flex-grow: 1; - -webkit-flex-grow: 1; - -ms-flex-grow: 1; + + /* CKEditor */ + div.cke .cke_contents{ + height: 120px !important; } } } diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/portal.css b/datamodels/2.x/itop-portal-base/portal/web/css/portal.css index 82a6c19763..fcb8af7675 100644 --- a/datamodels/2.x/itop-portal-base/portal/web/css/portal.css +++ b/datamodels/2.x/itop-portal-base/portal/web/css/portal.css @@ -14,6 +14,7 @@ } footer { margin: 5em 1em; + text-align: center; } /* Environment banner */ #envbanner { @@ -177,6 +178,9 @@ footer { .overlay_content { text-align: center; } +.content_loader { + text-align: center; +} .content_loader .icon { margin-bottom: 0.3em; /*width: 52px;*/ @@ -1125,10 +1129,6 @@ table .group-actions { border-radius: 0px; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } -/* CKEditor : Styling basics */ -.form_field div.cke .cke_contents { - height: 180px !important; -} /* CKEditor : Styling notifications based on BS alerts */ .cke_notification { position: relative; diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/portal.scss b/datamodels/2.x/itop-portal-base/portal/web/css/portal.scss index 78dc76705a..d46c511d64 100644 --- a/datamodels/2.x/itop-portal-base/portal/web/css/portal.scss +++ b/datamodels/2.x/itop-portal-base/portal/web/css/portal.scss @@ -17,6 +17,7 @@ } footer{ margin: 5em 1em; + text-align: center; } /* Environment banner */ @@ -188,6 +189,9 @@ footer{ .overlay_content{ text-align: center; } +.content_loader{ + text-align: center; +} .content_loader .icon{ margin-bottom: 0.3em; /*width: 52px;*/ @@ -1195,10 +1199,6 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{ border-radius: $border-radius-base; box-shadow: inset 0 1px 1px rgba(0,0,0,0.075); } -/* CKEditor : Styling basics */ -.form_field div.cke .cke_contents{ - height: 180px !important; -} /* CKEditor : Styling notifications based on BS alerts */ .cke_notification{ position: relative;