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

This commit is contained in:
Benjamin Dalsass
2024-05-30 09:21:58 +02:00
2 changed files with 12 additions and 5067 deletions

File diff suppressed because one or more lines are too long

View File

@@ -6011,6 +6011,10 @@ label {
border-color: #dddddd;
}
div.ck .ck-content{
min-height: 180px;
}
/*
* Specific to the combodo theme. Not standard BS classes
*/
@@ -6129,7 +6133,7 @@ table.dataTable{
}
}
/* CKEditor */
div.cke .cke_contents{
div.ck .ck-content{
height: 180px !important;
}
}
@@ -6152,7 +6156,7 @@ table.dataTable{
}
/* CKEditor */
div.cke .cke_contents{
div.ck .ck-content{
height: 120px !important;
}
}