diff --git a/editors/ckeditor_4_4/config.js b/editors/ckeditor_4_4/config.js index baf41d3be..e52959251 100644 --- a/editors/ckeditor_4_4/config.js +++ b/editors/ckeditor_4_4/config.js @@ -36,7 +36,7 @@ CKEDITOR.editorConfig = function (config) { '/', {name: 'other', items: ['Scayt', 'Strike', 'SpecialChar']}, {name: 'vec', items:['Styles', 'Format', 'Outdent', 'Indent', 'HorizontalRule']}, - {name: 'insert', items: ['CreateDiv', 'Flash', 'Table', 'IFrame', 'Youtube', 'Abbr']}, + {name: 'insert', items: ['CreateDiv', 'Table', 'IFrame', 'Youtube', 'Abbr']}, ]; /*config.toolbar = [ diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 2e3ae805c..e1d88d61f 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -9695,13 +9695,6 @@ div.button_holder.float-right button { margin-left: 16px; margin-right: 0; } -div.button_holder.editor_button_holder { - margin: 0; - padding: 8px 16px; - border-bottom: 1px #cccccc solid; - border-left: 1px #cccccc solid; - border-right: 1px #cccccc solid; -} label { cursor: pointer; @@ -10449,6 +10442,33 @@ header #top_line #enka_nav .anketa_header_upgrade_package button { color: #FFC700 !important; } +.cke_1.cke_chrome { + border-bottom: 1px #E5E5E5 solid !important; + border-radius: 2px 2px 0 0; +} + +#cke_1_top { + border-bottom: 1px #E5E5E5 solid; +} + +.cke_dialog { + border: 1px #E5E5E5 solid !important; +} + +div.button_holder.editor_button_holder { + margin: 0; + padding: 8px 16px; + border-bottom: 1px #cccccc solid; + border-left: 1px #cccccc solid; + border-right: 1px #cccccc solid; + border-radius: 0 0 2px 2px; +} + +.cke_dialog table tr td, +.cke_dialog table tr th { + border-bottom: 0 !important; +} + /* Specific pages scss */ diff --git a/resources/sass/admin_new/components/ckeditor/ckeditor.scss b/resources/sass/admin_new/components/ckeditor/ckeditor.scss new file mode 100644 index 000000000..4fb4530c9 --- /dev/null +++ b/resources/sass/admin_new/components/ckeditor/ckeditor.scss @@ -0,0 +1,29 @@ + +.cke_1.cke_chrome { + border-bottom: 1px $gray solid !important; + border-radius: 2px 2px 0 0; +} + +#cke_1_top{ + border-bottom: 1px $gray solid; +} + +.cke_dialog{ + border: 1px $gray solid !important; +} + +div.button_holder.editor_button_holder{ + margin: 0; + padding: 8px 16px; + + border-bottom: 1px rgb(204, 204, 204) solid; + border-left: 1px rgb(204, 204, 204) solid; + border-right: 1px rgb(204, 204, 204) solid; + + border-radius: 0 0 2px 2px; +} + +.cke_dialog table tr td, +.cke_dialog table tr th{ + border-bottom: 0 !important; +} \ No newline at end of file diff --git a/resources/sass/admin_new/components/components.scss b/resources/sass/admin_new/components/components.scss index 1af8621b0..0b6cf5c9a 100644 --- a/resources/sass/admin_new/components/components.scss +++ b/resources/sass/admin_new/components/components.scss @@ -15,4 +15,7 @@ @import "table/table"; // Payments -@import "payments/payments"; \ No newline at end of file +@import "payments/payments"; + +// CKEditor +@import "ckeditor/ckeditor"; \ No newline at end of file diff --git a/resources/sass/admin_new/components/form/button.scss b/resources/sass/admin_new/components/form/button.scss index de4421b06..03ec804d9 100644 --- a/resources/sass/admin_new/components/form/button.scss +++ b/resources/sass/admin_new/components/form/button.scss @@ -234,13 +234,4 @@ div.button_holder { margin-right: 0; } } - - &.editor_button_holder{ - margin: 0; - padding: 8px 16px; - - border-bottom: 1px rgb(204, 204, 204) solid; - border-left: 1px rgb(204, 204, 204) solid; - border-right: 1px rgb(204, 204, 204) solid; - } }