Skip to content

Commit

Permalink
Merge branch 't/9491'
Browse files Browse the repository at this point in the history
  • Loading branch information
@oleq
oleq committed Nov 12, 2012
2 parents 079568f + 02840bf commit 2cc4077
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 49 deletions.
2 changes: 1 addition & 1 deletion plugins/about/dialogs/about.js
View file
Expand Up @@ -43,7 +43,7 @@ CKEDITOR.dialog.add( 'about', function( editor ) {
'.cke_about_container a' +
'{' +
'cursor:pointer !important;' +
'color:blue !important;' +
'color:#00B2CE !important;' +
'text-decoration:underline !important;' +
'}' +
'</style>' +
Expand Down
81 changes: 45 additions & 36 deletions skins/moono/dialog.css
View file
Expand Up @@ -62,6 +62,10 @@ Comments in this file will give more details about each of the above blocks.
-moz-box-shadow: 0 0 3px rgba(0, 0, 0, .15);
-webkit-box-shadow: 0 0 3px rgba(0, 0, 0, .15);
box-shadow: 0 0 3px rgba(0, 0, 0, .15);

/* This one is required by Firefox 3.6. Without it,
dialog tabs and resizer float outside of the dialog. */
position: relative;
}

/* Due to our reset we have to recover the styles of some elements. */
Expand Down Expand Up @@ -133,7 +137,7 @@ Comments in this file will give more details about each of the above blocks.
position: relative;

border: none;
border-top: 1px solid #bfbfbf;
outline: 1px solid #bfbfbf;

-moz-box-shadow: 0 1px 0 #fff inset;
-webkit-box-shadow: 0 1px 0 #fff inset;
Expand Down Expand Up @@ -244,6 +248,19 @@ a.cke_dialog_tab
margin-left: 3px;
}

