Skip to content

Commit c824c5d

Browse files
committed
Merge branch 't/9721e'
2 parents 8341c16 + 331ccc2 commit c824c5d

File tree

4 files changed

+23
-1
lines changed

4 files changed

+23
-1
lines changed

skins/kama/editor_ie7.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,3 +193,10 @@ a.cke_button
193193
/* Positioning is required for IE7 on text inputs not to stretch dialog horizontally. (#8971)*/
194194
position: relative;
195195
}
196+
197+
/* Reset vertical paddings which put editing area under bottom UI space. (#9721) */
198+
.cke_wysiwyg_div
199+
{
200+
padding-top: 0 !important;
201+
padding-bottom: 0 !important;
202+
}

skins/kama/mainui.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Special outer level classes used in this file:
5656
-webkit-border-radius: 5px;
5757
border-radius: 5px;
5858
border: 1px solid #D3D3D3;
59-
59+
6060
/* Spacing between the outer and the inner boundaries. */
6161
padding: 5px;
6262
}
@@ -192,4 +192,8 @@ Special outer level classes used in this file:
192192
overflow: auto;
193193
padding: 0 8px;
194194
outline-style: none;
195+
196+
-moz-box-sizing: border-box;
197+
-webkit-box-sizing: border-box;
198+
box-sizing: border-box;
195199
}

skins/moono/editor_ie7.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,3 +204,10 @@ a.cke_button
204204
/* Positioning is required for IE7 on text inputs not to stretch dialog horizontally. (#8971)*/
205205
position: relative;
206206
}
207+
208+
/* Reset vertical paddings which put editing area under bottom UI space. (#9721) */
209+
.cke_wysiwyg_div
210+
{
211+
padding-top: 0 !important;
212+
padding-bottom: 0 !important;
213+
}

skins/moono/mainui.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,4 +218,8 @@ Special outer level classes used in this file:
218218
overflow: auto;
219219
padding: 0 8px;
220220
outline-style: none;
221+
222+
-moz-box-sizing: border-box;
223+
-webkit-box-sizing: border-box;
224+
box-sizing: border-box;
221225
}

0 commit comments

Comments
 (0)