Merge "Toolbar style fixes"

This commit is contained in:
jenkins-bot 2013-03-15 20:34:21 +00:00 committed by Gerrit Code Review
commit baa612a664
2 changed files with 14 additions and 43 deletions

View file

@ -165,35 +165,3 @@ body {
.ve-ui-toolbar-wrapper {
margin: 0 2em;
}
.ve-ui-toolbar-wrapper.float .ve-ui-toolbar {
top: 0;
position: fixed;
border-radius: 0;
z-index: 100;
border-top: none;
}
.ve-ui-toolbar-shadow {
/* @embed */
background-image: url(../../modules/ve/ui/styles/images/toolbar-shadow.png);
background-position: left top;
background-repeat: repeat-x;
position: absolute;
bottom: -9px;
height: 9px;
width: 100%;
pointer-events: none;
-ms-transition: opacity 500ms ease-in-out;
-webkit-transition: opacity 500ms ease-in-out;
-moz-transition: opacity 500ms ease-in-out;
-o-transition: opacity 500ms ease-in-out;
transition: opacity 500ms ease-in-out;
filter: alpha(opacity=12);
opacity: 0.125;
}
.ve-ui-toolbar-wrapper.float .ve-ui-toolbar-shadow {
filter: alpha(opacity=50);
opacity: 0.5;
}

View file

@ -14,7 +14,15 @@
height: 0;
}
.ve-ui-toolbar-wrapper.ve-ui-toolbar-wrapper-floating .ve-ui-toolbar {
.ve-ui-surface-overlay {
position: absolute;
top: 0;
left: 0;
}
/* ve.Surface toolbar implementation */
.ve-ui-toolbar-wrapper-floating .ve-ui-toolbar {
top: 0;
position: fixed;
border-radius: 0;
@ -22,11 +30,11 @@
border-top: none;
}
.ve-ui-toolbar-wrapper.ve-ui-toolbar-wrapper-bottom {
.ve-ui-toolbar-wrapper-bottom {
position: static;
}
.ve-ui-toolbar-wrapper.ve-ui-toolbar-wrapper-bottom .ve-ui-toolbar {
.ve-ui-toolbar-wrapper-bottom .ve-ui-toolbar {
position: absolute;
border-radius: 0;
z-index: 100;
@ -36,7 +44,7 @@
.ve-ui-toolbar-shadow {
/* @embed */
background-image: url(images/toolbar-shadow.png);
background-position: top left;
background-position: left top;
background-repeat: repeat-x;
position: absolute;
bottom: -9px;
@ -45,19 +53,14 @@
pointer-events: none;
-webkit-transition: opacity 500ms ease-in-out;
-moz-transition: opacity 500ms ease-in-out;
-ms-transition: opacity 500ms ease-in-out;
-o-transition: opacity 500ms ease-in-out;
transition: opacity 500ms ease-in-out;
filter: alpha(opacity=12);
opacity: 0.125;
}
.ve-ui-toolbar.ve-ui-toolbar-wrapper-floating .ve-ui-toolbar-shadow {
.ve-ui-toolbar-wrapper-floating .ve-ui-toolbar-shadow {
filter: alpha(opacity=50);
opacity: 0.5;
}
.ve-ui-surface-overlay {
position: absolute;
top: 0;
left: 0;
}