Commit b8a6e72a authored by alexpott's avatar alexpott

Issue #2485425 by MathieuSpil, iro, saki007ster, Wim Leers, Manjit.Singh,...

Issue #2485425 by MathieuSpil, iro, saki007ster, Wim Leers, Manjit.Singh, wiifm, kostask, Studiographene, alvar0hurtad0, LewisNyman: Clean up editor CSS inline with our CSS standards
parent 7594f7eb
......@@ -215,9 +215,10 @@
// Add a consistent dialog class.
var classes = dialogSettings.dialogClass ? dialogSettings.dialogClass.split(' ') : [];
classes.push('editor-dialog');
classes.push('ui-dialog--narrow');
dialogSettings.dialogClass = classes.join(' ');
dialogSettings.autoResize = Drupal.checkWidthBreakpoint(600);
dialogSettings.width = 'auto';
// Add a "Loading…" message, hide it underneath the CKEditor toolbar,
// create a Drupal.Ajax instance to load the dialog and trigger it.
......@@ -248,7 +249,7 @@
// Moves the dialog to the top of the CKEDITOR stack.
$(window).on('dialogcreate', function (e, dialog, $element, settings) {
$('.editor-dialog').css("zIndex", CKEDITOR.config.baseFloatZIndex + 1);
$('.ui-dialog--narrow').css("zIndex", CKEDITOR.config.baseFloatZIndex + 1);
});
// Respond to new dialogs that are opened by CKEditor, closing the AJAX loader.
......
......@@ -104,7 +104,7 @@ public function testEditorImageDialog() {
],
'dialogOptions' => [
'title' => 'Edit Image',
'dialogClass' => 'editor-image-dialog editor-dialog',
'dialogClass' => 'editor-image-dialog',
'autoResize' => 'true',
],
'_drupal_ajax' => '1',
......
......@@ -24,6 +24,7 @@ base:
css/components/tablesort.css: { weight: -10 }
css/components/tabs.css: { weight: -10 }
css/components/textarea.css: { weight: -10 }
css/components/ui-dialog.css: { weight: -10 }
book-navigation:
version: VERSION
......
/**
* @file
* Styles for text editors.
* Styles for Classy's modal windows.
*/
.editor-dialog {
/* This !important is required to override inline CSS of jQuery UI. */
width: 80% !important;
.ui-dialog--narrow {
max-width: 500px;
}
@media screen and (max-width: 600px) {
.editor-dialog {
width: 95% !important;
.ui-dialog--narrow {
max-width: 95%;
min-width: 95%;
}
}
......@@ -11,7 +11,8 @@
}
@media all and (max-width: 48em) { /* 768px */
.ui-dialog {
width: 92% !important;
min-width: 92%;
max-width: 92%;
}
}
.ui-dialog .ui-dialog-titlebar {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment