Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/61167
Change subject: Reuse mediawiki.ui button styles:
......................................................................
Reuse mediawiki.ui button styles:
* Bump guiders module for related bug fix.
Change-Id: I69ec13453b1c08415d6063253b868d11cc499936
---
M GuidedTour.php
M modules/ext.guidedTour.css
M modules/ext.guidedTour.lib.js
M modules/externals/mediawiki.libs.guiders/mediawiki.libs.guiders.submodule
4 files changed, 14 insertions(+), 47 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GuidedTour
refs/changes/67/61167/1
diff --git a/GuidedTour.php b/GuidedTour.php
index e0b138b..9d8af9f 100644
--- a/GuidedTour.php
+++ b/GuidedTour.php
@@ -71,7 +71,10 @@
'styles' => 'ext.guidedTour.css',
'localBasePath' => $dir . 'modules',
'remoteExtPath' => 'GuidedTour/modules',
- 'dependencies' => 'mediawiki.libs.guiders',
+ 'dependencies' => array(
+ 'mediawiki.libs.guiders',
+ 'mediawiki.ui',
+ ),
);
// Depends on ext.guidedTour.styles
diff --git a/modules/ext.guidedTour.css b/modules/ext.guidedTour.css
index df82786..9bd8148 100644
--- a/modules/ext.guidedTour.css
+++ b/modules/ext.guidedTour.css
@@ -18,6 +18,13 @@
margin-top: 8px;
}
+.guider_buttons .mw-ui-button {
+ float: right;
+
+ /* TODO (mattflaschen, 2013-04-27): We might want to do this in
mediawiki.ui proper */
+ text-decoration: none;
+}
+
.guider_content h1 {
color: #252525;
font-size: 1.5em;
@@ -33,51 +40,6 @@
.guider_content p {
font-size: 1em;
line-height: 1.3em;
-}
-
-/* a adds specificity so it overrides link psuedo-classes */
-a.guider_button {
- padding: 0.4em 0.8em 0.5em 0.8em;
- font-size: 0.9em;
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- text-decoration: none;
- color: #fff;
-
- background-color: #3366bb;
- background-image: -moz-linear-gradient(top, #3670c8, #3366bb);
- background-image: -ms-linear-gradient(top, #3670c8, #3366bb);
- background-image: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #3670c8), color-stop(100%, #3366bb));
- background-image: -webkit-linear-gradient(top, #3670c8, #3366bb);
- background-image: linear-gradient(#3670c8, #3366bb);
-
- border: 1px #33589f solid;
-
- filter:
progid:dximagetransform.microsoft.gradient(startColorstr='#3670c8',
endColorstr='#3366bb', GradientType=0);
-
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
-}
-
-.guider_button:hover {
- text-decoration: none;
- background-color: #3f77d7;
- background-image: -moz-linear-gradient(top, #4c84da, #3f77d7);
- background-image: -ms-linear-gradient(top, #4c84da, #3f77d7);
- background-image: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #4c84da), color-stop(100%, #3f77d7));
- background-image: -webkit-linear-gradient(top, #4c84da, #3f77d7);
- background-image: linear-gradient(#4c84da, #3f77d7);
- filter:
progid:dximagetransform.microsoft.gradient(startColorstr='#4c84da',
endColorstr='#3f77d7', GradientType=0);
-}
-
-.guider_button:active {
- background-color: #2a549c;
- background-image: -moz-linear-gradient(top, #2d5ea9, #2a549c);
- background-image: -ms-linear-gradient(top, #2d5ea9, #2a549c);
- background-image: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #2d5ea9), color-stop(100%, #2a549c));
- background-image: -webkit-linear-gradient(top, #2d5ea9, #2a549c);
- background-image: linear-gradient(#2d5ea9, #2a549c);
- filter:
progid:dximagetransform.microsoft.gradient(startColorstr='#2d5ea9',
endColorstr='#2a549c', GradientType=0);
}
.guider_arrow {
diff --git a/modules/ext.guidedTour.lib.js b/modules/ext.guidedTour.lib.js
index 25da1bc..f4a8b81 100644
--- a/modules/ext.guidedTour.lib.js
+++ b/modules/ext.guidedTour.lib.js
@@ -304,7 +304,7 @@
okayFunction( this );
},
html: {
- 'class': 'guider_button guidedtour-okay-button'
+ 'class': guiders._buttonClass + '
guidedtour-okay-button'
}
};
}
@@ -611,6 +611,8 @@
setupGuiderListeners();
} );
+ guiders._buttonClass = 'mw-ui-button mw-ui-primary';
+
// cookie the users when they are in the tour
guiders.cookie = mw.config.get( 'wgCookiePrefix' ) + '-mw-tour';
guiders.cookieParams = { path: '/' };
diff --git
a/modules/externals/mediawiki.libs.guiders/mediawiki.libs.guiders.submodule
b/modules/externals/mediawiki.libs.guiders/mediawiki.libs.guiders.submodule
index ef7aa07..0626e01 160000
--- a/modules/externals/mediawiki.libs.guiders/mediawiki.libs.guiders.submodule
+++ b/modules/externals/mediawiki.libs.guiders/mediawiki.libs.guiders.submodule
-Subproject commit ef7aa07dddce3d76436e427119c3a19966bd12b4
+Subproject commit 0626e018297c040a0742042a925828de54786ae3
--
To view, visit https://gerrit.wikimedia.org/r/61167
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I69ec13453b1c08415d6063253b868d11cc499936
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GuidedTour
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
