Skip to content

Commit

Permalink
styling and layout corrections for CKEditor 4, including the 'Kama' skin
Browse files Browse the repository at this point in the history
  • Loading branch information
bsimons committed Feb 21, 2013
1 parent 1e3d7d9 commit 32dfe1f
Show file tree
Hide file tree
Showing 24 changed files with 127 additions and 62 deletions.
16 changes: 3 additions & 13 deletions fiber/static/fiber/css/admin.css
Expand Up @@ -352,12 +352,6 @@ div.ui-dialog form label.vCheckboxLabel {
width: auto;
}

div.ui-dialog form span.cke_skin_kama {
float: left;
border: none;
padding: 0;
}

div.ui-dialog form h2 {
font-weight: bold;
font-size: 100%;
Expand Down Expand Up @@ -398,19 +392,15 @@ div.ui-dialog form h2 {
display: none;
}

.ui-dialog .hide-label .cke_wrapper {
width: 734px;
}

/* .cke_chrome and .cke_inner selectors are for CKEditor 4.0 Beta */
/* .cke_chrome and .cke_inner selectors used for CKEditor 4 using the 'Kama' skin */

.ui-dialog .hide-label .cke_chrome {
.ui-dialog .cke_chrome {
float: none;
padding: 0;
border: none;
}

.ui-dialog .hide-label .cke_inner {
.ui-dialog .cke_inner {
border-radius: 0;
}

Expand Down
69 changes: 20 additions & 49 deletions fiber/static/fiber/css/widgets.css
@@ -1,59 +1,30 @@
/* ---[ CKEditor ]--- */

.cke_skin_kama {
float: left;
}

.cke_button_bold .cke_icon,
.cke_button_italic .cke_icon,
.cke_button_indent .cke_icon,
.cke_button_outdent .cke_icon,
.cke_button_bulletedlist .cke_icon,
.cke_button_numberedlist .cke_icon,
.cke_button_unlink .cke_icon,
.cke_button_source .cke_icon {
background-image: url(../images/ckeditor/bg-editor-toolbar-buttons.png) !important;
}

.cke_button_bold .cke_icon { background-position: -22px -2px !important; }
.cke_button_italic .cke_icon { background-position: -42px -2px !important; }
.cke_button_indent .cke_icon { background-position: -202px -2px !important; }
.cke_button_outdent .cke_icon { background-position: -222px -2px !important; }
.cke_button_bulletedlist .cke_icon { background-position: -322px -2px !important; }
.cke_button_numberedlist .cke_icon { background-position: -342px -2px !important; }
.cke_button_unlink .cke_icon { background-position: -442px -2px !important; }
.cke_button_source .cke_icon { background-position: -542px -2px !important; }

.cke_button_source .cke_label { display: none !important; }


/* ---[ CKEditor 4.0 Beta ]--- */
/* ---[ CKEditor 4 ]--- */

.cke_chrome {
float: left;
float: left;
}

.cke_button .cke_button__bold_icon,
.cke_button .cke_button__italic_icon,
.cke_button .cke_button__indent_icon,
.cke_button .cke_button__outdent_icon,
.cke_button .cke_button__bulletedlist_icon,
.cke_button .cke_button__numberedlist_icon,
.cke_button .cke_button__unlink_icon,
.cke_button .cke_button__source_icon {
.cke_ltr .cke_button .cke_button__bold_icon,
.cke_ltr .cke_button .cke_button__italic_icon,
.cke_ltr .cke_button .cke_button__indent_icon,
.cke_ltr .cke_button .cke_button__outdent_icon,
.cke_ltr .cke_button .cke_button__bulletedlist_icon,
.cke_ltr .cke_button .cke_button__numberedlist_icon,
.cke_ltr .cke_button .cke_button__unlink_icon,
.cke_ltr .cke_button .cke_button__source_icon {
background-image: url(../images/ckeditor/bg-editor-toolbar-buttons.png) !important;
}

.cke_button .cke_button__bold_icon { background-position: -22px -2px !important; }
.cke_button .cke_button__italic_icon { background-position: -42px -2px !important; }
.cke_button .cke_button__indent_icon { background-position: -202px -2px !important; }
.cke_button .cke_button__outdent_icon { background-position: -222px -2px !important; }
.cke_button .cke_button__bulletedlist_icon { background-position: -322px -2px !important; }
.cke_button .cke_button__numberedlist_icon { background-position: -342px -2px !important; }
.cke_button .cke_button__unlink_icon { background-position: -442px -2px !important; }
.cke_button .cke_button__source_icon { background-position: -542px -2px !important; }
.cke_ltr .cke_button .cke_button__bold_icon { background-position: -22px -2px !important; }
.cke_ltr .cke_button .cke_button__italic_icon { background-position: -42px -2px !important; }
.cke_ltr .cke_button .cke_button__indent_icon { background-position: -202px -2px !important; }
.cke_ltr .cke_button .cke_button__outdent_icon { background-position: -222px -2px !important; }
.cke_ltr .cke_button .cke_button__bulletedlist_icon { background-position: -322px -2px !important; }
.cke_ltr .cke_button .cke_button__numberedlist_icon { background-position: -342px -2px !important; }
.cke_ltr .cke_button .cke_button__unlink_icon { background-position: -442px -2px !important; }
.cke_ltr .cke_button .cke_button__source_icon { background-position: -542px -2px !important; }

.cke_button .cke_button_label { display: none !important; }
.cke_ltr .cke_button .cke_button_label { display: none !important; }


/* ---[ Combobox ]--- */
Expand Down Expand Up @@ -96,7 +67,7 @@
margin-left: 5px;
color: #5b80b2;
background: url("../../admin/img/admin/icon_addlink.gif") no-repeat scroll 0 0.25em transparent;
padding-left: 12px;
padding-left: 12px;
}

.fiber-json-widget tr.add-row {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 32dfe1f

Please sign in to comment.