Trevor Parscal has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54023
Change subject: Toolbar style fixes
......................................................................
Toolbar style fixes
demo.css
* Removed toolbar floating styles, which were out of sync and essentially a
duplication of those in ve.Surface.css
ve.Surface.css
* Reorganized rules
* Fixed some CSS syntax issues
Change-Id: I94eb83fa74312266817f8932f54fc9b89332c524
---
M demos/ve/demo.css
M modules/ve/styles/ve.Surface.css
2 files changed, 14 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/23/54023/1
diff --git a/demos/ve/demo.css b/demos/ve/demo.css
index e494ae9..fe68381 100644
--- a/demos/ve/demo.css
+++ b/demos/ve/demo.css
@@ -165,35 +165,3 @@
.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;
-}
diff --git a/modules/ve/styles/ve.Surface.css b/modules/ve/styles/ve.Surface.css
index 32e4c03..e6d19b5 100644
--- a/modules/ve/styles/ve.Surface.css
+++ b/modules/ve/styles/ve.Surface.css
@@ -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;
}
--
To view, visit https://gerrit.wikimedia.org/r/54023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94eb83fa74312266817f8932f54fc9b89332c524
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
