Permalink
Browse files

Merge pull request #164 from bsimons/dev

styling and layout corrections for CKEditor 4, including the 'Kama' skin
  • Loading branch information...
2 parents 1e3d7d9 + 32dfe1f commit 3c56be5dc3e1e53b8a35952bbef209b1702ef0b0 @dbunskoek dbunskoek committed Feb 22, 2013
Showing with 127 additions and 62 deletions.
  1. +3 −13 fiber/static/fiber/css/admin.css
  2. +20 −49 fiber/static/fiber/css/widgets.css
  3. +5 −0 fiber/static/fiber/js/ckeditor-4.0.1-full/skins/kama/dialog.css
  4. +5 −0 fiber/static/fiber/js/ckeditor-4.0.1-full/skins/kama/dialog_ie.css
  5. +5 −0 fiber/static/fiber/js/ckeditor-4.0.1-full/skins/kama/dialog_ie7.css
  6. +5 −0 fiber/static/fiber/js/ckeditor-4.0.1-full/skins/kama/dialog_ie8.css
  7. +5 −0 fiber/static/fiber/js/ckeditor-4.0.1-full/skins/kama/dialog_iequirks.css
  8. +5 −0 fiber/static/fiber/js/ckeditor-4.0.1-full/skins/kama/dialog_opera.css
  9. +5 −0 fiber/static/fiber/js/ckeditor-4.0.1-full/skins/kama/editor.css
  10. +5 −0 fiber/static/fiber/js/ckeditor-4.0.1-full/skins/kama/editor_ie.css
  11. +5 −0 fiber/static/fiber/js/ckeditor-4.0.1-full/skins/kama/editor_ie7.css
  12. +5 −0 fiber/static/fiber/js/ckeditor-4.0.1-full/skins/kama/editor_ie8.css
  13. +5 −0 fiber/static/fiber/js/ckeditor-4.0.1-full/skins/kama/editor_iequirks.css
  14. BIN fiber/static/fiber/js/ckeditor-4.0.1-full/skins/kama/icons.png
  15. BIN fiber/static/fiber/js/ckeditor-4.0.1-full/skins/kama/images/dialog_sides.gif
  16. BIN fiber/static/fiber/js/ckeditor-4.0.1-full/skins/kama/images/dialog_sides.png
  17. BIN fiber/static/fiber/js/ckeditor-4.0.1-full/skins/kama/images/dialog_sides_rtl.png
  18. BIN fiber/static/fiber/js/ckeditor-4.0.1-full/skins/kama/images/mini.gif
  19. BIN fiber/static/fiber/js/ckeditor-4.0.1-full/skins/kama/images/sprites.png
  20. BIN fiber/static/fiber/js/ckeditor-4.0.1-full/skins/kama/images/sprites_ie6.png
  21. BIN fiber/static/fiber/js/ckeditor-4.0.1-full/skins/kama/images/toolbar_start.gif
  22. +40 −0 fiber/static/fiber/js/ckeditor-4.0.1-full/skins/kama/readme.md
  23. +8 −0 fiber/static/fiber/js/ckeditor-4.0.1-full/skins/kama/skin.js
  24. +1 −0 fiber/static/fiber/js/fiber.ckeditor.js
@@ -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%;
@@ -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;
}
@@ -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 ]--- */
@@ -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 {

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 3c56be5

Please sign in to comment.