From 35cd7eb7b57e0c62dc7cffc557d786a4e775c92c Mon Sep 17 00:00:00 2001 From: root Date: Thu, 8 Jan 2015 11:38:54 +0100 Subject: [PATCH 1/5] Sync --- .gitignore | 1 + BootstrapMediaWiki.skin.php | 210 ++++++++++++-- acacha_custom.css | 494 +++++++++++++++++++++++++++++++++ acacha_custom.js | 74 +++++ bootstrap-mediawiki.php | 14 +- js/behavior.js | 4 +- js/jquery.hoverIntent.min.js | 21 ++ js/jquery.mb.flipText.js | 120 ++++++++ js/mbExtruder.js | 521 +++++++++++++++++++++++++++++++++++ js/site.js | 2 +- mbExtruder.css | 21 ++ mbExtruder.less | 311 +++++++++++++++++++++ style.css | 19 +- 13 files changed, 1779 insertions(+), 33 deletions(-) create mode 100644 .gitignore create mode 100644 acacha_custom.css create mode 100644 acacha_custom.js create mode 100755 js/jquery.hoverIntent.min.js create mode 100755 js/jquery.mb.flipText.js create mode 100755 js/mbExtruder.js create mode 100755 mbExtruder.css create mode 100755 mbExtruder.less diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b25c15b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*~ diff --git a/BootstrapMediaWiki.skin.php b/BootstrapMediaWiki.skin.php index 5c85470..ff1f9cd 100644 --- a/BootstrapMediaWiki.skin.php +++ b/BootstrapMediaWiki.skin.php @@ -2,6 +2,9 @@ /** * Bootstrap - A basic MediaWiki skin based on Twitter's excellent Bootstrap CSS framework * + * @Author Sergi Tur Badenas + * + * Based On: * @Version 1.0.0 * @Author Matthew Batchelder * @Copyright Matthew Batchelder 2012 - http://borkweb.com/ @@ -39,6 +42,7 @@ public function initPage( OutputPage $out ) { parent::initPage( $out ); $out->addModuleScripts( 'skins.bootstrapmediawiki' ); $out->addMeta( 'viewport', 'width=device-width, initial-scale=1, maximum-scale=1' ); + $out->addStyle('http://fonts.googleapis.com/css?family=Raleway%7COswald%3A400&ver=4.0.1', 'all'); }//end initPage /** @@ -81,6 +85,7 @@ public function execute() { global $wgTOCLocation; global $wgNavBarClasses; global $wgSubnavBarClasses; + global $wgDisableCounters; $this->skin = $this->data['skin']; $action = $wgRequest->getText( 'action' ); @@ -91,8 +96,9 @@ public function execute() { $this->html('headelement'); ?> +