Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added ckeditor plugin registry #643

Merged
merged 3 commits into from
May 31, 2016
Merged

Added ckeditor plugin registry #643

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a84369
added ckeditor plugin registry
wachterjohannes Apr 26, 2016
7770ac5
fixed comments
wachterjohannes May 30, 2016
adcf4b1
fixed editor destroy
wachterjohannes May 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* dev-develop
* BUGFIX #652 Added hide tabs for only one single tab
* ENHANCEMENT #651 Added auto-start option for ckeditor component
* FEATURE #643 Added ckeditor plugin registry
* BUGFIX #644 Fixed scrollable tabs
* FEATURE #641 Added preselect callback for toolbar button
* BUGFIX #633 Removed bound effect respectively additional scrollbar
Expand Down
1 change: 1 addition & 0 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,7 @@ module.exports = function(grunt) {
'requirejs:dev',
'compass',
'cssmin',
'copy:ckeditor_theme',
'copy:dist',
'yuidoc'
]);
Expand Down
169 changes: 75 additions & 94 deletions bower_components/ckeditor/skins/husky/dialog.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
.cke_dialog {
visibility: visible;
width: 400px !important;
max-width: 700px !important;
}

.cke_dialog tbody{
max-width: 700px !important;
}

.cke_dialog_background_cover {
Expand All @@ -30,23 +35,24 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
}

.cke_dialog_title {
font-size: 13px;
cursor: move;
position: relative;
color: #999;
padding: 12px 0 10px 20px;
font-size: 24px;
vertical-align: middle;
display: block;
font-size: 23px;
-moz-border-radius: 2px 2px 0 0;
-webkit-border-radius: 2px 2px 0 0;
border-radius: 2px 2px 0 0;
-moz-box-shadow: 0 1px 0 #fff inset;
-webkit-box-shadow: 0 1px 0 #fff inset;
background: #efefef !important;
white-space: nowrap;
overflow: hidden;
padding: 0 20px;
text-overflow: ellipsis;
line-height: 100px;
text-align: center;
position: relative;
background: #fff;
border-radius: 3px 3px 0 0;
height: 100px;
cursor: move;
}

.cke_dialog_contents {
background-color: #fff;
overflow: auto;
padding: 15px 10px 5px 10px;
margin-top: 30px;
Expand All @@ -56,6 +62,12 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
border-radius: 0 0 3px 3px
}

.cke_dialog_contents tr,
.cke_dialog_contents td {
background-image: none !important;
background-color: #e9e9e9;
}

.cke_dialog_contents_body {
overflow: auto;
padding: 15px 20px 0;
Expand All @@ -75,6 +87,8 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
text-align: right;
position: relative;
border-top: 1px solid #ccc !important;
padding: 20px;
background-color: #e9e9e9;
}

