Skip to content

Commit

Permalink
Various fixes for broken dialogs in IE8 and 7.
Browse files Browse the repository at this point in the history
* Fixed broken inputs due to no box-sizing support in IE7 (kama-like fallback).
* Fixed cke_disabled field styles in IE7 and 8.
* Merged redundant dialog CSS for inputs and textareas.
  • Loading branch information
oleq committed Nov 12, 2012
1 parent b426d8d commit 814afbf
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 40 deletions.
39 changes: 10 additions & 29 deletions skins/moono/dialog.css
Original file line number Diff line number Diff line change
Expand Up @@ -364,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 @@ -467,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 @@ -582,7 +558,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 @@ -612,6 +588,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 @@ -633,13 +614,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
18 changes: 7 additions & 11 deletions skins/moono/dialog_ie7.css
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,14 @@ This file contains styles to used by Internet Explorer 7 only.
vertical-align: top;
}

/* 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 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: absolute;
}

div.cke_dialog_ui_input_text,
div.cke_dialog_ui_input_password
{
position: relative;
height: 25px;
padding: 0 !important;
}

/* Predefined border to avoid visual size change impact. */
Expand Down

0 comments on commit 814afbf

Please sign in to comment.