Werdna has submitted this change and it was merged.
Change subject: Fix some CSS/JS loading issues: * Load template styles first to
stop FUOC. * Fix bower version to exclude Agora Grid for now. * Hide #siteSub
too.
......................................................................
Fix some CSS/JS loading issues:
* Load template styles first to stop FUOC.
* Fix bower version to exclude Agora Grid for now.
* Hide #siteSub too.
Change-Id: Ia30bf5a7dd318ed63e378c2fa75e67f2b88b5356
---
M LivingStyleGuide.php
M bower.json
M resources/skin.less
M src/SkinLivingStyleGuide.php
4 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Werdna: Verified; Looks good to me, approved
diff --git a/LivingStyleGuide.php b/LivingStyleGuide.php
index 9b1d2a3..bc1050f 100644
--- a/LivingStyleGuide.php
+++ b/LivingStyleGuide.php
@@ -61,7 +61,7 @@
'localBasePath' => __DIR__ . "/resources",
'remoteSkinPath' => 'LivingStyleGuideSkin/resources',
'group' => 'ext.lightncandyskin',
- 'styles' => 'resources/skin.less',
+ 'styles' => 'skin.less',
'dependencies' => array( 'skin.styleguide.template' ),
),
);
diff --git a/bower.json b/bower.json
index bb63f26..b822173 100644
--- a/bower.json
+++ b/bower.json
@@ -17,6 +17,6 @@
],
"dependencies": {
"bootstrap": "~3.3.1",
- "living-styleguide-template" : "prtksxna/living-styleguide-template"
+ "living-styleguide-template" : "prtksxna/living-styleguide-template#v0.0.1"
}
}
diff --git a/resources/skin.less b/resources/skin.less
index 4a1229c..415c4e2 100644
--- a/resources/skin.less
+++ b/resources/skin.less
@@ -1,5 +1,5 @@
@media screen {
- #contentSub {
+ #contentSub, #siteSub {
display: none;
}
}
\ No newline at end of file
diff --git a/src/SkinLivingStyleGuide.php b/src/SkinLivingStyleGuide.php
index e43e46e..0d28df7 100755
--- a/src/SkinLivingStyleGuide.php
+++ b/src/SkinLivingStyleGuide.php
@@ -12,6 +12,6 @@
public function setupSkinUserCss( OutputPage $out ) {
parent::setupSkinUserCss( $out );
- $out->addModuleStyles( array( 'skin.styleguide',
'ext.bootstrap' ) );
+ $out->addModuleStyles( array( 'skin.styleguide',
'ext.bootstrap', 'skin.styleguide.template' ) );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/186087
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia30bf5a7dd318ed63e378c2fa75e67f2b88b5356
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/LivingStyleGuide
Gerrit-Branch: master
Gerrit-Owner: Werdna <[email protected]>
Gerrit-Reviewer: Werdna <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
