jenkins-bot has submitted this change and it was merged.
Change subject: Move language selector specific css to separate file
......................................................................
Move language selector specific css to separate file
Make reuse of .suggestions-results class
Change-Id: I9b3f6a90dc93b7285b70be426e8b50098e5b887b
---
M includes/Resources.php
M includes/skins/MinervaTemplate.php
M less/common/mf-buttons.less
M less/common/overlays.less
A less/modules/languages.less
M stylesheets/common/overlays.css
M stylesheets/common/ui.css
A stylesheets/modules/languages.css
M templates/overlays/languages.html
9 files changed, 30 insertions(+), 60 deletions(-)
Approvals:
JGonera: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 8fe564a..76e2b7d 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -276,6 +276,7 @@
),
'styles' => array(
'stylesheets/modules/editor.css',
+ 'stylesheets/modules/languages.css',
'stylesheets/modules/talk.css',
),
'scripts' => array(
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 1b9edd0..0f0f730 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -32,6 +32,7 @@
<div class="section" id="mw-mf-language-section">
<h2 id="section_language" class="section_heading"><?php
echo $languageTemplateData['heading']; ?></h2>
<div id="content_language" class="content_block">
+ <?php if ( count(
$languageTemplateData['variants'] ) > 0 ) { ?>
<p id="mw-mf-language-variant-header"><?php
echo $languageTemplateData['variantSummary']; ?></p>
<ul id="mw-mf-language-variant-selection">
<?php
@@ -40,6 +41,7 @@
endforeach;
?>
</ul>
+ <?php } ?>
<p id="mw-mf-language-header"><?php echo
$languageTemplateData['languageSummary']; ?></p>
<ul id="mw-mf-language-selection">
<?php
diff --git a/less/common/mf-buttons.less b/less/common/mf-buttons.less
index 2fffa27..bb221a4 100644
--- a/less/common/mf-buttons.less
+++ b/less/common/mf-buttons.less
@@ -41,10 +41,6 @@
border-color: darken( @disabledColor, 5% );
}
- &.languageSelector {
- margin-top: @headingMarginTop;
- }
-
&.cancel {
background: #777;
border: 1px #666 solid;
diff --git a/less/common/overlays.less b/less/common/overlays.less
index a20295c..5566d58 100644
--- a/less/common/overlays.less
+++ b/less/common/overlays.less
@@ -78,16 +78,6 @@
.background-size( auto, @headerElementHeight );
}
- div.languageOverlay ul,
- ul.content {
- li {
- .overlayListItem();
- &.preferred {
- font-weight: bold;
- }
- }
- }
-
.mw-mf-overlay-header {
background-color: #F1F1F1;
}
diff --git a/less/modules/languages.less b/less/modules/languages.less
new file mode 100644
index 0000000..1129a3d
--- /dev/null
+++ b/less/modules/languages.less
@@ -0,0 +1,14 @@
+@import "../mf-mixins.less";
+
+button.languageSelector {
+ margin-top: @headingMarginTop;
+}
+
+div.languageOverlay {
+ .suggestions-results {
+ padding-bottom: 0;
+ .preferred {
+ font-weight: bold;
+ }
+ }
+}
diff --git a/stylesheets/common/overlays.css b/stylesheets/common/overlays.css
index 71eb891..0aa03ce 100644
--- a/stylesheets/common/overlays.css
+++ b/stylesheets/common/overlays.css
@@ -65,39 +65,6 @@
-webkit-background-size: auto 30px;
background-size: auto 30px;
}
-.mw-mf-overlay div.languageOverlay ul li,
-.mw-mf-overlay ul.content li {
- color: #666;
- border: none;
- position: relative;
- border-bottom: solid 1px #999999;
- border-bottom: solid 1px #eee;
- padding: 12px 40px;
- font-size: 0.9em;
-}
-.mw-mf-overlay div.languageOverlay ul li a,
-.mw-mf-overlay ul.content li a {
- display: block;
- text-decoration: none;
- color: #666;
-}
-.mw-mf-overlay div.languageOverlay ul li a:active,
-.mw-mf-overlay ul.content li a:active,
-.mw-mf-overlay div.languageOverlay ul li a:hover,
-.mw-mf-overlay ul.content li a:hover,
-.mw-mf-overlay div.languageOverlay ul li a:visited,
-.mw-mf-overlay ul.content li a:visited {
- text-decoration: none;
- color: #666;
-}
-.mw-mf-overlay div.languageOverlay ul li:hover,
-.mw-mf-overlay ul.content li:hover {
- background-color: #ACD1E9;
-}
-.mw-mf-overlay div.languageOverlay ul li.preferred,
-.mw-mf-overlay ul.content li.preferred {
- font-weight: bold;
-}
.mw-mf-overlay .mw-mf-overlay-header {
background-color: #F1F1F1;
}
diff --git a/stylesheets/common/ui.css b/stylesheets/common/ui.css
index 6eda15c..18ef2c3 100644
--- a/stylesheets/common/ui.css
+++ b/stylesheets/common/ui.css
@@ -93,17 +93,6 @@
background-image: linear-gradient(#7798d2 0, #7798d2 100%);
border-color: #648acc;
}
-.content .button.languageSelector,
-.buttonBar .button.languageSelector,
-.drawer .button.languageSelector,
-.content button.languageSelector,
-.buttonBar button.languageSelector,
-.drawer button.languageSelector,
-.content input[type=submit].languageSelector,
-.buttonBar input[type=submit].languageSelector,
-.drawer input[type=submit].languageSelector {
- margin-top: 14pt;
-}
.content .button.cancel,
.buttonBar .button.cancel,
.drawer .button.cancel,
diff --git a/stylesheets/modules/languages.css
b/stylesheets/modules/languages.css
new file mode 100644
index 0000000..4ab0293
--- /dev/null
+++ b/stylesheets/modules/languages.css
@@ -0,0 +1,9 @@
+button.languageSelector {
+ margin-top: 14pt;
+}
+div.languageOverlay .suggestions-results {
+ padding-bottom: 0;
+}
+div.languageOverlay .suggestions-results .preferred {
+ font-weight: bold;
+}
diff --git a/templates/overlays/languages.html
b/templates/overlays/languages.html
index 2d9e438..b441fd7 100644
--- a/templates/overlays/languages.html
+++ b/templates/overlays/languages.html
@@ -5,12 +5,14 @@
</div>
</div>
<div class="languageOverlay">
+ {{#variantItems}}
<p class="mw-mf-overlay-header">{{{variantHeader}}}</p>
- <ul>
+ <ul class="suggestions-results">
{{{variantItems}}}
</ul>
+ {{/variantItems}}
<p class="mw-mf-overlay-header">{{{header}}}</p>
- <ul>
+ <ul class="suggestions-results">
{{{languageItems}}}
</ul>
<p class="mw-mf-overlay-footer" style="display:none">
--
To view, visit https://gerrit.wikimedia.org/r/67914
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9b3f6a90dc93b7285b70be426e8b50098e5b887b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