/* A hover state of a regular inactive tab. */
a.cke_dialog_tab:hover
{
background: #ebebeb;
background: -moz-linear-gradient(top, #ebebeb 0%, #dfdfdf 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ebebeb), color-stop(100%,#dfdfdf));
background: -webkit-linear-gradient(top, #ebebeb 0%,#dfdfdf 100%);
background: -o-linear-gradient(top, #ebebeb 0%,#dfdfdf 100%);
background: -ms-linear-gradient(top, #ebebeb 0%,#dfdfdf 100%);
background: linear-gradient(to bottom, #ebebeb 0%,#dfdfdf 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ebebeb', endColorstr='#dfdfdf',GradientType=0 );
}

a.cke_dialog_tab_selected
{
background: #fff;
Expand All @@ -253,6 +270,19 @@ a.cke_dialog_tab_selected
filter: none;
}

/* A hover state for selected tab. */
a.cke_dialog_tab_selected:hover
{
background: #ededed;
background: -moz-linear-gradient(top, #ededed 0%, #ffffff 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ededed), color-stop(100%,#ffffff));
background: -webkit-linear-gradient(top, #ededed 0%,#ffffff 100%);
background: -o-linear-gradient(top, #ededed 0%,#ffffff 100%);
background: -ms-linear-gradient(top, #ededed 0%,#ffffff 100%);
background: linear-gradient(to bottom, #ededed 0%,#ffffff 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ededed', endColorstr='#ffffff',GradientType=0 );
}

.cke_hc a.cke_dialog_tab:hover,
.cke_hc a.cke_dialog_tab_selected
{
Expand Down Expand Up @@ -334,7 +364,7 @@ the same labelling structure, having the label text inside an element with

/* If an element is supposed to be disabled, the .cke_disabled class is
appended to it. */
div.cke_disabled .cke_dialog_ui_labeled_content *
div.cke_disabled .cke_dialog_ui_labeled_content div *
{
background-color: #ddd;
cursor: default;
Expand Down Expand Up @@ -437,30 +467,6 @@ The basic text field to input text.
+-------------------------------------------------+
*/

input.cke_dialog_ui_input_text,
input.cke_dialog_ui_input_password
{
background-color: #fff;
border: 1px solid #c9cccf;
border-top-color: #aeb3b9;
padding: 4px 6px;
width: 100%;
*width: 95%;

-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;


-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;

-moz-box-shadow: 0 1px 2px rgba(0,0,0,.15) inset;
-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.15) inset;
box-shadow: 0 1px 2px rgba(0,0,0,.15) inset;
}

/*
Textarea
----------
Expand Down Expand Up @@ -522,14 +528,12 @@ textarea.cke_dialog_ui_input_textarea:hover

input.cke_dialog_ui_input_text:focus,
input.cke_dialog_ui_input_password:focus,
textarea.cke_dialog_ui_input_textarea:focus
textarea.cke_dialog_ui_input_textarea:focus,
select.cke_dialog_ui_input_select:focus
{
outline: none;
border: 1px solid #139ff7;
border-top-color: #1392e9;

-moz-box-shadow: 0 1px 0 rgba(0,0,0,.05) inset, 0 0 5px #009cff;
-webkit-box-shadow: 0 1px 0 rgba(0,0,0,.05) inset, 0 0 5px #009cff;
box-shadow: 0 1px 0 rgba(0,0,0,.05) inset, 0 0 5px #009cff;
}

/*
Expand All @@ -552,7 +556,7 @@ a.cke_dialog_ui_button
*display: inline;
*zoom: 1;

padding: 3px 12px;
padding: 3px 0;
margin: 0;

text-align: center;
Expand Down Expand Up @@ -582,6 +586,11 @@ a.cke_dialog_ui_button

}

span.cke_dialog_ui_button
{
padding: 0 12px;
}

a.cke_dialog_ui_button:hover
{
border-color: #9e9e9e;
Expand All @@ -603,13 +612,13 @@ a.cke_dialog_ui_button:hover
border: 3px solid;
padding: 1px 10px;
}

/*
a.cke_dialog_ui_button[style*="width"]
{
display: block;
display: block !important;
width: auto !important;
}

*/
/* The inner part of the button. */
a.cke_dialog_ui_button_ok span,
a.cke_dialog_ui_button_cancel span
Expand Down Expand Up @@ -682,7 +691,7 @@ select.cke_dialog_ui_input_select
background-color: #fff;
border: 1px solid #c9cccf;
border-top-color: #aeb3b9;
padding: 4px 6px;
padding: 2px 6px;

outline: none;

Expand Down
29 changes: 21 additions & 8 deletions skins/moono/dialog_ie7.css
View file
Expand Up @@ -13,6 +13,14 @@ This file contains styles to used by Internet Explorer 7 only.
/* Base it on dialog_ie.css, overriding it with styles defined in this file. */
@import url("dialog_ie.css");

.cke_dialog_body
{
/* By default, a relative position is used.
However it breaks IE7 and causes input flickering
when hovering dialog footer. Reset to static to fix it. */
position: static;
}

.cke_dialog_title
{
/* gradient fix */
Expand All @@ -22,6 +30,9 @@ This file contains styles to used by Internet Explorer 7 only.
.cke_dialog_footer
{
padding-top: 5px;

/* IE7 ignores footer's outline. Use border instead. */
border-top: 1px solid #bfbfbf;
}

/* IE7 needs position static #6806 */
Expand All @@ -30,18 +41,20 @@ This file contains styles to used by Internet Explorer 7 only.
position: static;
}

/* IE7 needs positioning on text fields, to not stretch dialog horizontally. (#8971) */
input.cke_dialog_ui_input_text,
input.cke_dialog_ui_input_password
/* IE7 crops the bottom pixels of footer buttons (#9491) */
.cke_dialog_footer_buttons a.cke_dialog_ui_button
{
position: absolute;
vertical-align: top;
}

div.cke_dialog_ui_input_text,
div.cke_dialog_ui_input_password
/* IE7 doesn't support box-sizing and therefore we cannot
have sexy inputs which go well with the layout. */
.cke_dialog_ui_input_text,
.cke_dialog_ui_input_password,
.cke_dialog_ui_input_textarea,
.cke_dialog_ui_input_select
{
position: relative;
height: 25px;
padding: 0 !important;
}

/* Predefined border to avoid visual size change impact. */
Expand Down
14 changes: 10 additions & 4 deletions skins/moono/skin.js
View file
Expand Up @@ -144,18 +144,22 @@ CKEDITOR.skin.chameleon = (function() {
'] ' +
'{id} .cke_dialog_footer [' +
'{defaultGradient}' +
'border-top-color:{defaultBorder};' +
'outline-color:{defaultBorder};' +
'border-top-color:{defaultBorder};' + // IE7 doesn't use outline.
'] ' +
'{id} .cke_dialog_tab [' +
'{lightGradient}' +
'border-color:{defaultBorder};' +
'] ' +
'{id} .cke_dialog_tab:hover [' +
'{mediumGradient}' +
'] ' +
'{id} .cke_dialog_contents [' +
'border-top-color:{defaultBorder};' +
'] ' +
'{id} .cke_dialog_tab_selected [' +
'{id} .cke_dialog_tab_selected, {id} .cke_dialog_tab_selected:hover [' +
'background:{dialogTabSelected};' +
'border-bottom-color:{dialogTabSelected};' +
'border-bottom-color:{dialogTabSelectedBorder};' +
'] ' +
'{id} .cke_dialog_body [' +
'background:{dialogBody};' +
Expand Down Expand Up @@ -253,7 +257,9 @@ CKEDITOR.skin.chameleon = (function() {
ckeToolbarSeparator: colorBrightness( uiColor, 0.5 ),
ckeColorauto: colorBrightness( uiColor, 0.8 ),
dialogBody: colorBrightness( uiColor, 0.7 ),
dialogTabSelected: '#fff',
// Use gradient instead of simple hex to avoid further filter resetting in IE.
dialogTabSelected: verticalGradient( '#FFFFFF', '#FFFFFF' ),
dialogTabSelectedBorder: '#FFF',
elementsPathColor: colorBrightness( uiColor, -0.6 ),
elementsPathBg: uiColor,
menubuttonIcon: colorBrightness( uiColor, 0.5 ),
Expand Down

0 comments on commit 2cc4077

Please sign in to comment.