.cke_hc .cke_dialog_footer {
Expand Down Expand Up @@ -178,52 +192,7 @@ a.cke_dialog_tab_disabled {
}

.cke_dialog_close_button {
position: absolute;
cursor: pointer;
text-align: center;
height: 20px;
width: 20px;
top: 5px;
z-index: 5;
font-family: FontAwesome;
font-style: normal;
font-weight: 400;
font-size: 16px;
background-repeat: no-repeat;
-webkit-font-smoothing: antialiased;
}

.cke_dialog_close_button::before {
content: '\f00d';
}

.cke_hidpi .cke_dialog_close_button {
background-image: url(images/hidpi/close.png);
background-size: 16px
}

.cke_dialog_close_button span {
display: none
}

.cke_hc .cke_dialog_close_button span {
display: inline;
cursor: pointer;
font-weight: bold;
position: relative;
top: 3px
}

.cke_ltr .cke_dialog_close_button {
right: 5px
}

.cke_rtl .cke_dialog_close_button {
left: 6px
}

.cke_dialog_close_button {
top: 4px
display: none;
}

div.cke_disabled .cke_dialog_ui_labeled_content div * {
Expand All @@ -244,12 +213,13 @@ div.cke_disabled .cke_dialog_ui_labeled_content div * {
}

.cke_dialog_footer .sulu_cancel_button {
display: none;
padding: 5px;
text-align: left;
}

.cke_dialog_footer .sulu_ok_button {
padding: 5px;
text-align: center;
text-align: right;
}

.cke_dialog_ui_hbox_first, .cke_dialog_ui_hbox_child, .cke_dialog_ui_hbox_last {
Expand Down Expand Up @@ -294,60 +264,66 @@ input.cke_dialog_ui_input_text, input.cke_dialog_ui_input_password, textarea.cke
margin-bottom: 15px;
}

input.cke_dialog_ui_input_text:hover, input.cke_dialog_ui_input_password:hover, textarea.cke_dialog_ui_input_textarea:hover {
border: 1px solid #aeb3b9;
border-top-color: #a0a6ad
}

input.cke_dialog_ui_input_text:focus, input.cke_dialog_ui_input_password:focus, textarea.cke_dialog_ui_input_textarea:focus, select.cke_dialog_ui_input_select:focus {
a.cke_dialog_ui_button_ok,
a.cke_dialog_ui_button_cancel {
position: relative;
display: inline-block;
min-width: 115px;
margin: 0 auto;
padding: 0;
border: 0;
border-radius: 3px;
background-color: #FFF;
cursor: pointer;
line-height: 30px;
height: 30px;
outline: 0;
border: 1px solid #139ff7;
border-top-color: #1392e9
text-align: center;
}

a.cke_dialog_ui_button_ok {
position: relative;
display: inline-block;
margin-top: 5px;
margin-bottom: 5px;
background: #52b6ca;
border: none;
border-radius: 3px;
width: 70px;
text-align: center;
}

a.cke_dialog_ui_button_cancel {
background: #ccc;
}

a.cke_dialog_ui_button_ok span {
color: #fff;
}

a.cke_dialog_ui_button_cancel span {
color: #000;
}

a.cke_dialog_ui_button_ok span,
a.cke_dialog_ui_button_cancel span {
text-shadow: none;
text-decoration: none;
font-family: FontAwesome;
font-family: Helvetica, Arial, sans-serif;
font-style: normal;
font-weight: 400;
font-size: 1px;
font-size: 14px;
-webkit-font-smoothing: antialiased;
}

a.cke_dialog_ui_button_ok span::before {
content: '\f00c';
a.cke_dialog_ui_button_ok span::before,
a.cke_dialog_ui_button_cancel span::before {
font-size: 18px;
line-height: 30px;
}


span.cke_dialog_ui_button {
cursor: pointer
}

a.cke_dialog_ui_button_cancel {
display: none;
}

.cke_dialog_footer_buttons {
display: inline-table;
width: auto;
position: relative;
vertical-align: middle
vertical-align: middle;
background-color: #e9e9e9;
}

div.cke_dialog_ui_input_select {
Expand Down Expand Up @@ -518,21 +494,17 @@ select.cke_dialog_ui_input_select {
color: #a0a0a0
}

.cke_dialog_body .cke_label {
display: none
}

.cke_dialog_body table {
width: 100%;
}

.cke_dialog_body label {
display: block;
cursor: default;
font-size: 14px;
color: #999;
cursor: pointer;
margin-bottom: 3px;
padding-bottom: 5px;
display: block;
line-height: 20px;
font-family: Helvetica, Arial, sans-serif;
}

.cke_dialog_body label.cke_required::after {
Expand Down Expand Up @@ -600,3 +572,12 @@ a.cke_smile:focus, a.cke_smile:active, a.cke_specialchar:focus, a.cke_specialcha
width: 100%;
height: 100%
}

input.cke_dialog_ui_input_text {
background-color: #fff;
height: 30px;
border: 1px solid #ddd;
padding: 0 5px;
font-size: 14px;
border-radius: 0;
}
Loading