jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/383030 )
Change subject: Update to match vector changes
......................................................................
Update to match vector changes
Change-Id: Ibb4df4fce7198bd2c9cc21296d788ecc280b6d22
---
M MetrolookTemplate.php
M README.md
M SkinMetrolook.php
M components/custom/footer.less
M components/custom/personalMenu.less
M components/custom/search.less
M components/custom/tabs.less
M components/custom/watchstar.less
M components/main/footer.less
M components/main/personalMenu.less
M components/main/search.less
M components/main/tabs.less
M components/main/watchstar.less
M print.less
14 files changed, 85 insertions(+), 56 deletions(-)
Approvals:
Paladox: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 23bcc48..f0d8292 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -134,15 +134,9 @@
}
}
- // Reverse horizontally rendered navigation elements
- if ( $this->data['rtl'] ) {
- $this->data['view_urls'] =
- array_reverse( $this->data['view_urls'] );
- $this->data['namespace_urls'] =
- array_reverse( $this->data['namespace_urls'] );
- $this->data['personal_urls'] =
- array_reverse( $this->data['personal_urls'] );
- }
+ echo $langSelector;
+ echo $notLoggedIn;
+
$personalTools = $this->getPersonalTools();
foreach ( $personalTools as $key => $item ) {
if ( $key !== 'notifications-alert' ) {
@@ -625,7 +619,7 @@
}
/**
- * Render one or more navigations elements by name, automatically
reveresed
+ * Render one or more navigations elements by name, automatically
reversed by css
* when UI is in RTL mode
*
* @param array $elements
@@ -635,9 +629,6 @@
// flexible arguments
if ( !is_array( $elements ) ) {
$elements = [ $elements ];
- // If there's a series of elements, reverse them when
in RTL mode
- } elseif ( $this->data['rtl'] ) {
- $elements = array_reverse( $elements );
}
// Render elements
foreach ( $elements as $name => $element ) {
@@ -823,9 +814,7 @@
}
// Add CSS class 'collapsible' to links which are not marked as
"primary"
if (
- isset( $options['metrolook-collapsible'] ) &&
$options['metrolook-collapsible']
- && !( isset( $item['primary'] ) && $item['primary'] )
- ) {
+ isset( $options['metrolook-collapsible'] ) &&
$options['metrolook-collapsible'] ) {
$item['class'] = rtrim( 'collapsible ' .
$item['class'], ' ' );
}
// We don't use this, prevent it from popping up in HTML output
diff --git a/README.md b/README.md
index 1504680..51ed8e3 100644
--- a/README.md
+++ b/README.md
@@ -11,13 +11,17 @@
If you would like compatibility with older releases of MediaWiki, download the
appropriate version for your MediaWiki from one of the URLs below:
-1.30
+1.31
https://phabricator.wikimedia.org/diffusion/SMTL/browse/master/
+
+1.30
+
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_30/
1.29
-https://phabricator.wikimedia.org/diffusion/SMTL/browse/master/
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_29/
1.28
@@ -26,14 +30,6 @@
1.27
https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_27/
-
-1.26
-
-https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_26/
-
-1.25
-
-https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_25/
### Live demo
diff --git a/SkinMetrolook.php b/SkinMetrolook.php
index 88fc142..961deff 100644
--- a/SkinMetrolook.php
+++ b/SkinMetrolook.php
@@ -45,6 +45,7 @@
if ( $this->metrolookConfig->get(
'MetrolookExperimentalPrintStyles' ) ) {
$className .= ' metrolook-experimental-print-styles';
}
+ $className .= ' metrolook-nav-directionality';
return $className;
}
diff --git a/components/custom/footer.less b/components/custom/footer.less
index 8c24a8d..525fad7 100644
--- a/components/custom/footer.less
+++ b/components/custom/footer.less
@@ -46,12 +46,3 @@
}
}
}
-
-body.ltr {
- div#footer {
- #footer-places {
- /* @noflip */
- float: left;
- }
- }
-}
diff --git a/components/custom/personalMenu.less
b/components/custom/personalMenu.less
index 40bc487..2d01ad4 100644
--- a/components/custom/personalMenu.less
+++ b/components/custom/personalMenu.less
@@ -28,6 +28,10 @@
margin-top: 0em;
font-size: 1em;
white-space: nowrap;
+
+ .metrolook-nav-directionality & {
+ float: left;
+ }
}
}
diff --git a/components/custom/search.less b/components/custom/search.less
index a654bf6..1d4722e 100644
--- a/components/custom/search.less
+++ b/components/custom/search.less
@@ -9,7 +9,6 @@
/* Search */
#p-search {
- /* @noflip */
float: left;
margin-right: 10px;
margin-left: 10px;
diff --git a/components/custom/tabs.less b/components/custom/tabs.less
index be8ed7f..aa11dd2 100644
--- a/components/custom/tabs.less
+++ b/components/custom/tabs.less
@@ -18,6 +18,10 @@
background-repeat: no-repeat;
padding-left: 1px;
+ .metrolook-nav-directionality & {
+ float: left;
+ }
+
ul {
/* @noflip */
float: left;
@@ -29,6 +33,10 @@
.background-image('images/tab-break.png');
background-position: right bottom;
background-repeat: no-repeat;
+
+ .metrolook-nav-directionality & {
+ float: left;
+ }
li {
/* @noflip */
@@ -44,6 +52,10 @@
background-position: bottom left;
background-repeat: repeat-x;
white-space: nowrap;
+
+ .metrolook-nav-directionality & {
+ float: left;
+ }
}
/* IGNORED BY IE6 which doesn't support child selector */
@@ -115,6 +127,10 @@
/* @noflip */
float: left;
display: block;
+
+ .metrolook-nav-directionality & {
+ float: left;
+ }
}
}
}
@@ -129,11 +145,10 @@
padding-right: 5px;
cursor: pointer;
z-index:10;
-}
-body.rtl div.vectorMenu {
- /* @noflip */
- direction: rtl;
+ .metrolook-nav-directionality & {
+ float: left;
+ }
}
div#mw-head div.vectorMenu h5 {
@@ -146,6 +161,10 @@
height: 2.5em;
padding-right: 1px;
margin-right: -1px;
+
+ .metrolook-nav-directionality & {
+ float: left;
+ }
}
div.vectorMenu h5 span {
diff --git a/components/custom/watchstar.less b/components/custom/watchstar.less
index 0e9e0ec..eaa4ae1 100644
--- a/components/custom/watchstar.less
+++ b/components/custom/watchstar.less
@@ -15,6 +15,7 @@
height: 0;
overflow: hidden;
background-position: 5px 45%;
+ background-repeat: no-repeat
}
#ca-unwatch.icon a {
.background-image-svg('images/unwatch-icon.svg',
'images/unwatch-icon.png');
diff --git a/components/main/footer.less b/components/main/footer.less
index 8c24a8d..525fad7 100644
--- a/components/main/footer.less
+++ b/components/main/footer.less
@@ -46,12 +46,3 @@
}
}
}
-
-body.ltr {
- div#footer {
- #footer-places {
- /* @noflip */
- float: left;
- }
- }
-}
diff --git a/components/main/personalMenu.less
b/components/main/personalMenu.less
index 40bc487..2d01ad4 100644
--- a/components/main/personalMenu.less
+++ b/components/main/personalMenu.less
@@ -28,6 +28,10 @@
margin-top: 0em;
font-size: 1em;
white-space: nowrap;
+
+ .metrolook-nav-directionality & {
+ float: left;
+ }
}
}
diff --git a/components/main/search.less b/components/main/search.less
index 6446103..2c06b2a 100644
--- a/components/main/search.less
+++ b/components/main/search.less
@@ -4,7 +4,6 @@
@import 'mediawiki.ui/variables';
#p-search {
- /* @noflip */
float: left;
margin-right: 3.5em;
margin-left: 0.5em;
diff --git a/components/main/tabs.less b/components/main/tabs.less
index 4fd9333..f6023ad 100644
--- a/components/main/tabs.less
+++ b/components/main/tabs.less
@@ -18,6 +18,10 @@
background-repeat: no-repeat;
padding-left: 1px;
+ .metrolook-nav-directionality & {
+ float: left;
+ }
+
ul {
/* @noflip */
float: left;
@@ -29,6 +33,10 @@
.background-image('images/tab-break.png');
background-position: right bottom;
background-repeat: no-repeat;
+
+ .metrolook-nav-directionality & {
+ float: left;
+ }
li {
/* @noflip */
@@ -44,6 +52,10 @@
background-position: bottom left;
background-repeat: repeat-x;
white-space: nowrap;
+
+ .metrolook-nav-directionality & {
+ float: left;
+ }
}
/* IGNORED BY IE6 which doesn't support child selector */
@@ -115,6 +127,10 @@
/* @noflip */
float: left;
display: block;
+
+ .metrolook-nav-directionality & {
+ float: left;
+ }
}
}
}
@@ -129,11 +145,10 @@
padding-right: 5px;
cursor: pointer;
z-index:10;
-}
-body.rtl div.vectorMenu {
- /* @noflip */
- direction: rtl;
+ .metrolook-nav-directionality & {
+ float: left;
+ }
}
div#mw-head div.vectorMenu h5 {
@@ -146,6 +161,10 @@
height: 2.5em;
padding-right: 1px;
margin-right: -1px;
+
+ .metrolook-nav-directionality & {
+ float: left;
+ }
}
div.vectorMenu h5 span {
diff --git a/components/main/watchstar.less b/components/main/watchstar.less
index 0e9e0ec..eaa4ae1 100644
--- a/components/main/watchstar.less
+++ b/components/main/watchstar.less
@@ -15,6 +15,7 @@
height: 0;
overflow: hidden;
background-position: 5px 45%;
+ background-repeat: no-repeat
}
#ca-unwatch.icon a {
.background-image-svg('images/unwatch-icon.svg',
'images/unwatch-icon.png');
diff --git a/print.less b/print.less
index 7fbaf5f..fdd1c34 100644
--- a/print.less
+++ b/print.less
@@ -18,7 +18,7 @@
height: ~'@{printLogoHeight}px';
left: -9999px;
line-height: 0; // line-height is needed for
correctly displaying the size of the content box.
- margin-bottom: 10px;
+ margin-bottom: 20px;
position: absolute;
width: ~'@{printLogoWidth}px';
}
@@ -122,6 +122,21 @@
line-height: 16pt;
margin-top: 5px;
text-align: justify;
+
+ // T175008
+ // When a paragraph is surrounded by floating elements
from both
+ // sides, we want to make sure that there is at least
some space
+ // before showing the text. Otherwise, small lengths of
text may show
+ // between the surrounding elements, making the reading
experience less
+ // enjoyable. If there is not enough space the
following code will push
+ // the paragraph contents until after the floating
element(s).
+ @paragraphMinWidth: 120pt;
+ &:before {
+ content: '';
+ display: block;
+ overflow: hidden;
+ width: @paragraphMinWidth;
+ }
}
blockquote {
@@ -146,7 +161,7 @@
page-break-after: avoid;
background: none;
border: 0;
- display: block;
+ display: table;
a {
border: 0;
--
To view, visit https://gerrit.wikimedia.org/r/383030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb4df4fce7198bd2c9cc21296d788ecc280b6d22
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
