Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 't/9528'
  • Loading branch information
Reinmar committed Dec 7, 2012
2 parents 5b02ebf + c738e6c commit 2112bc4
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
12 changes: 12 additions & 0 deletions skins/kama/reset.css
Expand Up @@ -35,6 +35,9 @@ http://docs.cksource.com/CKEditor_4.x/Skin_SDK/Reset
width: auto;
height: auto;
vertical-align: baseline;
box-sizing: content-box;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;
}

/* Reset for elements and their children. */
Expand All @@ -49,6 +52,9 @@ http://docs.cksource.com/CKEditor_4.x/Skin_SDK/Reset
width: auto;
height: auto;
vertical-align: baseline;
box-sizing: content-box;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;

/* These are rule inherited by all children elements. */
border-collapse: collapse;
Expand Down Expand Up @@ -95,3 +101,9 @@ http://docs.cksource.com/CKEditor_4.x/Skin_SDK/Reset
padding: 10px;
border: 2px groove #E0DFE3;
}

.cke_reset_all select {
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
}
12 changes: 12 additions & 0 deletions skins/moono/reset.css
Expand Up @@ -35,6 +35,9 @@ http://docs.cksource.com/CKEditor_4.x/Skin_SDK/Reset
width: auto;
height: auto;
vertical-align: baseline;
box-sizing: content-box;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;
}

/* Reset for elements and their children. */
Expand All @@ -49,6 +52,9 @@ http://docs.cksource.com/CKEditor_4.x/Skin_SDK/Reset
width: auto;
height: auto;
vertical-align: baseline;
box-sizing: content-box;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;

/* These are rule inherited by all children elements. */
border-collapse: collapse;
Expand Down Expand Up @@ -95,3 +101,9 @@ http://docs.cksource.com/CKEditor_4.x/Skin_SDK/Reset
padding: 10px;
border: 2px groove #E0DFE3;
}

.cke_reset_all select {
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
}

0 comments on commit 2112bc4

Please sign in to comment.