Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1255) +++ branches/2.8.x/CHANGELOG (revision 1256) @@ -12,6 +12,8 @@ ------------------------------------- 2.8.1 ------------------------------------- 21-Jan-2010 Dietmar Woellbrink (Luisehahne) +# fix wrong settings in image browser dialog +21-Jan-2010 Dietmar Woellbrink (Luisehahne) # Ticket #912 fix Search Template bug 21-Jan-2010 Dietmar Woellbrink (Luisehahne) # Ticket #915 fix bug in search (utf-8 characters corrupted)(thanks to Thorn) Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1255) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1256) @@ -55,6 +55,6 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.1'); -if(!defined('REVISION')) define('REVISION', '1255'); +if(!defined('REVISION')) define('REVISION', '1256'); ?> \ No newline at end of file Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/dialog/fck_about.html =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/dialog/fck_about.html (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/dialog/fck_about.html (revision 1256) @@ -118,7 +118,7 @@ - Modified for Website Baker Version 2.8.x
Modulversion 2.9.3 + Modified for Website Baker Version 2.8.x
Modulversion 2.9.4   @@ -129,7 +129,9 @@ Support Website Baker CMS
- + + Website Baker Org e.V. +
Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/dialog/fck_image.html =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/dialog/fck_image.html (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/dialog/fck_image.html (revision 1256) @@ -192,7 +192,7 @@
Advisory Relation
- @@ -218,12 +218,12 @@ Stylesheet Classes
- + Id
- + @@ -231,13 +231,13 @@ Style
- + Advisory Title
- + Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/en-au.js =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/en-au.js (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/en-au.js (revision 1256) @@ -525,6 +525,7 @@ DlgAboutLicenseTab : "License", DlgAboutVersion : "version", DlgAboutInfo : "For further information go to", +DlgAboutModule : "Developed for Website Baker
modul version 2.9.4", // Div Dialog DlgDivGeneralTab : "General", Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/hu.js =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/hu.js (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/hu.js (revision 1256) @@ -525,6 +525,7 @@ DlgAboutLicenseTab : "Licensz", DlgAboutVersion : "verzió", DlgAboutInfo : "További információkért látogasson el ide:", +DlgAboutModule : "Developed for Website Baker
modul version 2.9.4", // Div Dialog DlgDivGeneralTab : "General", //MISSING Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/sk.js =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/sk.js (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/sk.js (revision 1256) @@ -525,6 +525,7 @@ DlgAboutLicenseTab : "Licencia", DlgAboutVersion : "verzia", DlgAboutInfo : "Viac informácií získate na", +DlgAboutModule : "Developed for Website Baker
modul version 2.9.4", // Div Dialog DlgDivGeneralTab : "Hlavné", Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/uk.js =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/uk.js (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/uk.js (revision 1256) @@ -525,6 +525,7 @@ DlgAboutLicenseTab : "Ліцензія", DlgAboutVersion : "Версія", DlgAboutInfo : "Додаткову інформацію дивіться на ", +DlgAboutModule : "Developed for Website Baker
modul version 2.9.4", // Div Dialog DlgDivGeneralTab : "Загальна", Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/en-uk.js =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/en-uk.js (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/en-uk.js (revision 1256) @@ -525,6 +525,7 @@ DlgAboutLicenseTab : "License", DlgAboutVersion : "version", DlgAboutInfo : "For further information go to", +DlgAboutModule : "Developed for Website Baker
modul version 2.9.4", // Div Dialog DlgDivGeneralTab : "General", Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/ru.js =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/ru.js (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/ru.js (revision 1256) @@ -525,6 +525,7 @@ DlgAboutLicenseTab : "Лицензия", DlgAboutVersion : "Версия", DlgAboutInfo : "Для большей информации, посетите", +DlgAboutModule : "Developed for Website Baker
modul version 2.9.4", // Div Dialog DlgDivGeneralTab : "Информация", Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/fr-ca.js =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/fr-ca.js (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/fr-ca.js (revision 1256) @@ -525,6 +525,7 @@ DlgAboutLicenseTab : "License", DlgAboutVersion : "Version", DlgAboutInfo : "Pour plus d'informations, visiter", +DlgAboutModule : "Developed for Website Baker
modul version 2.9.4", // Div Dialog DlgDivGeneralTab : "Général", Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/en.js =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/en.js (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/en.js (revision 1256) @@ -526,7 +526,7 @@ DlgAboutLicenseTab : "License", DlgAboutVersion : "version", DlgAboutInfo : "For further information go to", -DlgAboutModule : "Developed for Website Baker
modul version 2.9.3", +DlgAboutModule : "Developed for Website Baker
modul version 2.9.4", // Div Dialog DlgDivGeneralTab : "General", Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/fr.js =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/fr.js (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/fr.js (revision 1256) @@ -525,6 +525,7 @@ DlgAboutLicenseTab : "Licence", DlgAboutVersion : "Version", DlgAboutInfo : "Pour plus d'informations, aller à", +DlgAboutModule : "Developed for Website Baker
modul version 2.9.4", // Div Dialog DlgDivGeneralTab : "Général", Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/hr.js =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/hr.js (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/hr.js (revision 1256) @@ -525,6 +525,7 @@ DlgAboutLicenseTab : "Licenca", DlgAboutVersion : "inačica", DlgAboutInfo : "Za više informacija posjetite", +DlgAboutModule : "Developed for Website Baker
modul version 2.9.4", // Div Dialog DlgDivGeneralTab : "Općenito", Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/nl.js =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/nl.js (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/nl.js (revision 1256) @@ -526,6 +526,7 @@ DlgAboutLicenseTab : "Licentie", DlgAboutVersion : "Versie", DlgAboutInfo : "Voor meer informatie ga naar ", +DlgAboutModule : "Developed for Website Baker
modul version 2.9.4", // Div Dialog DlgDivGeneralTab : "Algemeen", Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/pl.js =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/pl.js (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/pl.js (revision 1256) @@ -525,6 +525,7 @@ DlgAboutLicenseTab : "Licencja", DlgAboutVersion : "wersja", DlgAboutInfo : "Więcej informacji uzyskasz pod adresem", +DlgAboutModule : "Developed for Website Baker
modul version 2.9.4", // Div Dialog DlgDivGeneralTab : "General", //MISSING Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/en-ca.js =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/en-ca.js (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/en-ca.js (revision 1256) @@ -525,6 +525,7 @@ DlgAboutLicenseTab : "License", DlgAboutVersion : "version", DlgAboutInfo : "For further information go to", +DlgAboutModule : "Developed for Website Baker
modul version 2.9.4", // Div Dialog DlgDivGeneralTab : "General", Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/bg.js =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/bg.js (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/bg.js (revision 1256) @@ -525,6 +525,7 @@ DlgAboutLicenseTab : "License", //MISSING DlgAboutVersion : "версия", DlgAboutInfo : "За повече информация посетете", +DlgAboutModule : "Developed for Website Baker
modul version 2.9.4", // Div Dialog DlgDivGeneralTab : "General", //MISSING Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/de.js =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/de.js (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/lang/de.js (revision 1256) @@ -526,7 +526,7 @@ DlgAboutLicenseTab : "Lizenz", DlgAboutVersion : "Version", DlgAboutInfo : "Für weitere Informationen siehe", -DlgAboutModule : "Anpassung für Website Baker
Modul Version 2.9.3", +DlgAboutModule : "Anpassung für Website Baker
Modul Version 2.9.4", // Div Dialog DlgDivGeneralTab : "Allgemein", Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/skins/office2003/fck_editor.css =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/skins/office2003/fck_editor.css (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/skins/office2003/fck_editor.css (revision 1256) @@ -1,3 +1,4 @@ +@charset "UTF-8"; /* * FCKeditor - The text editor for Internet - http://www.fckeditor.net * Copyright (C) 2003-2009 Frederico Caldeira Knabben @@ -20,457 +21,78 @@ * * Styles used by the editor IFRAME and Toolbar. */ - /* ### Basic Editor IFRAME Styles. */ - -body -{ - padding: 1px; - margin: 0; - background-color: #ffffff; -} - -#xEditingArea -{ - border: #696969 1px solid; -} - -.SourceField -{ - padding: 5px; - margin: 0px; - font-family: Monospace; -} - +body { padding: 1px; margin: 0; background-color: #ffffff; } +#xEditingArea { border: #696969 1px solid; } +.SourceField { padding: 5px; margin: 0px; font-family: Monospace; } /* Toolbar */ - -.TB_ToolbarSet, .TB_Expand, .TB_Collapse -{ - cursor: default; - background-color: #f7f8fd; -} - -.TB_ToolbarSet -{ - border-top: #f7f8fd 1px outset; - border-bottom: #f7f8fd 1px outset; -} - -.TB_ToolbarSet TD -{ - font-size: 11px; - font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif; -} - -.TB_Toolbar -{ - background-color: #d6dff7; - background-image: url(images/toolbar.bg.gif); - background-repeat: repeat-x; - display: inline-table; -} - -.TB_Separator -{ - width: 1px; - height: 16px; - margin: 2px; - background-color: #B2CBFF; -} - -.TB_Start -{ - background-image: url(images/toolbar.start.gif); - background-repeat: no-repeat; - background-position: center center; - margin: 0px; - width: 7px; - height: 24px; -} - -.TB_End -{ - background-image: url(images/toolbar.end.gif); - background-repeat: no-repeat; - background-position: center left; - height: 24px; - width: 4px; -} - -.TB_ExpandImg -{ - background-image: url(images/toolbar.expand.gif); - background-repeat: no-repeat; -} - -.TB_CollapseImg -{ - background-image: url(images/toolbar.collapse.gif); - background-repeat: no-repeat; -} - -.TB_SideBorder -{ - background-color: #696969; -} - -.TB_Expand, .TB_Collapse -{ - padding: 2px 2px 2px 2px; - border: #f7f8fd 1px outset; -} - -.TB_Collapse -{ - width: 5px; -} - -.TB_Break -{ - height: 24px; /* IE needs the height to be set, otherwise no break */ -} - +.TB_ToolbarSet, .TB_Expand, .TB_Collapse { background-color: #f7f8fd; cursor: default; } +.TB_ToolbarSet { border-top: #f7f8fd 1px outset; border-bottom: #f7f8fd 1px outset; } +.TB_Toolbar { display: inline-table; background-color: #d6dff7; background-image: url(images/toolbar.bg.gif); background-repeat: repeat-x; } +.TB_Separator { width: 1px; margin: 2px; background-color: #B2CBFF; height: 16px; } +.TB_Start { margin: 0px; width: 7px; background-image: url(images/toolbar.start.gif); background-repeat: no-repeat; background-position: center center; height: 24px; } +.TB_End { width: 4px; background-image: url(images/toolbar.end.gif); background-repeat: no-repeat; background-position: center left; height: 24px; } +.TB_ExpandImg { background-image: url(images/toolbar.expand.gif); background-repeat: no-repeat; } +.TB_CollapseImg { background-image: url(images/toolbar.collapse.gif); background-repeat: no-repeat; } +.TB_SideBorder { background-color: #696969; } +.TB_Expand, .TB_Collapse { padding: 2px 2px 2px 2px; border: #f7f8fd 1px outset; } +.TB_Collapse { width: 5px; } +.TB_Break { height: 24px; /* IE needs the height to be set, otherwise no break */ } /* Toolbar Button */ - -.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled -{ - margin: 1px; - height: 22px; /* The height is necessary, otherwise IE will not apply the alpha */ -} - -.TB_Button_On -{ - margin: 0px; - border: #316ac5 1px solid; - background-color: #c1d2ee; -} - -.TB_Button_On_Over, .TB_Button_Off_Over -{ - margin: 0px ; - border: #316ac5 1px solid; - background-color: #dff1ff; -} - -.TB_Button_Off -{ - filter: alpha(opacity=70); /* IE */ - opacity: 0.70; /* Safari, Opera and Mozilla */ -} - -.TB_Button_Disabled -{ - filter: gray() alpha(opacity=30); /* IE */ - opacity: 0.30; /* Safari, Opera and Mozilla */ -} - -.TB_Button_Padding -{ - visibility: hidden; - width: 3px; - height: 22px; -} - -.TB_Button_Image -{ - overflow: hidden; - width: 16px; - height: 16px; - margin: 3px; - background-repeat: no-repeat; -} - -.TB_Button_Image img -{ - position: relative; -} - -.TB_Button_Off .TB_Button_Text -{ - background-color: #d6dff7; /* Needed because of a bug on ClearType */ - background-image: url(images/toolbar.bg.gif); - background-repeat: repeat-x; -} - -.TB_ConnectionLine -{ - background-color: #f7f8fd; - height: 1px; - margin-left: 1px; /* ltr */ - margin-right: 1px; /* rtl */ -} - -.TB_Button_Off .TB_Text -{ - background-color: #d6dff7; /* Needed because of a bug on ClearType */ - background-image: url(images/toolbar.bg.gif); - background-repeat: repeat-x; -} - -.TB_Button_On_Over .TB_Text -{ - background-color: #dff1ff ; /* Needed because of a bug on ClearType */ -} - +.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled { margin: 1px; height: 22px; /* The height is necessary, otherwise IE will not apply the alpha */ } +.TB_Button_On { margin: 0px; border: #316ac5 1px solid; background-color: #c1d2ee; } +.TB_Button_On_Over, .TB_Button_Off_Over { margin: 0px; border: #316ac5 1px solid; background-color: #dff1ff; } +.TB_Button_Padding { width: 3px; visibility: hidden; height: 22px; } +.TB_Button_Image { width: 16px; margin: 3px; background-repeat: no-repeat; overflow: hidden; height: 16px; } +.TB_Button_Image img { position: relative; } +.TB_ConnectionLine { margin-left: 1px; /* ltr */ margin-right: 1px; /* rtl */ background-color: #f7f8fd; height: 1px; } +.TB_Button_On_Over .TB_Text { background-color: #dff1ff; /* Needed because of a bug on ClearType */ } /* Menu */ - -.MN_Menu -{ - border: 1px solid #8f8f73; - padding: 2px; - background-color: #f7f8fd; - cursor: default; -} - -.MN_Menu, .MN_Menu .MN_Label -{ - font-size: 11px; - font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif; -} - -.MN_Item_Padding -{ - visibility: hidden; - width: 3px; - height: 20px; -} - -.MN_Icon -{ - background-color: #d6dff7; - text-align: center; - height: 20px; -} - -.MN_Label -{ - padding-left: 3px; - padding-right: 3px; -} - -.MN_Separator -{ - height: 3px; -} - -.MN_Separator_Line -{ - border-top: #b9b99d 1px solid; -} - -.MN_Item .MN_Icon IMG -{ - filter: alpha(opacity=70); - opacity: 0.70; -} - -.MN_Item_Over -{ - color: #ffffff; - background-color: #7096FA; -} - -.MN_Item_Over .MN_Icon -{ - background-color: #466ca6; -} - -.MN_Item_Disabled IMG -{ - filter: gray() alpha(opacity=30); /* IE */ - opacity: 0.30; /* Safari, Opera and Mozilla */ -} - -.MN_Item_Disabled .MN_Label -{ - color: #b7b7b7; -} - -.MN_Arrow -{ - padding-right: 3px; - padding-left: 3px; -} - -.MN_ConnectionLine -{ - background-color: #f7f8fd; -} - -.Menu .TB_Button_On, .Menu .TB_Button_On_Over -{ - border: #8f8f73 1px solid; - background-color: #f7f8fd; -} - +.MN_Menu { border: 1px solid #8f8f73; padding: 2px; background-color: #f7f8fd; cursor: default; } +.MN_Item_Padding { width: 3px; visibility: hidden; height: 20px; } +.MN_Icon { background-color: #d6dff7; text-align: center; height: 20px; } +.MN_Separator { height: 3px; } +.MN_Separator_Line { border-top: #b9b99d 1px solid; } +.MN_Item_Over { color: #ffffff; background-color: #7096FA; } +.MN_Item_Over .MN_Icon { background-color: #466ca6; } +.MN_Item_Disabled .MN_Label { color: #b7b7b7; } +.MN_ConnectionLine { background-color: #f7f8fd; } +.Menu .TB_Button_On, .Menu .TB_Button_On_Over { border: #8f8f73 1px solid; background-color: #f7f8fd; } /* ### Panel Styles */ - -.FCK_Panel -{ - border: #8f8f73 1px solid; - padding: 2px; - background-color: #f7f8fd; -} - -.FCK_Panel, .FCK_Panel TD -{ - font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif; - font-size: 11px; -} - +.FCK_Panel { border: #8f8f73 1px solid; padding: 2px; background-color: #f7f8fd; } /* ### Special Combos */ - -.SC_Panel -{ - overflow: auto; - white-space: nowrap; - cursor: default; - border: 1px solid #8f8f73; - padding-left: 2px; - padding-right: 2px; -} - -.SC_Panel, .SC_Panel TD -{ - font-size: 11px; - font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif; -} - -.SC_Item, .SC_ItemSelected -{ - margin-top: 2px; - margin-bottom: 2px; - background-position: left center; - padding-left: 11px; - padding-right: 3px; - padding-top: 2px; - padding-bottom: 2px; - text-overflow: ellipsis; - overflow: hidden; - background-repeat: no-repeat; - border: #dddddd 1px solid; -} - -.SC_Item *, .SC_ItemSelected * -{ - margin-top: 0px; - margin-bottom: 0px; -} - -.SC_ItemSelected -{ - border: #9a9afb 1px solid; - background-image: url(images/toolbar.arrowright.gif); -} - -.SC_ItemOver -{ - border: #316ac5 1px solid; -} - -.SC_Field -{ - margin-top: 2px ; - border: #b7b7a6 1px solid; - cursor: default; -} - -.SC_FieldCaption -{ - overflow: visible; - padding-right: 5px; - padding-left: 5px; - opacity: 0.75; /* Safari, Opera and Mozilla */ - filter: alpha(opacity=70); /* IE */ /* -moz-opacity: 0.75; Mozilla (Old) */ - height: 23px; - background-color: #d6dff7; /* Needed because of a bug on ClearType */ - background-image: url(images/toolbar.bg.gif); - background-repeat: repeat-x; -/* background-color: inherit; Maybe this is needed wait to check */ -} - -.SC_FieldLabel -{ - white-space: nowrap; - padding: 2px; - width: 100%; - cursor: default; - background-color: #ffffff; - text-overflow: ellipsis; - overflow: hidden; -} - -.SC_FieldButton -{ - background-position: center center; - background-image: url(images/toolbar.buttonarrow.gif); - border-left: #b7b7a6 1px solid; - width: 14px; - background-repeat: no-repeat; -} - -.SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption, .SC_FieldDisabled .TB_ButtonType_Text -{ - opacity: 0.30; /* Safari, Opera and Mozilla */ - filter: gray() alpha(opacity=30); /* IE */ /* -moz-opacity: 0.30; Mozilla (Old) */ -} - -.SC_FieldOver -{ - border: #316ac5 1px solid; -} - -.SC_FieldOver .SC_FieldButton -{ - border-left: #316ac5 1px solid; -} - +.SC_Panel { border: 1px solid #8f8f73; padding-left: 2px; padding-right: 2px; white-space: nowrap; overflow: auto; cursor: default; } +.SC_Item, .SC_ItemSelected { margin-top: 2px; margin-bottom: 2px; padding-left: 11px; padding-right: 3px; padding-top: 2px; padding-bottom: 2px; border: #dddddd 1px solid; background-position: left center; background-repeat: no-repeat; overflow: hidden; text-overflow: ellipsis; } +.SC_Item *, .SC_ItemSelected * { margin-top: 0px; margin-bottom: 0px; } +.SC_ItemSelected { border: #9a9afb 1px solid; background-image: url(images/toolbar.arrowright.gif); } +.SC_Field { margin-top: 2px; border: #b7b7a6 1px solid; cursor: default; } +.SC_FieldCaption { padding-right: 5px; padding-left: 5px; background-color: #d6dff7; /* Needed because of a bug on ClearType */ background-image: url(images/toolbar.bg.gif); background-repeat: repeat-x; /* background-color: inherit; Maybe this is needed wait to check */ overflow: visible; height: 23px; /* -moz-opacity: 0.75; Mozilla (Old) */ opacity: 0.75; /* Safari, Opera and Mozilla */ filter: alpha(opacity=70); /* IE */ } +.SC_FieldLabel { padding: 2px; width: 100%; white-space: nowrap; background-color: #ffffff; cursor: default; overflow: hidden; text-overflow: ellipsis; } +.SC_FieldButton { border-left: #b7b7a6 1px solid; width: 14px; background-position: center center; background-image: url(images/toolbar.buttonarrow.gif); background-repeat: no-repeat; } +.SC_FieldOver .SC_FieldButton { border-left: #316ac5 1px solid; } /* ### Color Selector Panel */ - -.ColorBoxBorder -{ - border: #808080 1px solid; - position: static; -} - -.ColorBox -{ - font-size: 1px; - width: 10px; - position: static; - height: 10px; -} - -.ColorDeselected, .ColorSelected -{ - cursor: default; -} - -.ColorDeselected -{ - border: #ffffff 1px solid; - padding: 2px; - float: left; -} - -.ColorSelected -{ - border: #330066 1px solid; - padding: 2px; - float: left; - background-color: #c4cdd6; -} +.ColorBoxBorder { border: #808080 1px solid; position: static; } +.ColorBox { width: 10px; font-size: 1px; position: static; height: 10px; } +.ColorDeselected, .ColorSelected { cursor: default; } +.ColorDeselected { border: #ffffff 1px solid; padding: 2px; float: left; } +.ColorSelected { border: #330066 1px solid; padding: 2px; float: left; background-color: #c4cdd6; } +.TB_Button_Off, .MN_Item .MN_Icon IMG { filter: alpha(opacity=70); /* IE */ opacity: 0.70; /* Safari, Opera and Mozilla */ } +.TB_Button_Off .TB_Button_Text, .TB_Button_Off .TB_Text { background-color: #d6dff7; /* Needed because of a bug on ClearType */ background-image: url(images/toolbar.bg.gif); background-repeat: repeat-x; } +.MN_Label, .MN_Arrow { padding-left: 3px; padding-right: 3px; } +.SC_ItemOver, .SC_FieldOver { border: #316ac5 1px solid; } +.SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption, .SC_FieldDisabled .TB_ButtonType_Text, .TB_Button_Disabled, .MN_Item_Disabled IMG { opacity: 0.30; /* Safari, Opera and Mozilla */ filter: gray() alpha(opacity=30); /* IE */ } +.TB_ToolbarSet TD, .MN_Menu, .MN_Menu .MN_Label, .FCK_Panel, .FCK_Panel TD, .SC_Panel, .SC_Panel TD { font-size: 11px; font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif; } Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/skins/office2003/fck_dialog.css =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/skins/office2003/fck_dialog.css (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/skins/office2003/fck_dialog.css (revision 1256) @@ -1,3 +1,4 @@ +@charset "UTF-8"; /* * FCKeditor - The text editor for Internet - http://www.fckeditor.net * Copyright (C) 2003-2009 Frederico Caldeira Knabben @@ -20,383 +21,64 @@ * * Styles used by the dialog boxes. */ - -html, body -{ - background-color: transparent; - margin: 0px; - padding: 0px; -} - -body -{ - padding: 10px; -} - -body, td, input, select, textarea -{ - font-size: 11px; - font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana; -} - -body, .BackColor -{ - background-color: #f7f8fd; -} - -.PopupBody -{ - height: 100%; - width: 100%; - overflow: hidden; - background-color: transparent; - padding: 0px; -} - -#header -{ - cursor: move; -} - -.PopupTitle -{ - font-weight: bold; - font-size: 14pt; - color: #0e3460; - background-color: #8cb2fd; - padding: 3px 10px 3px 10px; -} - -.PopupButtons -{ - position: absolute; - right: 0px; - left: 0px; - bottom: 0px; - border-top: #466ca6 1px solid; - background-color: #8cb2fd; - padding: 7px 10px 7px 10px; -} - -.Button -{ - border: #1c3460 1px solid; - color: #000a28; - background-color: #7096d3; -} - -#btnOk -{ - width: 100px; -} - -.DarkBackground -{ - background-color: #eaf2f8; -} - -.LightBackground -{ - background-color: #ffffbe; -} - -.PopupTitleBorder -{ - border-bottom: #d5d59d 1px solid; -} - -.PopupTabArea -{ - color: #0e3460; - background-color: #8cb2fd; -} - -.PopupTabEmptyArea -{ - padding-left: 10px ; - border-bottom: #466ca6 1px solid; -} - -.PopupTab, .PopupTabSelected -{ - border-right: #466ca6 1px solid; - border-top: #466ca6 1px solid; - border-left: #466ca6 1px solid; - padding: 3px 5px 3px 5px; - color: #0e3460; -} - -.PopupTab -{ - margin-top: 1px; - border-bottom: #466ca6 1px solid; - cursor: pointer; - cursor: hand; -} - -.PopupTabSelected -{ - font-weight: bold; - cursor: default; - padding-top: 4px; - border-bottom: #f7f8fd 1px solid; - background-color: #f7f8fd; -} - -.PopupSelectionBox -{ - border: #1e90ff 1px solid !important; - background-color: #add8e6 !important; - cursor: pointer; - cursor: hand; -} - -#tdBrowse -{ - vertical-align: bottom; -} - +html, body { margin: 0px; padding: 0px; background-color: transparent; } +body { padding: 10px; } +body, td, input, select, textarea { font-size: 11px; font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana; } +body, .BackColor { background-color: #f7f8fd; } +.PopupBody { width: 100%; padding: 0px; background-color: transparent; height: 100%; overflow: hidden; } +#header { cursor: move; } +.PopupTitle { padding: 3px 10px 3px 10px; color: #0e3460; background-color: #8cb2fd; font-weight: bold; font-size: 14pt; } +.PopupButtons { border-top: #466ca6 1px solid; padding: 7px 10px 7px 10px; background-color: #8cb2fd; position: absolute; right: 0px; left: 0px; bottom: 0px; } +.Button { border: #1c3460 1px solid; color: #000a28; background-color: #7096d3; } +#btnOk { width: 100px; } +.DarkBackground { background-color: #eaf2f8; } +.LightBackground { background-color: #ffffbe; } +.PopupTitleBorder { border-bottom: #d5d59d 1px solid; } +.PopupTabArea { color: #0e3460; background-color: #8cb2fd; } +.PopupTabEmptyArea { padding-left: 10px; border-bottom: #466ca6 1px solid; } +.PopupTab, .PopupTabSelected { border-right: #466ca6 1px solid; border-top: #466ca6 1px solid; border-left: #466ca6 1px solid; padding: 3px 5px 3px 5px; color: #0e3460; } +.PopupTab { margin-top: 1px; border-bottom: #466ca6 1px solid; cursor: pointer; cursor: hand; } +.PopupTabSelected { padding-top: 4px; border-bottom: #f7f8fd 1px solid; background-color: #f7f8fd; font-weight: bold; cursor: default; } +.PopupSelectionBox { border: #1e90ff 1px solid !important; background-color: #add8e6 !important; cursor: pointer; cursor: hand; } +#tdBrowse { vertical-align: bottom; } /** * Dialog frame related styles. */ - -.contents -{ - position: absolute; - top: 2px; - left: 16px; - right: 16px; - bottom: 20px; - background-color: #f7f8fD; - overflow: hidden; - z-index: 1; -} - -.tl, .tr, .tc, .bl, .br, .bc -{ - position: absolute; - background-image: url(images/sprites.png); - background-repeat: no-repeat; -} - -* html .tl, * html .tr, * html .tc, * html .bl, * html .br, * html .bc -{ - background-image: url(images/sprites.gif); -} - -.ml, .mr -{ - position: absolute; - background-image: url(images/dialog.sides.png); - background-repeat: repeat-y; -} - -* html .ml, * html .mr -{ - background-image: url(images/dialog.sides.gif); -} - -.rtl .ml, .rtl .mr -{ - position: absolute; - background-image: url(images/dialog.sides.rtl.png); - background-repeat: repeat-y; -} - -* html .rtl .ml, * html .rtl .mr -{ - background-image: url(images/dialog.sides.gif); -} - -.tl -{ - top: 0px; - left: 0px; - width: 16px; - height: 16px; - background-position: -16px -16px; -} - -.rtl .tl -{ - background-position: -16px -397px; -} - -.tr -{ - top: 0px; - right: 0px; - width: 16px; - height: 16px; - background-position: -16px -76px; -} - -.rtl .tr -{ - background-position: -16px -457px; -} - -.tc -{ - top: 0px; - right: 16px; - left: 16px; - height: 16px; - background-position: 0px -136px; - background-repeat: repeat-x; -} - -.ml -{ - top: 16px; - left: 0px; - width: 16px; - bottom: 51px; - background-position: 0px 0px; -} - -.mr -{ - top: 16px; - right: 0px; - width: 16px; - bottom: 51px; - background-position: -16px 0px; -} - -.bl -{ - bottom: 0px; - left: 0px; - width: 30px; - height: 51px; - background-position: -16px -196px; -} - -.rtl .bl -{ - background-position: -16px -517px; -} - -.br -{ - bottom: 0px; - right: 0px; - width: 30px; - height: 51px; - background-position: -16px -263px; -} - -.rtl .br -{ - background-position: -16px -584px; -} - -.bc -{ - bottom: 0px; - right: 30px; - left: 30px; - height: 51px; - background-position: 0px -330px; - background-repeat: repeat-x; -} - +.contents { background-color: #f7f8fD; position: absolute; top: 2px; left: 16px; right: 16px; bottom: 20px; overflow: hidden; z-index: 1; } +.tl, .tr, .tc, .bl, .br, .bc { background-image: url(images/sprites.png); background-repeat: no-repeat; position: absolute; } +* html .tl, * html .tr, * html .tc, * html .bl, * html .br, * html .bc { background-image: url(images/sprites.gif); } +.ml, .mr { background-image: url(images/dialog.sides.png); background-repeat: repeat-y; position: absolute; } +.rtl .ml, .rtl .mr { background-image: url(images/dialog.sides.rtl.png); background-repeat: repeat-y; position: absolute; } +.tl { width: 16px; background-position: -16px -16px; top: 0px; left: 0px; height: 16px; } +.rtl .tl { background-position: -16px -397px; } +.tr { width: 16px; background-position: -16px -76px; top: 0px; right: 0px; height: 16px; } +.rtl .tr { background-position: -16px -457px; } +.tc { background-position: 0px -136px; background-repeat: repeat-x; top: 0px; right: 16px; left: 16px; height: 16px; } +.ml { width: 16px; background-position: 0px 0px; top: 16px; left: 0px; bottom: 51px; } +.mr { width: 16px; background-position: -16px 0px; top: 16px; right: 0px; bottom: 51px; } +.bl { width: 30px; background-position: -16px -196px; bottom: 0px; left: 0px; height: 51px; } +.rtl .bl { background-position: -16px -517px; } +.br { width: 30px; background-position: -16px -263px; bottom: 0px; right: 0px; height: 51px; } +.rtl .br { background-position: -16px -584px; } +.bc { background-position: 0px -330px; background-repeat: repeat-x; bottom: 0px; right: 30px; left: 30px; height: 51px; } /* For IE6. Do not change it. */ -* html .blocker -{ - position: absolute; - width: 100%; - height: 100%; - z-index: 12; - filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0); -} - +* html .blocker { width: 100%; position: absolute; height: 100%; z-index: 12; filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0); } /* The layer used to cover the dialog when opening a child dialog. */ -.cover -{ - position: absolute; - top: 0px; - left: 14px; - right: 14px; - bottom: 18px; - z-index: 11; -} - -#closeButton -{ - position: absolute; - right: 0px; - top: 0px; - margin-top: 5px; - margin-right: 10px; - width: 20px; - height: 20px; - cursor: pointer; - background-image: url(images/sprites.png); - background-repeat: no-repeat; - background-position: -16px -651px; -} - -* html #closeButton -{ - cursor: hand; - background-image: url(images/sprites.gif); -} - -.rtl #closeButton -{ - right: auto; - left: 10px; - margin-right: 0px; -} - -#closeButton:hover -{ - background-position: -16px -687px; -} - -#throbberBlock -{ - z-index: 10; -} - -#throbberBlock div -{ - float: left; - width: 8px; - height: 9px; - margin-left: 2px; - margin-right: 2px; - font-size: 1px; /* IE6 */ -} - +.cover { position: absolute; top: 0px; left: 14px; right: 14px; bottom: 18px; z-index: 11; } +#closeButton { margin-top: 5px; margin-right: 10px; width: 20px; background-image: url(images/sprites.png); background-repeat: no-repeat; background-position: -16px -651px; position: absolute; right: 0px; top: 0px; height: 20px; cursor: pointer; } +* html #closeButton { background-image: url(images/sprites.gif); cursor: hand; } +.rtl #closeButton { margin-right: 0px; right: auto; left: 10px; } +#closeButton:hover { background-position: -16px -687px; } +#throbberBlock { z-index: 10; } +#throbberBlock div { float: left; width: 8px; margin-left: 2px; margin-right: 2px; font-size: 1px; /* IE6 */ height: 9px; } /* Color Gradient Generator: http://www.herethere.net/~samson/php/color_gradient/?cbegin=0E3460&cend=8cb2fd&steps=4 */ - -.throbber_1 -{ - background-color: #0E3460; -} - -.throbber_2 -{ - background-color: #2D5387; -} - -.throbber_3 -{ - background-color: #4D73AE; -} - -.throbber_4 -{ - background-color: #6C92D5; -} - -.throbber_5 -{ - background-color: #8CB2FD; -} +.throbber_1 { background-color: #0E3460; } +.throbber_2 { background-color: #2D5387; } +.throbber_3 { background-color: #4D73AE; } +.throbber_4 { background-color: #6C92D5; } +.throbber_5 { background-color: #8CB2FD; } +img { border: 0px; } +* html .ml, * html .mr, * html .rtl .ml, * html .rtl .mr { background-image: url(images/dialog.sides.gif); } Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/skins/default/fck_editor.css =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/skins/default/fck_editor.css (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/skins/default/fck_editor.css (revision 1256) @@ -1,3 +1,4 @@ +@charset "UTF-8"; /* * FCKeditor - The text editor for Internet - http://www.fckeditor.net * Copyright (C) 2003-2009 Frederico Caldeira Knabben @@ -20,445 +21,79 @@ * * Styles used by the editor IFRAME and Toolbar. */ - /* ### Basic Editor IFRAME Styles. */ - -body -{ - padding: 1px; - margin: 0; - background-color: #ffffff; -} - -#xEditingArea -{ - border: #696969 1px solid; -} - -.SourceField -{ - padding: 5px; - margin: 0px; - font-family: Monospace; -} - +body { padding: 1px; margin: 0; background-color: #ffffff; } +#xEditingArea { border: #696969 1px solid; } +.SourceField { padding: 5px; margin: 0px; font-family: Monospace; } /* Toolbar */ - -.TB_ToolbarSet, .TB_Expand, .TB_Collapse -{ - cursor: default; - background-color: #efefde; -} - -.TB_ToolbarSet -{ - border-top: #efefde 1px outset; - border-bottom: #efefde 1px outset; -} - -.TB_ToolbarSet TD -{ - font-size: 11px; - font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif; -} - -.TB_Toolbar -{ - height: 24px; - display: inline-table; /* inline = Opera jumping buttons bug */ -} - -.TB_Separator -{ - width: 1px; - height: 16px; - margin: 2px; - background-color: #999966; -} - -.TB_Start -{ - background-image: url(images/toolbar.start.gif); - margin: 2px; - width: 3px; - background-repeat: no-repeat; - height: 16px; -} - -.TB_End -{ - display: none; -} - -.TB_ExpandImg -{ - background-image: url(images/toolbar.expand.gif); - background-repeat: no-repeat; -} - -.TB_CollapseImg -{ - background-image: url(images/toolbar.collapse.gif); - background-repeat: no-repeat; -} - -.TB_SideBorder -{ - background-color: #696969; -} - -.TB_Expand, .TB_Collapse -{ - padding: 2px 2px 2px 2px; - border: #efefde 1px outset; -} - -.TB_Collapse -{ - width: 5px; -} - -.TB_Break -{ - height: 24px; /* IE needs the height to be set, otherwise no break */ -} - +.TB_ToolbarSet, .TB_Expand, .TB_Collapse { background-color: #efefde; cursor: default; } +.TB_ToolbarSet { border-top: #efefde 1px outset; border-bottom: #efefde 1px outset; } +.TB_Toolbar { display: inline-table; /* inline = Opera jumping buttons bug */ height: 24px; } +.TB_Separator { width: 1px; margin: 2px; background-color: #999966; height: 16px; } +.TB_Start { margin: 2px; width: 3px; background-image: url(images/toolbar.start.gif); background-repeat: no-repeat; height: 16px; } +.TB_End { display: none; } +.TB_ExpandImg { background-image: url(images/toolbar.expand.gif); background-repeat: no-repeat; } +.TB_CollapseImg { background-image: url(images/toolbar.collapse.gif); background-repeat: no-repeat; } +.TB_SideBorder { background-color: #696969; } +.TB_Expand, .TB_Collapse { padding: 2px 2px 2px 2px; border: #efefde 1px outset; } +.TB_Collapse { width: 5px; } +.TB_Break { height: 24px; /* IE needs the height to be set, otherwise no break */ } /* Toolbar Button */ - -.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled -{ - border: #efefde 1px solid; /* This is the default border */ - height: 22px; /* The height is necessary, otherwise IE will not apply the alpha */ -} - -.TB_Button_On -{ - border: #316ac5 1px solid; - background-color: #c1d2ee; -} - -.TB_Button_On_Over, .TB_Button_Off_Over -{ - border: #316ac5 1px solid; - background-color: #dff1ff; -} - -.TB_Button_Off -{ - filter: alpha(opacity=70); /* IE */ - opacity: 0.70; /* Safari, Opera and Mozilla */ -} - -.TB_Button_Disabled -{ - filter: gray() alpha(opacity=30); /* IE */ - opacity: 0.30; /* Safari, Opera and Mozilla */ -} - -.TB_Button_Padding -{ - visibility: hidden; - width: 3px; - height: 22px; -} - -.TB_Button_Image -{ - overflow: hidden; - width: 16px; - height: 16px; - margin: 3px; - background-repeat: no-repeat; -} - -.TB_Button_Image img -{ - position: relative; -} - -.TB_Button_Off .TB_Button_Text -{ - background-color: #efefde; /* Needed because of a bug on Clear Type */ -} - -.TB_ConnectionLine -{ - background-color: #ffffff; - height: 1px; - margin-left: 1px; /* ltr */ - margin-right: 1px; /* rtl */ -} - -.TB_Text -{ - height: 22px; -} - -.TB_Button_Off .TB_Text -{ - background-color: #efefde ; /* Needed because of a bug on ClearType */ -} - -.TB_Button_On_Over .TB_Text -{ - background-color: #dff1ff ; /* Needed because of a bug on ClearType */ -} - +.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled { border: #efefde 1px solid; /* This is the default border */ height: 22px; /* The height is necessary, otherwise IE will not apply the alpha */ } +.TB_Button_On { border: #316ac5 1px solid; background-color: #c1d2ee; } +.TB_Button_On_Over, .TB_Button_Off_Over { border: #316ac5 1px solid; background-color: #dff1ff; } +.TB_Button_Padding { width: 3px; visibility: hidden; height: 22px; } +.TB_Button_Image { width: 16px; margin: 3px; background-repeat: no-repeat; overflow: hidden; height: 16px; } +.TB_Button_Image img { position: relative; } +.TB_ConnectionLine { margin-left: 1px; /* ltr */ margin-right: 1px; /* rtl */ background-color: #ffffff; height: 1px; } +.TB_Text { height: 22px; } +.TB_Button_On_Over .TB_Text { background-color: #dff1ff; /* Needed because of a bug on ClearType */ } /* Menu */ - -.MN_Menu -{ - border: 1px solid #8f8f73; - padding: 2px; - background-color: #ffffff; - cursor: default; -} - -.MN_Menu, .MN_Menu .MN_Label -{ - font-size: 11px; - font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif; -} - -.MN_Item_Padding -{ - visibility: hidden; - width: 3px; - height: 20px; -} - -.MN_Icon -{ - background-color: #e3e3c7; - text-align: center; - height: 20px; -} - -.MN_Label -{ - padding-left: 3px; - padding-right: 3px; -} - -.MN_Separator -{ - height: 3px; -} - -.MN_Separator_Line -{ - border-top: #b9b99d 1px solid; -} - -.MN_Item .MN_Icon IMG -{ - filter: alpha(opacity=70); - opacity: 0.70; -} - -.MN_Item_Over -{ - color: #ffffff; - background-color: #8f8f73; -} - -.MN_Item_Over .MN_Icon -{ - background-color: #737357; -} - -.MN_Item_Disabled IMG -{ - filter: gray() alpha(opacity=30); /* IE */ - opacity: 0.30; /* Safari, Opera and Mozilla */ -} - -.MN_Item_Disabled .MN_Label -{ - color: #b7b7b7; -} - -.MN_Arrow -{ - padding-right: 3px; - padding-left: 3px; -} - -.MN_ConnectionLine -{ - background-color: #ffffff; -} - -.Menu .TB_Button_On, .Menu .TB_Button_On_Over -{ - border: #8f8f73 1px solid; - background-color: #ffffff; -} - +.MN_Menu { border: 1px solid #8f8f73; padding: 2px; background-color: #ffffff; cursor: default; } +.MN_Item_Padding { width: 3px; visibility: hidden; height: 20px; } +.MN_Icon { background-color: #e3e3c7; text-align: center; height: 20px; } +.MN_Separator { height: 3px; } +.MN_Separator_Line { border-top: #b9b99d 1px solid; } +.MN_Item_Over { color: #ffffff; background-color: #8f8f73; } +.MN_Item_Over .MN_Icon { background-color: #737357; } +.MN_Item_Disabled .MN_Label { color: #b7b7b7; } +.MN_ConnectionLine { background-color: #ffffff; } +.Menu .TB_Button_On, .Menu .TB_Button_On_Over { border: #8f8f73 1px solid; background-color: #ffffff; } /* ### Panel Styles */ - -.FCK_Panel -{ - border: #8f8f73 1px solid; - padding: 2px; - background-color: #ffffff; -} - -.FCK_Panel, .FCK_Panel TD -{ - font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif; - font-size: 11px; -} - +.FCK_Panel { border: #8f8f73 1px solid; padding: 2px; background-color: #ffffff; } /* ### Special Combos */ - -.SC_Panel -{ - overflow: auto; - white-space: nowrap; - cursor: default; - border: 1px solid #8f8f73; - padding-left: 2px; - padding-right: 2px; -} - -.SC_Panel, .SC_Panel TD -{ - font-size: 11px; - font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif; -} - -.SC_Item, .SC_ItemSelected -{ - margin-top: 2px; - margin-bottom: 2px; - background-position: left center; - padding-left: 11px; - padding-right: 3px; - padding-top: 2px; - padding-bottom: 2px; - text-overflow: ellipsis; - overflow: hidden; - background-repeat: no-repeat; - border: #dddddd 1px solid; -} - -.SC_Item *, .SC_ItemSelected * -{ - margin-top: 0px; - margin-bottom: 0px; -} - -.SC_ItemSelected -{ - border: #9a9afb 1px solid; - background-image: url(images/toolbar.arrowright.gif); -} - -.SC_ItemOver -{ - border: #316ac5 1px solid; -} - -.SC_Field -{ - border: #b7b7a6 1px solid; - cursor: default; -} - -.SC_FieldCaption -{ - overflow: visible; - padding-right: 5px; - padding-left: 5px; - opacity: 0.75; /* Safari, Opera and Mozilla */ - filter: alpha(opacity=70); /* IE */ /* -moz-opacity: 0.75; Mozilla (Old) */ - height: 23px; - background-color: #efefde; -} - -.SC_FieldLabel -{ - white-space: nowrap; - padding: 2px; - width: 100%; - cursor: default; - background-color: #ffffff; - text-overflow: ellipsis; - overflow: hidden; -} - -.SC_FieldButton -{ - background-position: center center; - background-image: url(images/toolbar.buttonarrow.gif); - border-left: #b7b7a6 1px solid; - width: 14px; - background-repeat: no-repeat; -} - -.SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption, .SC_FieldDisabled .TB_ButtonType_Text -{ - opacity: 0.30; /* Safari, Opera and Mozilla */ - filter: gray() alpha(opacity=30); /* IE */ /* -moz-opacity: 0.30; Mozilla (Old) */ -} - -.SC_FieldOver -{ - border: #316ac5 1px solid; -} - -.SC_FieldOver .SC_FieldButton -{ - border-left: #316ac5 1px solid; -} - +.SC_Panel { border: 1px solid #8f8f73; padding-left: 2px; padding-right: 2px; white-space: nowrap; overflow: auto; cursor: default; } +.SC_Item, .SC_ItemSelected { margin-top: 2px; margin-bottom: 2px; padding-left: 11px; padding-right: 3px; padding-top: 2px; padding-bottom: 2px; border: #dddddd 1px solid; background-position: left center; background-repeat: no-repeat; overflow: hidden; text-overflow: ellipsis; } +.SC_Item *, .SC_ItemSelected * { margin-top: 0px; margin-bottom: 0px; } +.SC_ItemSelected { border: #9a9afb 1px solid; background-image: url(images/toolbar.arrowright.gif); } +.SC_Field { border: #b7b7a6 1px solid; cursor: default; } +.SC_FieldCaption { padding-right: 5px; padding-left: 5px; background-color: #efefde; overflow: visible; height: 23px; /* -moz-opacity: 0.75; Mozilla (Old) */ opacity: 0.75; /* Safari, Opera and Mozilla */ filter: alpha(opacity=70); /* IE */ } +.SC_FieldLabel { padding: 2px; width: 100%; white-space: nowrap; background-color: #ffffff; cursor: default; overflow: hidden; text-overflow: ellipsis; } +.SC_FieldButton { border-left: #b7b7a6 1px solid; width: 14px; background-position: center center; background-image: url(images/toolbar.buttonarrow.gif); background-repeat: no-repeat; } +.SC_FieldOver .SC_FieldButton { border-left: #316ac5 1px solid; } /* ### Color Selector Panel */ - -.ColorBoxBorder -{ - border: #808080 1px solid; - position: static; -} - -.ColorBox -{ - font-size: 1px; - width: 10px; - position: static; - height: 10px; -} - -.ColorDeselected, .ColorSelected -{ - cursor: default; -} - -.ColorDeselected -{ - border: #ffffff 1px solid; - padding: 2px; - float: left; -} - -.ColorSelected -{ - border: #330066 1px solid; - padding: 2px; - float: left; - background-color: #c4cdd6; -} +.ColorBoxBorder { border: #808080 1px solid; position: static; } +.ColorBox { width: 10px; font-size: 1px; position: static; height: 10px; } +.ColorDeselected, .ColorSelected { cursor: default; } +.ColorDeselected { border: #ffffff 1px solid; padding: 2px; float: left; } +.ColorSelected { border: #330066 1px solid; padding: 2px; float: left; background-color: #c4cdd6; } +.TB_Button_Off, .MN_Item .MN_Icon IMG { filter: alpha(opacity=70); /* IE */ opacity: 0.70; /* Safari, Opera and Mozilla */ } +.TB_Button_Off .TB_Button_Text, .TB_Button_Off .TB_Text { background-color: #efefde; /* Needed because of a bug on Clear Type */ } +.MN_Label, .MN_Arrow { padding-left: 3px; padding-right: 3px; } +.SC_ItemOver, .SC_FieldOver { border: #316ac5 1px solid; } +.SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption, .SC_FieldDisabled .TB_ButtonType_Text, .TB_Button_Disabled, .MN_Item_Disabled IMG { opacity: 0.30; /* Safari, Opera and Mozilla */ filter: gray() alpha(opacity=30); /* IE */ } +.TB_ToolbarSet TD, .MN_Menu, .MN_Menu .MN_Label, .FCK_Panel, .FCK_Panel TD, .SC_Panel, .SC_Panel TD { font-size: 11px; font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif; } Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/skins/default/fck_dialog.css =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/skins/default/fck_dialog.css (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/skins/default/fck_dialog.css (revision 1256) @@ -1,3 +1,4 @@ +@charset "UTF-8"; /* * FCKeditor - The text editor for Internet - http://www.fckeditor.net * Copyright (C) 2003-2009 Frederico Caldeira Knabben @@ -20,383 +21,64 @@ * * Styles used by the dialog boxes. */ - -html, body -{ - background-color: transparent; - margin: 0px; - padding: 0px; -} - -body -{ - padding: 10px; -} - -body, td, input, select, textarea -{ - font-size: 11px; - font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana; -} - -body, .BackColor -{ - background-color: #f1f1e3; -} - -.PopupBody -{ - height: 100%; - width: 100%; - overflow: hidden; - background-color: transparent; - padding: 0px; -} - -#header -{ - cursor: move; -} - -.PopupTitle -{ - font-weight: bold; - font-size: 14pt; - color: #737357; - background-color: #e3e3c7; - padding: 3px 10px 3px 10px; -} - -.PopupButtons -{ - position: absolute; - right: 0px; - left: 0px; - bottom: 0px; - border-top: #d5d59d 1px solid; - background-color: #e3e3c7; - padding: 7px 10px 7px 10px; -} - -.Button -{ - border: #737357 1px solid; - color: #3b3b1f; - background-color: #c7c78f; -} - -#btnOk -{ - width: 100px; -} - -.DarkBackground -{ - background-color: #eaead1; -} - -.LightBackground -{ - background-color: #ffffbe; -} - -.PopupTitleBorder -{ - border-bottom: #d5d59d 1px solid; -} - -.PopupTabArea -{ - color: #737357; - background-color: #e3e3c7; -} - -.PopupTabEmptyArea -{ - padding-left: 10px; - border-bottom: #d5d59d 1px solid; -} - -.PopupTab, .PopupTabSelected -{ - border-right: #d5d59d 1px solid; - border-top: #d5d59d 1px solid; - border-left: #d5d59d 1px solid; - padding: 3px 5px 3px 5px; - color: #737357; -} - -.PopupTab -{ - margin-top: 1px; - border-bottom: #d5d59d 1px solid; - cursor: pointer; - cursor: hand; -} - -.PopupTabSelected -{ - font-weight: bold; - cursor: default; - padding-top: 4px; - border-bottom: #f1f1e3 1px solid; - background-color: #f1f1e3; -} - -.PopupSelectionBox -{ - border: #ff9933 1px solid !important; - background-color: #fffacd !important; - cursor: pointer; - cursor: hand; -} - -#tdBrowse -{ - vertical-align: bottom; -} - +html, body { margin: 0px; padding: 0px; background-color: transparent; } +body { padding: 10px; } +body, td, input, select, textarea { font-size: 11px; font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana; } +body, .BackColor { background-color: #f1f1e3; } +.PopupBody { width: 100%; padding: 0px; background-color: transparent; height: 100%; overflow: hidden; } +#header { cursor: move; } +.PopupTitle { padding: 3px 10px 3px 10px; color: #737357; background-color: #e3e3c7; font-weight: bold; font-size: 14pt; } +.PopupButtons { border-top: #d5d59d 1px solid; padding: 7px 10px 7px 10px; background-color: #e3e3c7; position: absolute; right: 0px; left: 0px; bottom: 0px; } +.Button { border: #737357 1px solid; color: #3b3b1f; background-color: #c7c78f; } +#btnOk { width: 100px; } +.DarkBackground { background-color: #eaead1; } +.LightBackground { background-color: #ffffbe; } +.PopupTitleBorder { border-bottom: #d5d59d 1px solid; } +.PopupTabArea { color: #737357; background-color: #e3e3c7; } +.PopupTabEmptyArea { padding-left: 10px; border-bottom: #d5d59d 1px solid; } +.PopupTab, .PopupTabSelected { border-right: #d5d59d 1px solid; border-top: #d5d59d 1px solid; border-left: #d5d59d 1px solid; padding: 3px 5px 3px 5px; color: #737357; } +.PopupTab { margin-top: 1px; border-bottom: #d5d59d 1px solid; cursor: pointer; cursor: hand; } +.PopupTabSelected { padding-top: 4px; border-bottom: #f1f1e3 1px solid; background-color: #f1f1e3; font-weight: bold; cursor: default; } +.PopupSelectionBox { border: #ff9933 1px solid !important; background-color: #fffacd !important; cursor: pointer; cursor: hand; } +#tdBrowse { vertical-align: bottom; } /** * Dialog frame related styles. */ - -.contents -{ - position: absolute; - top: 2px; - left: 16px; - right: 16px; - bottom: 20px; - background-color: #f1f1e3; - overflow: hidden; - z-index: 1; -} - -.tl, .tr, .tc, .bl, .br, .bc -{ - position: absolute; - background-image: url(images/sprites.png); - background-repeat: no-repeat; -} - -* html .tl, * html .tr, * html .tc, * html .bl, * html .br, * html .bc -{ - background-image: url(images/sprites.gif); -} - -.ml, .mr -{ - position: absolute; - background-image: url(images/dialog.sides.png); - background-repeat: repeat-y; -} - -* html .ml, * html .mr -{ - background-image: url(images/dialog.sides.gif); -} - -.rtl .ml, .rtl .mr -{ - position: absolute; - background-image: url(images/dialog.sides.rtl.png); - background-repeat: repeat-y; -} - -* html .rtl .ml, * html .rtl .mr -{ - background-image: url(images/dialog.sides.gif); -} - -.tl -{ - top: 0px; - left: 0px; - width: 16px; - height: 16px; - background-position: -16px -16px; -} - -.rtl .tl -{ - background-position: -16px -397px; -} - -.tr -{ - top: 0px; - right: 0px; - width: 16px; - height: 16px; - background-position: -16px -76px; -} - -.rtl .tr -{ - background-position: -16px -457px; -} - -.tc -{ - top: 0px; - right: 16px; - left: 16px; - height: 16px; - background-position: 0px -136px; - background-repeat: repeat-x; -} - -.ml -{ - top: 16px; - left: 0px; - width: 16px; - bottom: 51px; - background-position: 0px 0px; -} - -.mr -{ - top: 16px; - right: 0px; - width: 16px; - bottom: 51px; - background-position: -16px 0px; -} - -.bl -{ - bottom: 0px; - left: 0px; - width: 30px; - height: 51px; - background-position: -16px -196px; -} - -.rtl .bl -{ - background-position: -16px -517px; -} - -.br -{ - bottom: 0px; - right: 0px; - width: 30px; - height: 51px; - background-position: -16px -263px; -} - -.rtl .br -{ - background-position: -16px -584px; -} - -.bc -{ - bottom: 0px; - right: 30px; - left: 30px; - height: 51px; - background-position: 0px -330px; - background-repeat: repeat-x; -} - +.contents { background-color: #f1f1e3; position: absolute; top: 2px; left: 16px; right: 16px; bottom: 20px; overflow: hidden; z-index: 1; } +.tl, .tr, .tc, .bl, .br, .bc { background-image: url(images/sprites.png); background-repeat: no-repeat; position: absolute; } +* html .tl, * html .tr, * html .tc, * html .bl, * html .br, * html .bc { background-image: url(images/sprites.gif); } +.ml, .mr { background-image: url(images/dialog.sides.png); background-repeat: repeat-y; position: absolute; } +.rtl .ml, .rtl .mr { background-image: url(images/dialog.sides.rtl.png); background-repeat: repeat-y; position: absolute; } +.tl { width: 16px; background-position: -16px -16px; top: 0px; left: 0px; height: 16px; } +.rtl .tl { background-position: -16px -397px; } +.tr { width: 16px; background-position: -16px -76px; top: 0px; right: 0px; height: 16px; } +.rtl .tr { background-position: -16px -457px; } +.tc { background-position: 0px -136px; background-repeat: repeat-x; top: 0px; right: 16px; left: 16px; height: 16px; } +.ml { width: 16px; background-position: 0px 0px; top: 16px; left: 0px; bottom: 51px; } +.mr { width: 16px; background-position: -16px 0px; top: 16px; right: 0px; bottom: 51px; } +.bl { width: 30px; background-position: -16px -196px; bottom: 0px; left: 0px; height: 51px; } +.rtl .bl { background-position: -16px -517px; } +.br { width: 30px; background-position: -16px -263px; bottom: 0px; right: 0px; height: 51px; } +.rtl .br { background-position: -16px -584px; } +.bc { background-position: 0px -330px; background-repeat: repeat-x; bottom: 0px; right: 30px; left: 30px; height: 51px; } /* For IE6. Do not change it. */ -* html .blocker -{ - position: absolute; - width: 100%; - height: 100%; - z-index: 12; - filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0); -} - +* html .blocker { width: 100%; position: absolute; height: 100%; z-index: 12; filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0); } /* The layer used to cover the dialog when opening a child dialog. */ -.cover -{ - position: absolute; - top: 0px; - left: 14px; - right: 14px; - bottom: 18px; - z-index: 11; -} - -#closeButton -{ - position: absolute; - right: 0px; - top: 0px; - margin-top: 5px; - margin-right: 10px; - width: 20px; - height: 20px; - cursor: pointer; - background-image: url(images/sprites.png); - background-repeat: no-repeat; - background-position: -16px -651px; -} - -* html #closeButton -{ - cursor: hand; - background-image: url(images/sprites.gif); -} - -.rtl #closeButton -{ - right: auto; - left: 10px; - margin-right: 0px; -} - -#closeButton:hover -{ - background-position: -16px -687px; -} - -#throbberBlock -{ - z-index: 10; -} - -#throbberBlock div -{ - float: left; - width: 8px; - height: 9px; - margin-left: 2px; - margin-right: 2px; - font-size: 1px; /* IE6 */ -} - +.cover { position: absolute; top: 0px; left: 14px; right: 14px; bottom: 18px; z-index: 11; } +#closeButton { margin-top: 5px; margin-right: 10px; width: 20px; background-image: url(images/sprites.png); background-repeat: no-repeat; background-position: -16px -651px; position: absolute; right: 0px; top: 0px; height: 20px; cursor: pointer; } +* html #closeButton { background-image: url(images/sprites.gif); cursor: hand; } +.rtl #closeButton { margin-right: 0px; right: auto; left: 10px; } +#closeButton:hover { background-position: -16px -687px; } +#throbberBlock { z-index: 10; } +#throbberBlock div { float: left; width: 8px; margin-left: 2px; margin-right: 2px; font-size: 1px; /* IE6 */ height: 9px; } /* Color Gradient Generator: http://www.herethere.net/~samson/php/color_gradient/?cbegin=737357&cend=E3E3C7&steps=4 */ - -.throbber_1 -{ - background-color: #737357; -} - -.throbber_2 -{ - background-color: #8f8f73; -} - -.throbber_3 -{ - background-color: #abab8f; -} - -.throbber_4 -{ - background-color: #c7c7ab; -} - -.throbber_5 -{ - background-color: #e3e3c7; -} +.throbber_1 { background-color: #737357; } +.throbber_2 { background-color: #8f8f73; } +.throbber_3 { background-color: #abab8f; } +.throbber_4 { background-color: #c7c7ab; } +.throbber_5 { background-color: #e3e3c7; } +img { border: 0px; } +* html .ml, * html .mr, * html .rtl .ml, * html .rtl .mr { background-image: url(images/dialog.sides.gif); } Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/skins/silver/fck_editor.css =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/skins/silver/fck_editor.css (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/skins/silver/fck_editor.css (revision 1256) @@ -1,3 +1,4 @@ +@charset "UTF-8"; /* * FCKeditor - The text editor for Internet - http://www.fckeditor.net * Copyright (C) 2003-2009 Frederico Caldeira Knabben @@ -20,454 +21,84 @@ * * Styles used by the editor IFRAME and Toolbar. */ - /* ### Basic Editor IFRAME Styles. */ - -body -{ - padding: 1px; - margin: 0; - background-color: #ffffff; -} - -#xEditingArea -{ - border: #696969 1px solid; -} - -.SourceField -{ - padding: 5px; - margin: 0px; - font-family: Monospace; -} - +body { padding: 1px; margin: 0; background-color: #ffffff; } +#xEditingArea { border: #696969 1px solid; } +.SourceField { padding: 5px; margin: 0px; font-family: Monospace; } /* Toolbar */ - -.TB_ToolbarSet, .TB_Expand, .TB_Collapse -{ - cursor: default; - background-color: #f7f7f7; -} - -.TB_ToolbarSet -{ - padding: 1px; - border-top: #efefde 1px outset; - border-bottom: #efefde 1px outset; -} - -.TB_ToolbarSet TD -{ - font-size: 11px; - font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif; -} - -.TB_Toolbar -{ - display: inline-table; -} - -.TB_Separator -{ - width: 1px; - height: 21px; - margin: 2px; - background-color: #C6C3BD; -} - -.TB_Start -{ - background-image: url(images/toolbar.start.gif); - margin-left: 2px; - margin-right: 2px; - width: 3px; - background-repeat: no-repeat; - height: 27px; - background-position: center center; -} - -.TB_End -{ - display: none; -} - -.TB_ExpandImg -{ - background-image: url(images/toolbar.expand.gif); - background-repeat: no-repeat; -} - -.TB_CollapseImg -{ - background-image: url(images/toolbar.collapse.gif); - background-repeat: no-repeat; -} - -.TB_SideBorder -{ - background-color: #696969; -} - -.TB_Expand, .TB_Collapse -{ - padding: 2px 2px 2px 2px; - border: #efefde 1px outset; -} - -.TB_Collapse -{ - border: #efefde 1px outset; - width: 5px; -} - -.TB_Break -{ - height: 27px; -} - +.TB_ToolbarSet, .TB_Expand, .TB_Collapse { background-color: #f7f7f7; cursor: default; } +.TB_ToolbarSet { padding: 1px; border-top: #efefde 1px outset; border-bottom: #efefde 1px outset; } +.TB_Toolbar { display: inline-table; } +.TB_Separator { width: 1px; margin: 2px; background-color: #C6C3BD; height: 21px; } +.TB_Start { margin-left: 2px; margin-right: 2px; width: 3px; background-image: url(images/toolbar.start.gif); background-repeat: no-repeat; background-position: center center; height: 27px; } +.TB_End { display: none; } +.TB_ExpandImg { background-image: url(images/toolbar.expand.gif); background-repeat: no-repeat; } +.TB_CollapseImg { background-image: url(images/toolbar.collapse.gif); background-repeat: no-repeat; } +.TB_SideBorder { background-color: #696969; } +.TB_Expand, .TB_Collapse { padding: 2px 2px 2px 2px; border: #efefde 1px outset; } +.TB_Collapse { border: #efefde 1px outset; width: 5px; } +.TB_Break { height: 27px; } /* Toolbar Button */ - -.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled -{ - padding: 1px ; - margin:1px; - height: 21px; -} - -.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled -{ - border: #cec6b5 1px solid; -} - -.TB_Button_On -{ - border-color: #316ac5; - background-color: #c1d2ee; -} - -.TB_Button_On_Over, .TB_Button_Off_Over -{ - border: #316ac5 1px solid; - background-color: #dff1ff; -} - -.TB_Button_Off -{ - background: #efefef url(images/toolbar.buttonbg.gif) repeat-x; -} - -.TB_Button_Off, .TB_Combo_Off -{ - opacity: 0.70; /* Safari, Opera and Mozilla */ - filter: alpha(opacity=70); /* IE */ - /* -moz-opacity: 0.70; Mozilla (Old) */ -} - -.TB_Button_Disabled -{ - opacity: 0.30; /* Safari, Opera and Mozilla */ - filter: gray() alpha(opacity=30); /* IE */ -} - -.TB_Button_Padding -{ - visibility: hidden; - width: 3px; - height: 21px; -} - -.TB_Button_Image -{ - overflow: hidden; - width: 16px; - height: 16px; - margin: 3px; - margin-top: 4px; - margin-bottom: 2px; - background-repeat: no-repeat; -} - +.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled { padding: 1px; margin: 1px; height: 21px; } +.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled { border: #cec6b5 1px solid; } +.TB_Button_On { border-color: #316ac5; background-color: #c1d2ee; } +.TB_Button_On_Over, .TB_Button_Off_Over { border: #316ac5 1px solid; background-color: #dff1ff; } +.TB_Button_Off { background: #efefef url(images/toolbar.buttonbg.gif) repeat-x; } +.TB_Button_Padding { width: 3px; visibility: hidden; height: 21px; } +.TB_Button_Image { width: 16px; margin: 3px; margin-top: 4px; margin-bottom: 2px; background-repeat: no-repeat; overflow: hidden; height: 16px; } /* For composed button ( icon + text, icon + arrow ), we must compensate the table */ .TB_Button_On TABLE .TB_Button_Image, .TB_Button_Off TABLE .TB_Button_Image, .TB_Button_On_Over TABLE .TB_Button_Image, .TB_Button_Off_Over TABLE .TB_Button_Image, -.TB_Button_Disabled TABLE .TB_Button_Image -{ - margin-top: 3px; -} - -.TB_Button_Image img -{ - position: relative; -} - -.TB_ConnectionLine -{ - background-color: #ffffff; - height: 1px; - margin-left: 1px; /* ltr */ - margin-right: 1px; /* rtl */ -} - +.TB_Button_Disabled TABLE .TB_Button_Image { margin-top: 3px; } +.TB_Button_Image img { position: relative; } +.TB_ConnectionLine { margin-left: 1px; /* ltr */ margin-right: 1px; /* rtl */ background-color: #ffffff; height: 1px; } /* Menu */ - -.MN_Menu -{ - border: 1px solid #8f8f73; - padding: 2px; - background-color: #f7f7f7; - cursor: default; -} - -.MN_Menu, .MN_Menu .MN_Label -{ - font-size: 11px; - font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif; -} - -.MN_Item_Padding -{ - visibility: hidden; - width: 3px; - height: 20px; -} - -.MN_Icon -{ - background-color: #dedede; - text-align: center; - height: 20px; -} - -.MN_Label -{ - padding-left: 3px; - padding-right: 3px; -} - -.MN_Separator -{ - height: 3px; -} - -.MN_Separator_Line -{ - border-top: #b9b99d 1px solid; -} - -.MN_Item .MN_Icon IMG -{ - filter: alpha(opacity=70); - opacity: 0.70; -} - -.MN_Item_Over -{ - color: #ffffff; - background-color: #8a857d; -} - -.MN_Item_Over .MN_Icon -{ - background-color: #6c6761; -} - -.MN_Item_Disabled IMG -{ - filter: gray() alpha(opacity=30); /* IE */ - opacity: 0.30; /* Safari, Opera and Mozilla */ -} - -.MN_Item_Disabled .MN_Label -{ - color: #b7b7b7; -} - -.MN_Arrow -{ - padding-right: 3px; - padding-left: 3px; -} - -.MN_ConnectionLine -{ - background-color: #ffffff; -} - -.Menu .TB_Button_On, .Menu .TB_Button_On_Over -{ - border: #8f8f73 1px solid; - background-color: #ffffff; -} - +.MN_Menu { border: 1px solid #8f8f73; padding: 2px; background-color: #f7f7f7; cursor: default; } +.MN_Item_Padding { width: 3px; visibility: hidden; height: 20px; } +.MN_Icon { background-color: #dedede; text-align: center; height: 20px; } +.MN_Separator { height: 3px; } +.MN_Separator_Line { border-top: #b9b99d 1px solid; } +.MN_Item_Over { color: #ffffff; background-color: #8a857d; } +.MN_Item_Over .MN_Icon { background-color: #6c6761; } +.MN_Item_Disabled .MN_Label { color: #b7b7b7; } +.MN_ConnectionLine { background-color: #ffffff; } +.Menu .TB_Button_On, .Menu .TB_Button_On_Over { border: #8f8f73 1px solid; background-color: #ffffff; } /* ### Panel Styles */ - -.FCK_Panel -{ - border: #8f8f73 1px solid; - padding: 2px; - background-color: #ffffff; -} - -.FCK_Panel, .FCK_Panel TD -{ - font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif; - font-size: 11px; -} - +.FCK_Panel { border: #8f8f73 1px solid; padding: 2px; background-color: #ffffff; } /* ### Special Combos */ - -.SC_Panel -{ - overflow: auto; - white-space: nowrap; - cursor: default; - border: 1px solid #8f8f73; - padding-left: 2px; - padding-right: 2px; -} - -.SC_Panel, .SC_Panel TD -{ - font-size: 11px; - font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif; -} - -.SC_Item, .SC_ItemSelected -{ - margin-top: 2px; - margin-bottom: 2px; - background-position: left center; - padding-left: 11px; - padding-right: 3px; - padding-top: 2px; - padding-bottom: 2px; - text-overflow: ellipsis; - overflow: hidden; - background-repeat: no-repeat; - border: #dddddd 1px solid; -} - -.SC_Item *, .SC_ItemSelected * -{ - margin-top: 0px; - margin-bottom: 0px; -} - -.SC_ItemSelected -{ - border: #9a9afb 1px solid; - background-image: url(images/toolbar.arrowright.gif); -} - -.SC_ItemOver -{ - border: #316ac5 1px solid; -} - -.SC_Field -{ - margin-top:1px ; - border: #b7b7a6 1px solid; - cursor: default; -} - -.SC_FieldCaption -{ - padding-top: 1px ; - overflow: visible; - padding-right: 5px; - padding-left: 5px; - opacity: 0.75; /* Safari, Opera and Mozilla */ - filter: alpha(opacity=70); /* IE */ /* -moz-opacity: 0.75; Mozilla (Old) */ - height: 23px; - background-color: #f7f7f7; -} - -.SC_FieldLabel -{ - white-space: nowrap; - padding: 2px; - width: 100%; - cursor: default; - background-color: #ffffff; - text-overflow: ellipsis; - overflow: hidden; -} - -.SC_FieldButton -{ - background-position: center center; - background-image: url(images/toolbar.buttonarrow.gif); - border-left: #b7b7a6 1px solid; - width: 14px; - background-repeat: no-repeat; -} - -.SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption, .SC_FieldDisabled .TB_ButtonType_Text -{ - opacity: 0.30; /* Safari, Opera and Mozilla */ - filter: gray() alpha(opacity=30); /* IE */ /* -moz-opacity: 0.30; Mozilla (Old) */ -} - -.SC_FieldOver -{ - border: #316ac5 1px solid; -} - -.SC_FieldOver .SC_FieldButton -{ - border-left: #316ac5 1px solid; -} - +.SC_Panel { border: 1px solid #8f8f73; padding-left: 2px; padding-right: 2px; white-space: nowrap; overflow: auto; cursor: default; } +.SC_Item, .SC_ItemSelected { margin-top: 2px; margin-bottom: 2px; padding-left: 11px; padding-right: 3px; padding-top: 2px; padding-bottom: 2px; border: #dddddd 1px solid; background-position: left center; background-repeat: no-repeat; overflow: hidden; text-overflow: ellipsis; } +.SC_Item *, .SC_ItemSelected * { margin-top: 0px; margin-bottom: 0px; } +.SC_ItemSelected { border: #9a9afb 1px solid; background-image: url(images/toolbar.arrowright.gif); } +.SC_Field { margin-top: 1px; border: #b7b7a6 1px solid; cursor: default; } +.SC_FieldCaption { padding-top: 1px; padding-right: 5px; padding-left: 5px; background-color: #f7f7f7; overflow: visible; height: 23px; /* -moz-opacity: 0.75; Mozilla (Old) */ opacity: 0.75; /* Safari, Opera and Mozilla */ filter: alpha(opacity=70); /* IE */ } +.SC_FieldLabel { padding: 2px; width: 100%; white-space: nowrap; background-color: #ffffff; cursor: default; overflow: hidden; text-overflow: ellipsis; } +.SC_FieldButton { border-left: #b7b7a6 1px solid; width: 14px; background-position: center center; background-image: url(images/toolbar.buttonarrow.gif); background-repeat: no-repeat; } +.SC_FieldOver .SC_FieldButton { border-left: #316ac5 1px solid; } /* ### Color Selector Panel */ - -.ColorBoxBorder -{ - border: #808080 1px solid; - position: static; -} - -.ColorBox -{ - font-size: 1px; - width: 10px; - position: static; - height: 10px; -} - -.ColorDeselected, .ColorSelected -{ - cursor: default; -} - -.ColorDeselected -{ - border: #ffffff 1px solid; - padding: 2px; - float: left; -} - -.ColorSelected -{ - border: #316ac5 1px solid; - padding: 2px; - float: left; - background-color: #c1d2ee; -} +.ColorBoxBorder { border: #808080 1px solid; position: static; } +.ColorBox { width: 10px; font-size: 1px; position: static; height: 10px; } +.ColorDeselected, .ColorSelected { cursor: default; } +.ColorDeselected { border: #ffffff 1px solid; padding: 2px; float: left; } +.ColorSelected { border: #316ac5 1px solid; padding: 2px; float: left; background-color: #c1d2ee; } +.TB_Button_Off, .TB_Combo_Off, .MN_Item .MN_Icon IMG { opacity: 0.70; /* Safari, Opera and Mozilla */ filter: alpha(opacity=70); /* IE */ } +.MN_Label, .MN_Arrow { padding-left: 3px; padding-right: 3px; } +.SC_ItemOver, .SC_FieldOver { border: #316ac5 1px solid; } +.SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption, .SC_FieldDisabled .TB_ButtonType_Text, .TB_Button_Disabled, .MN_Item_Disabled IMG { opacity: 0.30; /* Safari, Opera and Mozilla */ filter: gray() alpha(opacity=30); /* IE */ } +.TB_ToolbarSet TD, .MN_Menu, .MN_Menu .MN_Label, .FCK_Panel, .FCK_Panel TD, .SC_Panel, .SC_Panel TD { font-size: 11px; font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif; } Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/skins/silver/fck_dialog.css =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/skins/silver/fck_dialog.css (revision 1255) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/skins/silver/fck_dialog.css (revision 1256) @@ -1,3 +1,4 @@ +@charset "UTF-8"; /* * FCKeditor - The text editor for Internet - http://www.fckeditor.net * Copyright (C) 2003-2009 Frederico Caldeira Knabben @@ -20,383 +21,64 @@ * * Styles used by the dialog boxes. */ - -html, body -{ - background-color: transparent; - margin: 0px; - padding: 0px; -} - -body -{ - padding: 10px; -} - -body, td, input, select, textarea -{ - font-size: 11px; - font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana; -} - -body, .BackColor -{ - background-color: #f7f7f7; -} - -.PopupBody -{ - height: 100%; - width: 100%; - overflow: hidden; - background-color: transparent; - padding: 0px; -} - -#header -{ - cursor: move; -} - -.PopupTitle -{ - font-weight: bold; - font-size: 14pt; - color: #504845; - background-color: #dedede; - padding: 3px 10px 3px 10px; -} - -.PopupButtons -{ - position: absolute; - right: 0px; - left: 0px; - bottom: 0px; - border-top: #cec6b5 1px solid; - background-color: #DEDEDE; - padding: 7px 10px 7px 10px; -} - -.Button -{ - border: #7a7261 1px solid; - color: #504845; - background-color: #cec6b5; -} - -#btnOk -{ - width: 100px; -} - -.DarkBackground -{ - background-color: #f2f2f2; -} - -.LightBackground -{ - background-color: #ffffbe; -} - -.PopupTitleBorder -{ - border-bottom: #cec6b5 1px solid; -} - -.PopupTabArea -{ - color: #504845; - background-color: #DEDEDE; -} - -.PopupTabEmptyArea -{ - padding-left: 10px ; - border-bottom: #cec6b5 1px solid; -} - -.PopupTab, .PopupTabSelected -{ - border-right: #cec6b5 1px solid; - border-top: #cec6b5 1px solid; - border-left: #cec6b5 1px solid; - padding: 3px 5px 3px 5px; - color: #504845; -} - -.PopupTab -{ - margin-top: 1px; - border-bottom: #cec6b5 1px solid; - cursor: pointer; - cursor: hand; -} - -.PopupTabSelected -{ - font-weight:bold; - cursor: default; - padding-top: 4px; - border-bottom: #f1f1e3 1px solid; - background-color: #f7f7f7; -} - -.PopupSelectionBox -{ - border: #a9a9a9 1px solid !important; - background-color: #dcdcdc !important; - cursor: pointer; - cursor: hand; -} - -#tdBrowse -{ - vertical-align: bottom; -} - +html, body { margin: 0px; padding: 0px; background-color: transparent; } +body { padding: 10px; } +body, td, input, select, textarea { font-size: 11px; font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana; } +body, .BackColor { background-color: #f7f7f7; } +.PopupBody { width: 100%; padding: 0px; background-color: transparent; height: 100%; overflow: hidden; } +#header { cursor: move; } +.PopupTitle { padding: 3px 10px 3px 10px; color: #504845; background-color: #dedede; font-weight: bold; font-size: 14pt; } +.PopupButtons { border-top: #cec6b5 1px solid; padding: 7px 10px 7px 10px; background-color: #DEDEDE; position: absolute; right: 0px; left: 0px; bottom: 0px; } +.Button { border: #7a7261 1px solid; color: #504845; background-color: #cec6b5; } +#btnOk { width: 100px; } +.DarkBackground { background-color: #f2f2f2; } +.LightBackground { background-color: #ffffbe; } +.PopupTitleBorder { border-bottom: #cec6b5 1px solid; } +.PopupTabArea { color: #504845; background-color: #DEDEDE; } +.PopupTabEmptyArea { padding-left: 10px; border-bottom: #cec6b5 1px solid; } +.PopupTab, .PopupTabSelected { border-right: #cec6b5 1px solid; border-top: #cec6b5 1px solid; border-left: #cec6b5 1px solid; padding: 3px 5px 3px 5px; color: #504845; } +.PopupTab { margin-top: 1px; border-bottom: #cec6b5 1px solid; cursor: pointer; cursor: hand; } +.PopupTabSelected { padding-top: 4px; border-bottom: #f1f1e3 1px solid; background-color: #f7f7f7; font-weight: bold; cursor: default; } +.PopupSelectionBox { border: #a9a9a9 1px solid !important; background-color: #dcdcdc !important; cursor: pointer; cursor: hand; } +#tdBrowse { vertical-align: bottom; } /** * Dialog frame related styles. */ - -.contents -{ - position: absolute; - top: 2px; - left: 16px; - right: 16px; - bottom: 20px; - background-color: #f7f7f7; - overflow: hidden; - z-index: 1; -} - -.tl, .tr, .tc, .bl, .br, .bc -{ - position: absolute; - background-image: url(images/sprites.png); - background-repeat: no-repeat; -} - -* html .tl, * html .tr, * html .tc, * html .bl, * html .br, * html .bc -{ - background-image: url(images/sprites.gif); -} - -.ml, .mr -{ - position: absolute; - background-image: url(images/dialog.sides.png); - background-repeat: repeat-y; -} - -* html .ml, * html .mr -{ - background-image: url(images/dialog.sides.gif); -} - -.rtl .ml, .rtl .mr -{ - position: absolute; - background-image: url(images/dialog.sides.rtl.png); - background-repeat: repeat-y; -} - -* html .rtl .ml, * html .rtl .mr -{ - background-image: url(images/dialog.sides.gif); -} - -.tl -{ - top: 0px; - left: 0px; - width: 16px; - height: 16px; - background-position: -16px -16px; -} - -.rtl .tl -{ - background-position: -16px -397px; -} - -.tr -{ - top: 0px; - right: 0px; - width: 16px; - height: 16px; - background-position: -16px -76px; -} - -.rtl .tr -{ - background-position: -16px -457px; -} - -.tc -{ - top: 0px; - right: 16px; - left: 16px; - height: 16px; - background-position: 0px -136px; - background-repeat: repeat-x; -} - -.ml -{ - top: 16px; - left: 0px; - width: 16px; - bottom: 51px; - background-position: 0px 0px; -} - -.mr -{ - top: 16px; - right: 0px; - width: 16px; - bottom: 51px; - background-position: -16px 0px; -} - -.bl -{ - bottom: 0px; - left: 0px; - width: 30px; - height: 51px; - background-position: -16px -196px; -} - -.rtl .bl -{ - background-position: -16px -517px; -} - -.br -{ - bottom: 0px; - right: 0px; - width: 30px; - height: 51px; - background-position: -16px -263px; -} - -.rtl .br -{ - background-position: -16px -584px; -} - -.bc -{ - bottom: 0px; - right: 30px; - left: 30px; - height: 51px; - background-position: 0px -330px; - background-repeat: repeat-x; -} - +.contents { background-color: #f7f7f7; position: absolute; top: 2px; left: 16px; right: 16px; bottom: 20px; overflow: hidden; z-index: 1; } +.tl, .tr, .tc, .bl, .br, .bc { background-image: url(images/sprites.png); background-repeat: no-repeat; position: absolute; } +* html .tl, * html .tr, * html .tc, * html .bl, * html .br, * html .bc { background-image: url(images/sprites.gif); } +.ml, .mr { background-image: url(images/dialog.sides.png); background-repeat: repeat-y; position: absolute; } +.rtl .ml, .rtl .mr { background-image: url(images/dialog.sides.rtl.png); background-repeat: repeat-y; position: absolute; } +.tl { width: 16px; background-position: -16px -16px; top: 0px; left: 0px; height: 16px; } +.rtl .tl { background-position: -16px -397px; } +.tr { width: 16px; background-position: -16px -76px; top: 0px; right: 0px; height: 16px; } +.rtl .tr { background-position: -16px -457px; } +.tc { background-position: 0px -136px; background-repeat: repeat-x; top: 0px; right: 16px; left: 16px; height: 16px; } +.ml { width: 16px; background-position: 0px 0px; top: 16px; left: 0px; bottom: 51px; } +.mr { width: 16px; background-position: -16px 0px; top: 16px; right: 0px; bottom: 51px; } +.bl { width: 30px; background-position: -16px -196px; bottom: 0px; left: 0px; height: 51px; } +.rtl .bl { background-position: -16px -517px; } +.br { width: 30px; background-position: -16px -263px; bottom: 0px; right: 0px; height: 51px; } +.rtl .br { background-position: -16px -584px; } +.bc { background-position: 0px -330px; background-repeat: repeat-x; bottom: 0px; right: 30px; left: 30px; height: 51px; } /* For IE6. Do not change it. */ -* html .blocker -{ - position: absolute; - width: 100%; - height: 100%; - z-index: 12; - filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0); -} - +* html .blocker { width: 100%; position: absolute; height: 100%; z-index: 12; filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0); } /* The layer used to cover the dialog when opening a child dialog. */ -.cover -{ - position: absolute; - top: 0px; - left: 14px; - right: 14px; - bottom: 18px; - z-index: 11; -} - -#closeButton -{ - position: absolute; - right: 0px; - top: 0px; - margin-top: 5px; - margin-right: 10px; - width: 20px; - height: 20px; - cursor: pointer; - background-image: url(images/sprites.png); - background-repeat: no-repeat; - background-position: -16px -651px; -} - -* html #closeButton -{ - cursor: hand; - background-image: url(images/sprites.gif); -} - -.rtl #closeButton -{ - right: auto; - left: 10px; - margin-right: 0px; -} - -#closeButton:hover -{ - background-position: -16px -687px; -} - -#throbberBlock -{ - z-index: 10; -} - -#throbberBlock div -{ - float: left; - width: 8px; - height: 9px; - margin-left: 2px; - margin-right: 2px; - font-size: 1px; /* IE6 */ -} - +.cover { position: absolute; top: 0px; left: 14px; right: 14px; bottom: 18px; z-index: 11; } +#closeButton { margin-top: 5px; margin-right: 10px; width: 20px; background-image: url(images/sprites.png); background-repeat: no-repeat; background-position: -16px -651px; position: absolute; right: 0px; top: 0px; height: 20px; cursor: pointer; } +* html #closeButton { background-image: url(images/sprites.gif); cursor: hand; } +.rtl #closeButton { margin-right: 0px; right: auto; left: 10px; } +#closeButton:hover { background-position: -16px -687px; } +#throbberBlock { z-index: 10; } +#throbberBlock div { float: left; width: 8px; margin-left: 2px; margin-right: 2px; font-size: 1px; /* IE6 */ height: 9px; } /* Color Gradient Generator: http://www.herethere.net/~samson/php/color_gradient/?cbegin=504845&cend=DEDEDE&steps=4 */ - -.throbber_1 -{ - background-color: #504845; -} - -.throbber_2 -{ - background-color: #736D6B; -} - -.throbber_3 -{ - background-color: #979391; -} - -.throbber_4 -{ - background-color: #BAB8B7; -} - -.throbber_5 -{ - background-color: #DEDEDE; -} +.throbber_1 { background-color: #504845; } +.throbber_2 { background-color: #736D6B; } +.throbber_3 { background-color: #979391; } +.throbber_4 { background-color: #BAB8B7; } +.throbber_5 { background-color: #DEDEDE; } +img { border: 0px; } +* html .ml, * html .mr, * html .rtl .ml, * html .rtl .mr { background-image: url(images/dialog.sides.gif); }