Robmoen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148268
Change subject: Consolidate guider css and images and remove unused
......................................................................
Consolidate guider css and images and remove unused
Change-Id: I753770f1b90ede14777c2c66e477d0264c66e826
---
M GuidedTour.php
M modules/ext.guidedTour.less
R modules/images/arrow-icon-left-dark.png
R modules/images/arrow-icon-left-dark.svg
R modules/images/arrow-icon-left.png
R modules/images/arrow-icon-left.svg
R modules/images/arrow-icon-right-dark.png
R modules/images/arrow-icon-right-dark.svg
R modules/images/arrow-icon-right.png
R modules/images/arrow-icon-right.svg
R modules/images/okay-icon.png
R modules/images/okay-icon.svg
D modules/mediawiki.libs.guiders/images/x-close-icon.jpg
D modules/mediawiki.libs.guiders/mediawiki.libs.guiders.less
14 files changed, 72 insertions(+), 145 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GuidedTour
refs/changes/68/148268/1
diff --git a/GuidedTour.php b/GuidedTour.php
index d800420..cfe0776 100644
--- a/GuidedTour.php
+++ b/GuidedTour.php
@@ -61,7 +61,6 @@
// Modules
$wgResourceModules['mediawiki.libs.guiders'] = array(
- 'styles' => 'mediawiki.libs.guiders.less',
'scripts' => array(
'mediawiki.libs.guiders.js',
),
diff --git a/modules/ext.guidedTour.less b/modules/ext.guidedTour.less
index c495e78..055f2ac 100644
--- a/modules/ext.guidedTour.less
+++ b/modules/ext.guidedTour.less
@@ -9,15 +9,23 @@
// Rules
.guider {
+ background: #FFF;
+ position: absolute;
border: 1px solid #ccc;
- font-family: "Helvetica Neue", "Helvetica", Arial, sans-serif;
- font-size: 14px;
+ width: 500px;
padding: 12px;
+ outline: none;
+ font-size: 14px;
+ font-family: "Helvetica Neue", "Helvetica", Arial, sans-serif;
.box-shadow(0 0 4px rgba(0, 0, 0, 0.2));
.border-radius(3px);
+ z-index: 100000005 !important;
}
.guider_buttons {
+ height: 36px;
+ position: relative;
+ width: 100%;
margin-top: 8px;
.mw-ui-button {
@@ -34,7 +42,11 @@
}
.guider_content {
+ position: relative;
+
h1 {
+ float: left;
+ width: 95%;
color: #000;
font-size: 1.5em;
font-weight: bold;
@@ -44,6 +56,7 @@
}
p {
+ clear: both;
font-size: 1em;
line-height: 1.3em;
color: #252525;
@@ -52,11 +65,62 @@
}
.guider_close {
+ float: right;
padding: 0;
.x_button {
+ cursor: pointer;
+ display: block;
+ height: 13px;
+ width: 13px;
+ background-repeat: no-repeat;
.background-image-svg('images/ext.guidedTour.x.svg',
'images/ext.guidedTour.x.png');
}
+}
+
+.guider_button_icon {
+ display: block;
+ height: 1.4em;
+ width: 3em;
+ background-repeat: no-repeat;
+ background-position: center center;
+ background-size: 1.4em;
+}
+
+// Next button
+body.ltr .guidedtour-next-button .guider_button_icon {
+ .background-image-svg('images/arrow-icon-right.svg',
'images/arrow-icon-right.png');
+}
+body.rtl .guidedtour-next-button .guider_button_icon {
+ .background-image-svg('images/arrow-icon-left.svg',
'images/arrow-icon-left.png');
+}
+
+// Back button
+body.ltr .guidedtour-back-button .guider_button_icon {
+ .background-image-svg('images/arrow-icon-left-dark.svg',
'images/arrow-icon-left-dark.png');
+}
+body.rtl .guidedtour-back-button .guider_button_icon {
+ .background-image-svg('images/arrow-icon-right-dark.svg',
'images/arrow-icon-right-dark.png');
+}
+
+// Okay or End button
+.guidedtour-okay-button .guider_button_icon,
+.guidedtour-end-button .guider_button_icon {
+ .background-image-svg('images/okay-icon.svg', 'images/okay-icon.png');
+}
+
+#guider_overlay {
+ background-color: #000;
+ width: 100%;
+ height: 100%;
+ position: fixed;
+ top: 0px;
+ left: 0px;
+ /* TODO (phuedx 2014-02-19): Create the .opacity mixin. */
+ opacity: 0.5;
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
+ filter: alpha(opacity=50);
+ z-index: 100000004;
}
.guider_arrow_inner_container {
@@ -79,6 +143,8 @@
}
.guider_arrow {
+ position: absolute;
+ display: none;
background: none;
overflow: hidden;
@@ -101,18 +167,22 @@
}
.guider_arrow_up {
+ display: block;
top: -@half_guider_arrow_height;
}
.guider_arrow_right {
+ display: block;
right: -@half_guider_arrow_height;
}
.guider_arrow_down {
+ display: block;
bottom: -@half_guider_arrow_height;
}
.guider_arrow_left {
+ display: block;
left: -@half_guider_arrow_height;
}
diff --git a/modules/mediawiki.libs.guiders/images/arrow-icon-left-dark.png
b/modules/images/arrow-icon-left-dark.png
similarity index 100%
rename from modules/mediawiki.libs.guiders/images/arrow-icon-left-dark.png
rename to modules/images/arrow-icon-left-dark.png
Binary files differ
diff --git a/modules/mediawiki.libs.guiders/images/arrow-icon-left-dark.svg
b/modules/images/arrow-icon-left-dark.svg
similarity index 100%
rename from modules/mediawiki.libs.guiders/images/arrow-icon-left-dark.svg
rename to modules/images/arrow-icon-left-dark.svg
diff --git a/modules/mediawiki.libs.guiders/images/arrow-icon-left.png
b/modules/images/arrow-icon-left.png
similarity index 100%
rename from modules/mediawiki.libs.guiders/images/arrow-icon-left.png
rename to modules/images/arrow-icon-left.png
Binary files differ
diff --git a/modules/mediawiki.libs.guiders/images/arrow-icon-left.svg
b/modules/images/arrow-icon-left.svg
similarity index 100%
rename from modules/mediawiki.libs.guiders/images/arrow-icon-left.svg
rename to modules/images/arrow-icon-left.svg
diff --git a/modules/mediawiki.libs.guiders/images/arrow-icon-right-dark.png
b/modules/images/arrow-icon-right-dark.png
similarity index 100%
rename from modules/mediawiki.libs.guiders/images/arrow-icon-right-dark.png
rename to modules/images/arrow-icon-right-dark.png
Binary files differ
diff --git a/modules/mediawiki.libs.guiders/images/arrow-icon-right-dark.svg
b/modules/images/arrow-icon-right-dark.svg
similarity index 100%
rename from modules/mediawiki.libs.guiders/images/arrow-icon-right-dark.svg
rename to modules/images/arrow-icon-right-dark.svg
diff --git a/modules/mediawiki.libs.guiders/images/arrow-icon-right.png
b/modules/images/arrow-icon-right.png
similarity index 100%
rename from modules/mediawiki.libs.guiders/images/arrow-icon-right.png
rename to modules/images/arrow-icon-right.png
Binary files differ
diff --git a/modules/mediawiki.libs.guiders/images/arrow-icon-right.svg
b/modules/images/arrow-icon-right.svg
similarity index 100%
rename from modules/mediawiki.libs.guiders/images/arrow-icon-right.svg
rename to modules/images/arrow-icon-right.svg
diff --git a/modules/mediawiki.libs.guiders/images/okay-icon.png
b/modules/images/okay-icon.png
similarity index 100%
rename from modules/mediawiki.libs.guiders/images/okay-icon.png
rename to modules/images/okay-icon.png
Binary files differ
diff --git a/modules/mediawiki.libs.guiders/images/okay-icon.svg
b/modules/images/okay-icon.svg
similarity index 100%
rename from modules/mediawiki.libs.guiders/images/okay-icon.svg
rename to modules/images/okay-icon.svg
diff --git a/modules/mediawiki.libs.guiders/images/x-close-icon.jpg
b/modules/mediawiki.libs.guiders/images/x-close-icon.jpg
deleted file mode 100644
index 23fed71..0000000
--- a/modules/mediawiki.libs.guiders/images/x-close-icon.jpg
+++ /dev/null
Binary files differ
diff --git a/modules/mediawiki.libs.guiders/mediawiki.libs.guiders.less
b/modules/mediawiki.libs.guiders/mediawiki.libs.guiders.less
deleted file mode 100755
index bafd0a3..0000000
--- a/modules/mediawiki.libs.guiders/mediawiki.libs.guiders.less
+++ /dev/null
@@ -1,142 +0,0 @@
-@import '../ext.guidedTour.mixins';
-@import 'mediawiki.mixins';
-
-.guider {
- background: #FFF;
- border: 1px solid #666;
- font-family: arial;
- position: absolute;
- outline: none;
- padding: 4px 12px;
- width: 500px;
- z-index: 100000005 !important;
- .box-shadow(0 0px 8px #111);
- .border-radius(4px);
-}
-
-.guider_buttons {
- height: 36px;
- position: relative;
- width: 100%;
-}
-
-.guider_content {
- position: relative;
-
- h1 {
- color: #1054AA;
- float: left;
- font-size: 21px;
- width: 95%;
- }
-
- p {
- clear: both;
- color: #333;
- font-size: 13px;
- }
-}
-
-.guider_close {
- float: right;
- padding: 10px 0 0;
-}
-
-.x_button {
- cursor: pointer;
- display: block;
- height: 13px;
- width: 13px;
- background-repeat: no-repeat;
- .background-image('images/x-close-icon.jpg');
-}
-
-.guider_button_icon {
- display: block;
- height: 1.4em;
- width: 3em;
- background-repeat: no-repeat;
- background-position: center center;
- background-size: 1.4em;
-}
-
-// Next button
-body.ltr .guidedtour-next-button .guider_button_icon {
- .background-image-svg('images/arrow-icon-right.svg',
'images/arrow-icon-right.png');
-}
-body.rtl .guidedtour-next-button .guider_button_icon {
- .background-image-svg('images/arrow-icon-left.svg',
'images/arrow-icon-left.png');
-}
-
-// Back button
-body.ltr .guidedtour-back-button .guider_button_icon {
- .background-image-svg('images/arrow-icon-left-dark.svg',
'images/arrow-icon-left-dark.png');
-}
-body.rtl .guidedtour-back-button .guider_button_icon {
- .background-image-svg('images/arrow-icon-right-dark.svg',
'images/arrow-icon-right-dark.png');
-}
-
-// Okay or End button
-.guidedtour-okay-button .guider_button_icon,
-.guidedtour-end-button .guider_button_icon {
- .background-image-svg('images/okay-icon.svg', 'images/okay-icon.png');
-}
-
-#guider_overlay {
- background-color: #000;
- width: 100%;
- height: 100%;
- position: fixed;
- top: 0px;
- left: 0px;
- /* TODO (phuedx 2014-02-19): Create the .opacity mixin. */
- opacity: 0.5;
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
- filter: alpha(opacity=50);
- z-index: 100000004;
-}
-
-.guider_arrow {
- width: 42px;
- height: 42px;
- position: absolute;
- display: none;
- background-repeat: no-repeat;
- z-index: 100000006 !important;
- .background-image('images/guider_arrows.png');
-}
-
-/*
- Since Guiders uses dynamic absolute positioning, the below flipping needs
to be handled at a higher level.
-*/
-
-.guider_arrow_right {
- display: block;
- background-position: 0px 0px;
- /* @noflip */
- right: -42px;
-}
-
-.guider_arrow_down {
- display: block;
- background-position: 0px -42px;
- bottom: -42px;
-}
-
-.guider_arrow_up {
- display: block;
- background-position: 0px -126px;
- top: -42px;
-}
-
-.guider_arrow_left {
- display: block;
- background-position: 0px -84px;
- /* @noflip */
- left: -42px;
-}
-
-.guider_highlight {
- position: relative;
- z-index: 101;
-}
--
To view, visit https://gerrit.wikimedia.org/r/148268
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I753770f1b90ede14777c2c66e477d0264c66e826
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GuidedTour
Gerrit-Branch: master
Gerrit-Owner: Robmoen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
