composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-20 00:58:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Portal: CKEditor fields now have different height regarding the form layout (cosy, compact, dense)

Browse Source 
SVN:trunk[4749]
This commit is contained in:
Guillaume Lajarige
2017-05-23 13:15:22 +00:00
parent 2118a5da71
commit 905d47cab5
4 changed files with 52 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}
}

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

@@ -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;
}
}
}

8
datamodels/2.x/itop-portal-base/portal/web/css/portal.css
View File

@@ -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;

8
datamodels/2.x/itop-portal-base/portal/web/css/portal.scss
View File

@@ -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;