[MediaWiki-commits] [Gerrit] Load main page styles only on main page - change (mediawiki...MobileFrontend)

2015-05-28 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Load main page styles only on main page
..


Load main page styles only on main page

Bug: T98401
Change-Id: I1ca56ce6aefbdcd8041b8be584d7e4cd31b43b1b
---
M includes/Resources.php
M includes/skins/SkinMinerva.php
R resources/skins.minerva.mainPage.styles/common.less
M resources/skins.minerva.tablet.styles/common.less
4 files changed, 15 insertions(+), 7 deletions(-)

Approvals:
  Bmansurov: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Resources.php b/includes/Resources.php
index bfe980b..92ad908 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -47,7 +47,6 @@
'resources/skins.minerva.base.styles/footer.less',
'resources/skins.minerva.base.styles/common.less',
'resources/skins.minerva.base.styles/icons.less',
-   'resources/skins.minerva.base.styles/mainpage.less',
),
),
'skins.minerva.base.styles' => $wgMFResourceFileModuleBoilerplate + 
array(
@@ -58,7 +57,6 @@
'resources/skins.minerva.base.styles/footer.less',
'resources/skins.minerva.base.styles/common.less',
'resources/skins.minerva.base.styles/icons.less',
-   'resources/skins.minerva.base.styles/mainpage.less',
),
),
 
@@ -176,6 +174,14 @@
),
),
 
+   'skins.minerva.mainPage.styles' => $wgMFResourceFileModuleBoilerplate + 
array(
+   'position' => 'top',
+   'group' => 'other',
+   'styles' => array(
+   'resources/skins.minerva.mainPage.styles/common.less',
+   ),
+   ),
+
'skins.minerva.alpha.styles' => $wgMFResourceFileModuleBoilerplate + 
array(
'position' => 'top',
'styles' => array(
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index ffade0f..378135d 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1038,6 +1038,9 @@
'mediawiki.ui.button',
'skins.minerva.icons.images',
);
+   if ( $title->isMainPage() ) {
+   $styles[] = 'skins.minerva.mainPage.styles';
+   }
if ( $title->isSpecialPage() ) {
$styles['special'] = 'skins.minerva.special.styles';
}
diff --git a/resources/skins.minerva.base.styles/mainpage.less 
b/resources/skins.minerva.mainPage.styles/common.less
similarity index 89%
rename from resources/skins.minerva.base.styles/mainpage.less
rename to resources/skins.minerva.mainPage.styles/common.less
index 6f8e13b..56553d7 100644
--- a/resources/skins.minerva.base.styles/mainpage.less
+++ b/resources/skins.minerva.mainPage.styles/common.less
@@ -28,3 +28,7 @@
}
}
 }
+
+#mw-mf-last-modified {
+   padding: 5px 0;
+}
diff --git a/resources/skins.minerva.tablet.styles/common.less 
b/resources/skins.minerva.tablet.styles/common.less
index 0baf557..6905718 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -93,11 +93,6 @@
display: table-row-group;
}
}
-
-   // For Main Page
-   #mw-mf-last-modified {
-   padding: 5px 0;
-   }
}
 
#footer {

-- 
To view, visit https://gerrit.wikimedia.org/r/214367
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1ca56ce6aefbdcd8041b8be584d7e4cd31b43b1b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Load main page styles only on main page - change (mediawiki...MobileFrontend)

2015-05-28 Thread Jdlrobson (Code Review) 
Jdlrobson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/214367

Change subject: Load main page styles only on main page
..

Load main page styles only on main page

Bug: T98401
Change-Id: I1ca56ce6aefbdcd8041b8be584d7e4cd31b43b1b
---
M includes/Resources.php
M includes/skins/SkinMinerva.php
R resources/skins.minerva.mainPage.styles/common.less
M resources/skins.minerva.tablet.styles/common.less
4 files changed, 15 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/67/214367/1

diff --git a/includes/Resources.php b/includes/Resources.php
index 86fe287..6981cda 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -47,7 +47,6 @@
'resources/skins.minerva.base.styles/footer.less',
'resources/skins.minerva.base.styles/common.less',
'resources/skins.minerva.base.styles/icons.less',
-   'resources/skins.minerva.base.styles/mainpage.less',
),
),
'skins.minerva.base.styles' => $wgMFResourceFileModuleBoilerplate + 
array(
@@ -58,7 +57,6 @@
'resources/skins.minerva.base.styles/footer.less',
'resources/skins.minerva.base.styles/common.less',
'resources/skins.minerva.base.styles/icons.less',
-   'resources/skins.minerva.base.styles/mainpage.less',
),
),
 
@@ -176,6 +174,14 @@
),
),
 
+   'skins.minerva.mainPage.styles' => $wgMFResourceFileModuleBoilerplate + 
array(
+   'position' => 'top',
+   'group' => 'other',
+   'styles' => array(
+   'resources/skins.minerva.mainPage.styles/common.less',
+   ),
+   ),
+
'skins.minerva.alpha.styles' => $wgMFResourceFileModuleBoilerplate + 
array(
'position' => 'top',
'styles' => array(
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index f7b8b18..3e26640 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1042,6 +1042,9 @@
'mediawiki.ui.button',
'skins.minerva.icons.images',
);
+   if ( $title->isMainPage() ) {
+   $styles[] = 'skins.minerva.mainPage.styles';
+   }
if ( $title->isSpecialPage() ) {
$styles[] = 'mobile.messageBox';
$styles['special'] = 'skins.minerva.special.styles';
diff --git a/resources/skins.minerva.base.styles/mainpage.less 
b/resources/skins.minerva.mainPage.styles/common.less
similarity index 89%
rename from resources/skins.minerva.base.styles/mainpage.less
rename to resources/skins.minerva.mainPage.styles/common.less
index 6f8e13b..56553d7 100644
--- a/resources/skins.minerva.base.styles/mainpage.less
+++ b/resources/skins.minerva.mainPage.styles/common.less
@@ -28,3 +28,7 @@
}
}
 }
+
+#mw-mf-last-modified {
+   padding: 5px 0;
+}
diff --git a/resources/skins.minerva.tablet.styles/common.less 
b/resources/skins.minerva.tablet.styles/common.less
index 0baf557..6905718 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -93,11 +93,6 @@
display: table-row-group;
}
}
-
-   // For Main Page
-   #mw-mf-last-modified {
-   padding: 5px 0;
-   }
}
 
#footer {

-- 
To view, visit https://gerrit.wikimedia.org/r/214367
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ca56ce6aefbdcd8041b8be584d7e4cd31b43b1b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits