summaryrefslogtreecommitdiff
path: root/_source/skins/v2
diff options
context:
space:
mode:
Diffstat (limited to '_source/skins/v2')
-rw-r--r--_source/skins/v2/dialog.css23
-rw-r--r--_source/skins/v2/editor.css8
-rw-r--r--_source/skins/v2/elementspath.css2
-rw-r--r--_source/skins/v2/icons.css17
-rw-r--r--_source/skins/v2/mainui.css14
-rw-r--r--_source/skins/v2/menu.css2
-rw-r--r--_source/skins/v2/panel.css2
-rw-r--r--_source/skins/v2/presets.css2
-rw-r--r--_source/skins/v2/reset.css2
-rw-r--r--_source/skins/v2/richcombo.css7
-rw-r--r--_source/skins/v2/skin.js84
-rw-r--r--_source/skins/v2/templates.css2
-rw-r--r--_source/skins/v2/toolbar.css13
13 files changed, 118 insertions, 60 deletions
diff --git a/_source/skins/v2/dialog.css b/_source/skins/v2/dialog.css
index 22d7d00..23c56ff 100644
--- a/_source/skins/v2/dialog.css
+++ b/_source/skins/v2/dialog.css
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
@@ -9,14 +9,25 @@ body .cke_dialog
visibility: visible;
}
+/* Force Gecko to consider table as positioned */
+.cke_skin_v2 table.cke_dialog.cke_browser_gecko
+{
+ display:block;
+}
+
.cke_skin_v2 .cke_dialog_body
{
margin-left: 16px;
margin-right: 16px;
margin-top: 2px;
margin-bottom: 20px;
- position: relative;
z-index: 1;
+
+ /* 'cke_dialog' element has been fixed positioned in all but IE6, while we
+ need it to be positioned to hold e.g. close button. */
+ position: relative;
+ _position: static;
+
}
.cke_skin_v2 .cke_dialog_tl,
@@ -32,6 +43,8 @@ body .cke_dialog
/* IE6 does not support full color transparent PNG. */
_background-image: url(images/sprites_ie6.png);
+ /* Dialog corner parts require a negative z-index to avoid covering dialog body. (#4954) */
+ _z-index: -1;
}
.cke_skin_v2 .cke_dialog_tl
@@ -638,6 +651,12 @@ body .cke_dialog
position: relative;
top: 3px;
}
+.cke_skin_v2 .cke_hc a.cke_btn_locked,
+.cke_skin_v2 .cke_hc a.cke_btn_unlocked,
+.cke_skin_v2 .cke_hc a.cke_btn_reset
+{
+ border-style: solid;
+}
.cke_skin_v2 a.cke_smile img
{
diff --git a/_source/skins/v2/editor.css b/_source/skins/v2/editor.css
index 8bf05b4..a32d279 100644
--- a/_source/skins/v2/editor.css
+++ b/_source/skins/v2/editor.css
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
@@ -14,7 +14,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
@import url("presets.css");
/* Restore the container visibility */
-html .cke_skin_v2,
+html .cke_skin_v2
+{
+ visibility: inherit;
+}
+
html.cke_skin_v2_container
{
visibility: visible;
diff --git a/_source/skins/v2/elementspath.css b/_source/skins/v2/elementspath.css
index 84424f6..44e2086 100644
--- a/_source/skins/v2/elementspath.css
+++ b/_source/skins/v2/elementspath.css
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
diff --git a/_source/skins/v2/icons.css b/_source/skins/v2/icons.css
index 4675974..38bd10a 100644
--- a/_source/skins/v2/icons.css
+++ b/_source/skins/v2/icons.css
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
@@ -307,3 +307,18 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
{
background-position: 0 -1040px;
}
+
+.cke_skin_v2 .cke_button_creatediv .cke_icon
+{
+ background-position: 0 -1168px;
+}
+
+.cke_skin_v2 .cke_button_editdiv .cke_icon
+{
+ background-position: 0 -1184px;
+}
+
+.cke_skin_v2 .cke_button_removediv .cke_icon
+{
+ background-position: 0 -1200px;
+}
diff --git a/_source/skins/v2/mainui.css b/_source/skins/v2/mainui.css
index 33eedea..22c3435 100644
--- a/_source/skins/v2/mainui.css
+++ b/_source/skins/v2/mainui.css
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
@@ -17,6 +17,12 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
display: block;
}
+.cke_skin_v2 span.cke_browser_webkit,
+.cke_skin_v2 span.cke_browser_gecko18
+{
+ display: block;
+}
+
.cke_skin_v2 .cke_wrapper
{
display: block;
@@ -27,7 +33,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
display: table;
}
-.cke_skin_v2 .cke_top, .cke_skin_v2 .cke_bottom
+.cke_skin_v2 .cke_top,
+.cke_skin_v2 .cke_bottom,
+ .cke_shared .cke_skin_v2
{
background-color: #efefde;
}
@@ -56,6 +64,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
.cke_skin_v2 .cke_contents
{
border: solid 1px #696969;
+ /* Prevent background content from penetrate through when switching between editing modes. (#4918) */
+ background-color: white;
}
.cke_skin_v2 .cke_focus
diff --git a/_source/skins/v2/menu.css b/_source/skins/v2/menu.css
index d7ca87c..c3af44f 100644
--- a/_source/skins/v2/menu.css
+++ b/_source/skins/v2/menu.css
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
diff --git a/_source/skins/v2/panel.css b/_source/skins/v2/panel.css
index ab34c93..6b4b6ea 100644
--- a/_source/skins/v2/panel.css
+++ b/_source/skins/v2/panel.css
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
diff --git a/_source/skins/v2/presets.css b/_source/skins/v2/presets.css
index 3eec636..68c11b0 100644
--- a/_source/skins/v2/presets.css
+++ b/_source/skins/v2/presets.css
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
diff --git a/_source/skins/v2/reset.css b/_source/skins/v2/reset.css
index e4820bb..64779fc 100644
--- a/_source/skins/v2/reset.css
+++ b/_source/skins/v2/reset.css
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
diff --git a/_source/skins/v2/richcombo.css b/_source/skins/v2/richcombo.css
index 73c5273..7112c53 100644
--- a/_source/skins/v2/richcombo.css
+++ b/_source/skins/v2/richcombo.css
@@ -62,8 +62,7 @@
float: left;
line-height: 24px;
- height: 24px;
-
+ height: 22px;
vertical-align: top;
padding-left: 4px;
padding-right: 5px;
@@ -94,7 +93,7 @@
{
border: 1px solid #8f8f73;
background-color: #fff;
- height: 14px;
+ height: 12px;
width:60px;
padding-top: 4px;
padding-bottom: 4px;
@@ -144,7 +143,7 @@
border-top: 1px solid #8f8f73;
border-bottom: 1px solid #8f8f73;
width: 14px;
- height: 22px;
+ height: 20px;
}
.cke_skin_v2 .cke_ltr .cke_rcombo .cke_openbutton
diff --git a/_source/skins/v2/skin.js b/_source/skins/v2/skin.js
index 76ea940..e506d33 100644
--- a/_source/skins/v2/skin.js
+++ b/_source/skins/v2/skin.js
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
@@ -23,51 +23,55 @@ CKEDITOR.skins.add( 'v2', (function()
};
})() );
-if ( CKEDITOR.dialog )
+(function()
{
- CKEDITOR.dialog.on( 'resize', function( evt )
- {
- var data = evt.data,
- width = data.width,
- height = data.height,
- dialog = data.dialog,
- standardsMode = !CKEDITOR.env.quirk;
+ CKEDITOR.dialog ? dialogSetup() : CKEDITOR.on( 'dialogPluginReady', dialogSetup );
- if ( data.skin != 'v2' )
- return;
+ function dialogSetup()
+ {
+ CKEDITOR.dialog.on( 'resize', function( evt )
+ {
+ var data = evt.data,
+ width = data.width,
+ height = data.height,
+ dialog = data.dialog,
+ contents = dialog.parts.contents;
+
+ if ( data.skin != 'v2' )
+ return;
- dialog.parts.contents.setStyles(
- {
- width : width + 'px',
- height : height + 'px'
- });
+ contents.setStyles(
+ {
+ width : width + 'px',
+ height : height + 'px'
+ });
- if ( !CKEDITOR.env.ie )
- return;
+ if ( !CKEDITOR.env.ie )
+ return;
- // Fix the size of the elements which have flexible lengths.
- setTimeout( function()
- {
- var content = dialog.parts.contents,
- body = content.getParent(),
- innerDialog = body.getParent();
+ // Fix the size of the elements which have flexible lengths.
+ setTimeout( function()
+ {
+ var innerDialog = dialog.parts.dialog.getChild( [ 0, 0, 0 ] ),
+ body = innerDialog.getChild( 0 );
- // tc
- var el = innerDialog.getChild( 2 );
- el.setStyle( 'width', ( body.$.offsetWidth ) + 'px' );
+ // tc
+ var el = innerDialog.getChild( 2 );
+ el.setStyle( 'width', ( body.$.offsetWidth ) + 'px' );
- // bc
- el = innerDialog.getChild( 7 );
- el.setStyle( 'width', ( body.$.offsetWidth - 28 ) + 'px' );
+ // bc
+ el = innerDialog.getChild( 7 );
+ el.setStyle( 'width', ( body.$.offsetWidth - 28 ) + 'px' );
- // ml
- el = innerDialog.getChild( 4 );
- el.setStyle( 'height', ( body.$.offsetHeight - 31 - 14 ) + 'px' );
+ // ml
+ el = innerDialog.getChild( 4 );
+ el.setStyle( 'height', ( body.$.offsetHeight - 31 - 14 ) + 'px' );
- // mr
- el = innerDialog.getChild( 5 );
- el.setStyle( 'height', ( body.$.offsetHeight - 31 - 14 ) + 'px' );
- },
- 100 );
- });
-}
+ // mr
+ el = innerDialog.getChild( 5 );
+ el.setStyle( 'height', ( body.$.offsetHeight - 31 - 14 ) + 'px' );
+ },
+ 100 );
+ });
+ }
+})();
diff --git a/_source/skins/v2/templates.css b/_source/skins/v2/templates.css
index 71194d2..4d6ad5a 100644
--- a/_source/skins/v2/templates.css
+++ b/_source/skins/v2/templates.css
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
diff --git a/_source/skins/v2/toolbar.css b/_source/skins/v2/toolbar.css
index 2aa6f09..0285043 100644
--- a/_source/skins/v2/toolbar.css
+++ b/_source/skins/v2/toolbar.css
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
@@ -96,7 +96,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
display: inline-block;
float: left;
border-left: solid 1px #999;
- margin: 0 2px;
+ margin: 4px 2px;
height: 16px;
}
@@ -133,7 +133,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
background-repeat: no-repeat;
margin: 4px 2px 0 2px;
width: 3px;
- height: 16px;
+ height: 20px;
float: left;
}
@@ -403,3 +403,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
/* revert previous */
vertical-align: baseline;
}
+
+/* Fix cursor shape consistency on toolbar combos (#4031) */
+.cke_skin_v2 .cke_browser_ie .cke_rcombo,
+.cke_skin_v2 .cke_browser_ie .cke_rcombo *
+{
+ cursor: default;
+}
generated by cgit v1.3 (git 2.53.0) at 2026-06-30 10:29:30 +0000