Skip to content

Commit

Permalink
Revert "Merge branch 't/9619'"
Browse files Browse the repository at this point in the history
This reverts commit a121785, reversing
changes made to 32fda4e.
  • Loading branch information
oleq committed Nov 14, 2012
1 parent a121785 commit d9c56a0
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 43 deletions.
5 changes: 5 additions & 0 deletions skins/moono/editor_gecko.css
Expand Up @@ -13,6 +13,11 @@ This file contains styles to used by all Gecko based browsers (Firefox) only.
/* Base it on editor.css, overriding it with styles defined in this file. */
@import url("editor.css");

.cke_bottom
{
padding-bottom: 3px;
}

.cke_combo_text
{
margin-bottom: -1px;
Expand Down
20 changes: 3 additions & 17 deletions skins/moono/editor_ie7.css
Expand Up @@ -13,14 +13,6 @@ This file contains styles to used by Internet Explorer 7 only.
/* Base it on editor_ie.css, overriding it with styles defined in this file. */
@import url("editor_ie.css");

/* Without the following code IE7 will display these containers large
even when no content is inside (for example: no elementspath, no resizer). */
.cke_top,
.cke_bottom
{
font-size: 0px;
}

.cke_rtl .cke_toolgroup,
.cke_rtl .cke_toolbar_separator,
.cke_rtl .cke_button,
Expand Down Expand Up @@ -97,20 +89,14 @@ a.cke_button
background-color: #c0c0c0;
}

.cke_toolbox_collapser {
margin-top: 15px;
}

.cke_toolbox_collapser.cke_toolbox_collapser_min {
margin-top: 3px;
}

.cke_toolbox_collapser .cke_arrow
{
margin-top: 0;
}
.cke_toolbox_collapser .cke_arrow
{
border-width:4px;
}

.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow
{
border-width:3px;
Expand Down
4 changes: 2 additions & 2 deletions skins/moono/elementspath.css
Expand Up @@ -33,8 +33,8 @@ The following is a visual representation of its main elements:
{
display: inline-block;
float: left;
padding: 4px;
margin: 4px 0 4px 2px;
padding: 3px 4px;
margin-right: 2px;
cursor: default;
text-decoration: none;
outline: 0;
Expand Down
25 changes: 8 additions & 17 deletions skins/moono/mainui.css
Expand Up @@ -68,14 +68,14 @@ Special outer level classes used in this file:

background: #fff;
padding: 0;
overflow: hidden;
}

/* Added to the outer boundary of the UI when in inline editing,
when the UI is floating. */
.cke_float
{
border-width: 1px 0 0;
/* Make white the space between the outer and the inner borders. */
border: none;
}

.cke_float .cke_inner
Expand All @@ -101,10 +101,7 @@ Special outer level classes used in this file:
{
/*border: 1px solid #b2b2b2;*/
border-bottom: 1px solid #b6b6b6;
padding: 0 5px;

/* The following negative margin hides the bottom border when .cke_top is empty. */
margin-top: -1px;
padding: 6px 8px 2px;

-moz-box-shadow: 0 1px 0 #fff inset;
-webkit-box-shadow: 0 1px 0 #fff inset;
Expand All @@ -128,14 +125,11 @@ Special outer level classes used in this file:

.cke_bottom
{
padding: 0 5px;
padding: 4px 8px;
position: relative;

border-top: 1px solid #bfbfbf;

/* The following negative margin hides the bottom border when .cke_bottom is empty. */
margin-bottom: -1px;

-moz-box-shadow: 0 1px 0 #fff inset;
-webkit-box-shadow: 0 1px 0 #fff inset;
box-shadow: 0 1px 0 #fff inset;
Expand All @@ -150,6 +144,7 @@ Special outer level classes used in this file:
filter: progid:DXImageTransform.Microsoft.gradient(gradientType=0, startColorstr='#ffebebeb', endColorstr='#cfd1cf');
}


/* The resizer is the small UI element that is rendered at the bottom right
part of the editor. It makes is possible to resize the editor UI. */
.cke_resizer
Expand All @@ -169,10 +164,7 @@ Special outer level classes used in this file:
font-size: 0;
vertical-align: bottom;

margin-top: 14px;
/* The following margin is to keep the bottom separation
when elementspath is missing and resizer is the only element in container. */
margin-bottom: 5px;
margin-top: 8px;

-moz-box-shadow: 0 1px 0 rgba(255,255,255,.3);
-webkit-box-shadow: 0 1px 0 rgba(255,255,255,.3);
Expand All @@ -185,15 +177,14 @@ Special outer level classes used in this file:
width: auto;
height: auto;
border-width: 0;
margin-top: 6px;
margin-bottom: 0px;
}

.cke_resizer_ltr
{
cursor: se-resize;

float: right;
margin-left: 1px;
margin-right: -4px;
}

/* This class is added in RTL mode. This is a special case for the resizer
Expand Down
8 changes: 1 addition & 7 deletions skins/moono/toolbar.css
Expand Up @@ -337,19 +337,13 @@ a.cke_button_off:active
clear: right;
}

.cke_toolbox
{
margin-top: 6px;
display: block;
}

/* The button, which when clicked hides (collapses) all the toolbars. */
.cke_toolbox_collapser
{
width: 12px;
height: 11px;
float: right;
margin: 14px 0 0;
margin: 11px 0 0;
font-size: 0;
cursor: default;
text-align: center;
Expand Down

0 comments on commit d9c56a0

Please sign in to comment.