Phuedx has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113875
Change subject: Convert CSS to LESS
......................................................................
Convert CSS to LESS
* Rename all .css files to .less
* Start using some LESS language features to tidy up
ext.guidedTour.less and mediawiki.libs.guiders.less
* Move common box-shadow and border-radius properties into the shared
ext.guidedTour.mixins.less stylesheet
Change-Id: Ibe1514eef7ac1bbdddcad48cca9255960b383517
---
M GuidedTour.php
R modules/ext.guidedTour.less
A modules/ext.guidedTour.mixins.less
R modules/mediawiki.libs.guiders/mediawiki.libs.guiders.less
4 files changed, 50 insertions(+), 48 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GuidedTour
refs/changes/75/113875/1
diff --git a/GuidedTour.php b/GuidedTour.php
index 80450fa..8d6ef53 100644
--- a/GuidedTour.php
+++ b/GuidedTour.php
@@ -59,7 +59,7 @@
);
$wgResourceModules['mediawiki.libs.guiders'] = array(
- 'styles' => 'mediawiki.libs.guiders.css',
+ 'styles' => 'mediawiki.libs.guiders.less',
'scripts' => array(
'mediawiki.libs.guiders.js',
),
@@ -70,7 +70,7 @@
// TODO (mattflaschen, 2013-07-30): When the location of the rendering code
// is decided, this module can be merged to there.
$wgResourceModules['ext.guidedTour.styles'] = array(
- 'styles' => 'ext.guidedTour.css',
+ 'styles' => 'ext.guidedTour.less',
'localBasePath' => $dir . 'modules',
'remoteExtPath' => 'GuidedTour/modules',
'dependencies' => array(
diff --git a/modules/ext.guidedTour.css b/modules/ext.guidedTour.less
similarity index 66%
rename from modules/ext.guidedTour.css
rename to modules/ext.guidedTour.less
index a5a46dc..4ba7893 100644
--- a/modules/ext.guidedTour.css
+++ b/modules/ext.guidedTour.less
@@ -1,43 +1,42 @@
+@import "ext.guidedTour.mixins"
+
.guider {
border-color: #bbb;
font-family: "Helvetica Neue", "Helvetica", Arial, sans-serif;
font-size: 14px;
padding: 12px;
+ .box-shadow( 0 0 12px #ccc );
+ .border-radius( 3px );
- -webkit-box-shadow: 0 0 12px #ccc;
- -moz-box-shadow: 0 0 12px #ccc;
- box-shadow: 0 0 12px #ccc;
-
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
}
.guider_buttons {
height: auto;
margin-top: 8px;
+
+ .mw-ui-button {
+ margin-left: 6px;
+ float: right;
+ }
}
-.guider_buttons .mw-ui-button {
- margin-left: 6px;
- float: right;
-}
+.guider_content {
+ h1 {
+ color: #252525;
+ font-size: 1.5em;
+ font-weight: bold;
+ margin-bottom: 4px;
+ border-bottom: none;
+ }
-.guider_content h1 {
- color: #252525;
- font-size: 1.5em;
- font-weight: bold;
- margin-bottom: 4px;
- border-bottom: none;
+ p {
+ font-size: 1em;
+ line-height: 1.3em;
+ }
}
.guider_close {
padding: 0;
-}
-
-.guider_content p {
- font-size: 1em;
- line-height: 1.3em;
}
.guider_arrow {
diff --git a/modules/ext.guidedTour.mixins.less
b/modules/ext.guidedTour.mixins.less
new file mode 100644
index 0000000..bf99abb
--- /dev/null
+++ b/modules/ext.guidedTour.mixins.less
@@ -0,0 +1,11 @@
+.box-shadow( ... ) {
+ -webkit-box-shadow: @arguments;
+ -moz-box-shadow: @arguments;
+ box-shadow: @arguments;
+}
+
+.border-radius( @radius ) {
+ -webkit-border-radius: @radius;
+ -moz-border-radius: @radius;
+ border-radius: @radius;
+}
diff --git a/modules/mediawiki.libs.guiders/mediawiki.libs.guiders.css
b/modules/mediawiki.libs.guiders/mediawiki.libs.guiders.less
similarity index 78%
rename from modules/mediawiki.libs.guiders/mediawiki.libs.guiders.css
rename to modules/mediawiki.libs.guiders/mediawiki.libs.guiders.less
index 5f5ff81..c6b7068 100755
--- a/modules/mediawiki.libs.guiders/mediawiki.libs.guiders.css
+++ b/modules/mediawiki.libs.guiders/mediawiki.libs.guiders.less
@@ -1,3 +1,5 @@
+@import "../ext.guidedTour.mixins"
+
.guider {
background: #FFF;
border: 1px solid #666;
@@ -7,18 +9,8 @@
padding: 4px 12px;
width: 500px;
z-index: 100000005 !important;
-
- /* Shadow */
- -moz-box-shadow: 0 0px 8px #111;
- -webkit-box-shadow: 0 0px 8px #111;
- box-shadow: 0 0px 8px #111;
- /* End shadow */
-
- /* Rounded corners */
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
- border-radius: 4px;
- /* End rounded corners */
+ .box-shadow( 0 0px 8px #111 );
+ .border-radius( 4px );
}
.guider_buttons {
@@ -29,13 +21,19 @@
.guider_content {
position: relative;
-}
-.guider_content h1 {
- color: #1054AA;
- float: left;
- font-size: 21px;
- width: 95%;
+ h1 {
+ color: #1054AA;
+ float: left;
+ font-size: 21px;
+ width: 95%;
+ }
+
+ p {
+ clear: both;
+ color: #333;
+ font-size: 13px;
+ }
}
.guider_close {
@@ -50,12 +48,6 @@
background-repeat: no-repeat;
/* @embed */
background-image: url('x_close_button.jpg');
-}
-
-.guider_content p {
- clear: both;
- color: #333;
- font-size: 13px;
}
#guider_overlay {
--
To view, visit https://gerrit.wikimedia.org/r/113875
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe1514eef7ac1bbdddcad48cca9255960b383517
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GuidedTour
Gerrit-Branch: master
Gerrit-Owner: Phuedx <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
