Paladox has submitted this change and it was merged.
Change subject: Big Release
......................................................................
Big Release
This release includes lots of improvements.
Main chnages are
Mobioe desgn.
Fixes to desgn on desktop and ipad.
Settings changes.
Full logo support.
and many more changes.
Please see CHANGELOG.md and README.md.
Change-Id: I0e7f4a0fd7651a83e3dda3078159e108eb56c644
---
M CHANGELOG.md
M Metrolook.php
M MetrolookTemplate.php
M README.md
M SkinMetrolook.php
M components/collapsibleNav.less
M components/common.less
A components/mobile.less
M components/navigation.less
M components/personalMenu.less
M components/search.less
M components/tabs.less
M hooks.txt
A i18n/ast.json
A i18n/en-gb.json
M i18n/fr.json
A i18n/hi.json
A i18n/it.json
M i18n/ko.json
A i18n/uk.json
M images/closed-ltr.svg
M images/closed-rtl.svg
M images/downarrow.svg
A images/edit-icon.png
A images/edit-icon.svg
A images/hamburger.png
A images/hamburger.svg
M images/open.svg
M images/uploadlogo.svg
A images/user-icon-20.png
A images/user-icon-20.svg
A images/user-icon-40.png
A images/user-icon-40.svg
R js/collapsibleNav.js
R js/collapsibleTabs.js
A js/mediawiki.searchSuggest.custom.js
A js/metrolook.js
R js/overthrow.js
R js/vector.js
M screen-hd.less
M screen.less
M theme.less
42 files changed, 1,970 insertions(+), 549 deletions(-)
Approvals:
Paladox: Looks good to me, approved
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a17bdb8..7e28398 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,57 @@
Changelog
=========
+### 2.5
+
+Big release with new desgn for mobile and minor improvements to desktop desgn.
+
+
+Mainly new features and desgn are
+
+* Mobile desgn
+
+* Full logo support.
+
+* Cleaned up MetrolookTemplate.php file.
+
+* Cleaned up setting names.
+
+* Settings that were renamed
+
+$logo renamed to $wgMetrolookLogo<br>$SearchBar renamed to
$wgMetrolookSearchBar<br>$DownArrow renamed to $wgMetrolookDownArrow<br>$Line
renamed to $wgMetrolookLine<br>$UploadButton renamed to
$wgMetrolookUploadButton<br>$wgURL1 and $wgImage1 where renamed to
$wgMetrolookURL1 and $wgMetrolookImage1 and there settings were changed. for
url you put in the url to website for image you put in the path to image or url
to image.
+
+* Settings that were removed.
+
+ $link and $picture
+
+* New settings that were added
+
+$wgMetrolookBartile
+
+$wgMetrolookTile1<br>$wgMetrolookTile2<br>$wgMetrolookTile3<br>$wgMetrolookTile4<br>$wgMetrolookTile5<br>$wgMetrolookTile6<br>$wgMetrolookTile7<br>$wgMetrolookTile8<br>$wgMetrolookTile9<br>$wgMetrolookTile10
+
+$wgMetrolookSiteName
+
+$wgMetrolookMobile
+
+
+
+Note: Please see settings section in README.md for more information on how to
enable and disable it.
+
+* Remove styles and js from the main MetrolookTemplate.php and seperated it
into own files.
+
+* More new things and changes comming soon to this release. /* This will be
removed once this is ready to be published */
+
+
+Improvements to ipad desgn.
+
+* Bug fixes.
+
+* Fixes for desktop desgn.
+
+* fix for SkinMetrolook.php
+
+
### 2.4.14
* Adding copying file for license.
@@ -8,8 +59,6 @@
* Adding namemsg for skin name.
* Localisation updates.
-
-* Updated SkinStyles/jquery.ui.
### 2.4.13
diff --git a/Metrolook.php b/Metrolook.php
index 6e1d845..45d3eb2 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -26,7 +26,7 @@
'name' => 'Metrolook',
'namemsg' => 'skinname-metrolook',
'descriptionmsg' => 'metrolook-desc',
- 'version' => '2.4.14',
+ 'version' => '2.5',
'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' => array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' => 'GPLv2+',
@@ -60,41 +60,37 @@
*/
$GLOBALS['wgVectorUseIconWatch'] = true;
-/* Logo is off by default to turn it on plase see README.md. Note that if
enabled it will not show properly.*/
-$GLOBALS['logo'] = false;
+/**
+ * Logo
+ * - true = Logo will show
+ * - false = Logo will not show
+ */
+
+$GLOBALS['wgMetrolookLogo'] = true;
+
+$GLOBALS['wgMetrolookSiteName'] = true;
/* to enable search bar on the sidebar and disables the search bar on the top
bar */
-$GLOBALS['SearchBar'] = true;
+$GLOBALS['wgMetrolookSearchBar'] = true;
-$GLOBALS['DownArrow'] = true;
+$GLOBALS['wgMetrolookDownArrow'] = true;
-$GLOBALS['Line'] = true;
+$GLOBALS['wgMetrolookLine'] = true;
-$GLOBALS['link1'] = true;
+$GLOBALS['wgMetrolookUploadButton'] = true;
-$GLOBALS['image1'] = true;
+$GLOBALS['wgMetrolookMobile'] = true;
-$GLOBALS['link2'] = true;
+/* To use tile 5 to 10 please diable this */
+$GLOBALS['wgMetrolookBartile'] = true;
-$GLOBALS['image2'] = true;
+$GLOBALS['wgMetrolookTile1'] = true;
-$GLOBALS['link3'] = true;
+$GLOBALS['wgMetrolookTile2'] = true;
-$GLOBALS['image3'] = true;
+$GLOBALS['wgMetrolookTile3'] = true;
-$GLOBALS['link4'] = true;
-
-$GLOBALS['image4'] = true;
-
-$GLOBALS['link5'] = false;
-
-$GLOBALS['image5'] = false;
-
-$GLOBALS['link6'] = false;
-
-$GLOBALS['image6'] = false;
-
-$GLOBALS['UploadButton'] = true;
+$GLOBALS['wgMetrolookTile4'] = true;
// Register modules
$GLOBALS['wgResourceModules']['skins.metrolook.styles'] = array(
@@ -107,20 +103,24 @@
);
$GLOBALS['wgResourceModules']['skins.metrolook.js'] = array(
'scripts' => array(
- 'collapsibleTabs.js',
- 'vector.js',
+ 'js/collapsibleTabs.js',
+ 'js/metrolook.js',
+ 'js/vector.js',
+ 'js/mediawiki.searchSuggest.custom.js',
+ 'js/overthrow.js',
),
'position' => 'top',
'dependencies' => array(
'jquery.throttle-debounce',
'jquery.tabIndex',
+ 'mediawiki.searchSuggest',
),
'remoteSkinPath' => 'Metrolook',
'localBasePath' => __DIR__,
);
$GLOBALS['wgResourceModules']['skins.metrolook.collapsibleNav'] = array(
'scripts' => array(
- 'collapsibleNav.js',
+ 'js/collapsibleNav.js',
),
'messages' => array(
'vector-collapsiblenav-more',
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 5482592..dc1635e 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -22,7 +22,7 @@
*/
/**
- * QuickTemplate class for Vector skin
+ * QuickTemplate class for Metrolook skin
* @ingroup Skins
*/
class MetrolookTemplate extends BaseTemplate {
@@ -37,35 +37,13 @@
* Outputs the entire contents of the (X)HTML page
*/
public function execute() {
- global $logo;
- global $SearchBar;
- global $DownArrow;
- global $Line;
- global $image1;
- global $link1;
- global $picture1;
- global $url1;
- global $image2;
- global $link2;
- global $picture2;
- global $url2;
- global $image3;
- global $link3;
- global $picture3;
- global $url3;
- global $image4;
- global $link4;
- global $picture4;
- global $url4;
- global $image5;
- global $link5;
- global $picture5;
- global $url5;
- global $image6;
- global $link6;
- global $picture6;
- global $url6;
- global $UploadButton;
+ global $wgMetrolookLogo, $wgMetrolookSearchBar,
$wgMetrolookDownArrow, $wgMetrolookLine,
+ $wgMetrolookUploadButton, $wgMetrolookSiteName,
$wgMetrolookBartile, $wgMetrolookTile1,
+ $wgMetrolookTile2, $wgMetrolookTile3, $wgMetrolookTile4,
$wgMetrolookTile5, $wgMetrolookTile6,
+ $wgMetrolookTile7, $MetrolookwgTile8, $wgMetrolookTile9,
$wgMetrolookTile10, $wgMetrolookImage1,
+ $wgMetrolookURL1, $wgMetrolookImage2, $wgMetrolookURL2,
$wgMetrolookImage3, $wgMetrolookURL3,
+ $wgMetrolookImage4, $wgMetrolookURL4, $wgMetrolookImage5,
$wgMetrolookURL5, $wgMetrolookImage6,
+ $wgMetrolookURL6, $wgMetrolookMobile;
// Build additional attributes for navigation urls
$nav = $this->data['content_navigation'];
@@ -132,104 +110,12 @@
// Output HTML Page
$this->html( 'headelement' );
?>
- <style>
-body {
- height:100%;
-}
-html {
- height:100%;
-}
-html,
-body {
- margin: 0px 0px 0px 0px;
- padding: 0px 0px 0px 0px;
- height:100%;
-}
-#top-tile-bar {
- background:transparent;
- left: 0px;
- height: 200px;
- position: fixed;
- z-index:100;
-}
-.tilebar {
- position: relative;
- left: 0px;
- top: 0px;
- right: 0px;
- bottom: 0px;
- align:right;
- color:#fff;
- background:#1D1D1D;
- width:21474836.47em;
- height:400px;
- display:block;
- z-index:9999999;
-}
-.tile:hover {
- outline: 3px #4A4A4A solid;
-}
-.onhoverbg:hover {
- background: #9F6F40;
-}
-.topleft {
- display: inline;
- position: relative;
-}
-.topright .hover {
- display: none;
- position: absolute;
- left:0;
- z-index: 2000;
- height:200px;
-}
- </style>
- <script>
-var openDiv, $;
-function toggleDiv(divID) {
- $("#" + divID).fadeToggle(150, function() {
- openDiv = $(this).is(':visible') ? divID : null;
- });
-}
-$(document).click(function(e) {
- if (!$(e.target).closest('#'+openDiv).length) {
- toggleDiv(openDiv);
- }
-});
-$(function () {
- $('.usermenu > div').toggleClass('no-js js');
- $('.usermenu .js div').hide();
- $('.usermenu .js').click(function(e) {
- $('.usermenu .js div').fadeToggle(150);
- $('.usermenu').toggleClass('active');
- e.stopPropagation();
- });
- $(document).click(function() {
- if ($('.usermenu .js div').is(':visible')) {
- $('.usermenu .js div', this).fadeOut(150);
- $('.usermenu').removeClass('active');
- }
- });
-});
+<?php if ( $wgMetrolookMobile ): ?>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<?php else: ?>
+<?php endif; ?>
-$(function () {
- $('.actionmenu > div').toggleClass('no-js js');
- $('.actionmenu .js div').hide();
- $('.actionmenu .js').click(function(e) {
- $('.actionmenu .js div').fadeToggle(150);
- $('.clicker').toggleClass('active');
- e.stopPropagation();
- });
- $(document).click(function() {
- if ($('.actionmenu .js div').is(':visible')) {
- $('.actionmenu .js div', this).fadeOut(150);
- $('.clicker').removeClass('active');
- }
- });
-});
- </script>
-<script src="<?php echo htmlspecialchars( $this->getSkin()->getSkinStylePath(
'overthrow.js' ) ) ?>"></script>
<div id="mw-page-base" class="noprint"></div>
<div id="mw-head-base" class="noprint"></div>
<div id="content" class="mw-body" class="overthrow" role="main">
@@ -246,7 +132,7 @@
$this->data['pageLanguage'] =
$this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
$this->text( 'pageLanguage' );
- ?>"><span dir="auto"><?php $this->html( 'title' )
?></span></h1>
+ ?>"><?php $this->html( 'title' ) ?></h1>
<?php $this->html( 'prebodyhtml' ) ?>
<div id="bodyContent" class="mw-body-content">
<?php
@@ -373,17 +259,21 @@
<h2><?php $this->msg( 'navigation-heading' ) ?></h2>
<div id="mw-head">
- <div class="vectorMenu"
style="float:right;background-image:none;vertical-align:middle;height:40px;padding-left:10px;padding-right:10px;position:relative;top:0px;right:10px;width:auto;text-align:right;">
-<a href="#" style="text-decoration:none;"><span id="username-top"><?php
+ <div class="vectorMenu" id="usermenu">
+ <div class="no-js">
+<a href="#" style="text-decoration:none;"><span id="username-top"><span
id="username-text"><?php
if ($_SERVER["REMOTE_ADDR"] ==
htmlspecialchars($this->getSkin()->getUser()->getName())) {
echo wfMessage( 'metrolook-guest' )->text();
}
else {
echo htmlspecialchars( $this->getSkin()->getUser()->getName() );
}
- ?><span style="word-spacing:4px;"> </span><img class="custom4"
style="position:relative;top:0.4em;" src="<?php echo htmlspecialchars(
$this->getSkin()->getSkinStylePath( 'images/Transparent.gif' ) ) ?>"
/></span></a>
+ ?></span><span style="word-spacing:4px;"> </span><span id="userIcon20"><img
class="userIcon20" style="position:relative;top:0.3em;" src="<?php echo
htmlspecialchars( $this->getSkin()->getSkinStylePath( 'images/Transparent.gif'
) ) ?>" /></span>
+<span style="word-spacing:4px;"> </span><span id="userIcon40"><img
class="userIcon40" style="position:relative;top:0.4em;" src="<?php echo
htmlspecialchars( $this->getSkin()->getSkinStylePath( 'images/Transparent.gif'
) ) ?>" />
+</span></span></a>
<div class="menu"
style="position:absolute;top:40px;right:0px;margin:0;width:200px;">
<?php $this->renderNavigation( 'PERSONAL' ); ?>
+</div>
</div>
</div>
<div id="echoNotifications">
@@ -393,14 +283,25 @@
?>
</ul>
</div>
-<?php if ( $logo ): ?><div style="padding-left:10px;"><div class="lighthover"
style="height:40px;float:left;"><div class="onhoverbg"
style="height:40px;float:left;"><h4 class="title-name"><a href="<?php echo
$this->data['nav_urls']['mainpage']['href']; ?>"><img alt="<?php echo
$this->text('sitename'); ?>" src="<?php echo $this->text('logopath') ?>"
style="max-width: 65px;height:auto; max-height:36px; display: inline-block;
vertical-align:middle; padding-right:5px;
padding-left:5px;"></div></h4></a><?php else: ?><div
style="padding-left:10px;"><div class="lighthover"
style="height:40px;float:left;"><div class="onhoverbg"
style="height:40px;float:left;"><h4 class="title-name"><a href="<?php echo
$this->data['nav_urls']['mainpage']['href']; ?>"><div class="title-name"
style="font-size: 0.9em;
padding-left:0.4em;padding-right:0.4em;color:white;max-width: auto;height:auto;
max-height:700px; display: inline-block; vertical-align:middle;"><?php echo
$GLOBALS['wgSitename'] ?></div></a></h4></div><?php endif; ?><?php if ( $Line
): ?><img class="custom2" src="<?php echo htmlspecialchars(
$this->getSkin()->getSkinStylePath( 'images/Transparent.gif' ) ) ?>"
style="float:left;" /><?php else: ?><?php endif; ?><?php if ( $DownArrow ):
?><img class="custom3" src="<?php echo htmlspecialchars(
$this->getSkin()->getSkinStylePath( 'images/Transparent.gif' ) ) ?>"
style="height:60px;width:27px;cursor:pointer;"
onclick="toggleDiv('bartile');"/><?php else: ?><?php endif; ?></div></div>
-<?php if ( $DownArrow ): ?>
+
+<div id="hamburgerIcon"><img class="hamburger" src="<?php echo
htmlspecialchars( $this->getSkin()->getSkinStylePath( 'images/Transparent.gif'
) ) ?>" height="40px" width="40px"></img></div>
+<?php if ( $wgMetrolookSiteName ): ?><div style="padding-left:10px;"><div
id="siteLogoBar" class="lighthover" style="height:40px;float:left;"><div
class="onhoverbg" style="height:40px;float:left;"><h4 class="title-name"><a
href="<?php echo $this->data['nav_urls']['mainpage']['href']; ?>"><div
class="title-name" style="font-size: 0.9em;
padding-left:0.4em;padding-right:0.4em;color:white;max-width: auto;height:auto;
max-height:700px; display: inline-block; vertical-align:middle;"><?php echo
$GLOBALS['wgSitename'] ?></div></a></h4></div><?php else: ?><?php endif;
?><?php if ( $wgMetrolookLine ): ?><img class="line" src="<?php echo
htmlspecialchars( $this->getSkin()->getSkinStylePath( 'images/Transparent.gif'
) ) ?>" style="float:left;" /><?php else: ?><?php endif; ?><?php if (
$wgMetrolookDownArrow ): ?><img class="downarrow" src="<?php echo
htmlspecialchars( $this->getSkin()->getSkinStylePath( 'images/Transparent.gif'
) ) ?>" style="height:60px;width:27px;cursor:pointer;" /><?php else: ?><?php
endif; ?><?php if ( $wgMetrolookSiteName ): ?></div></div><?php else: ?><?php
endif; ?>
+
+<?php if ( $wgMetrolookDownArrow ): ?>
<div id="top-tile-bar" class="fixed-position">
<div style="vertical-align:top;align:left;">
<div class="topleft">
-<div style="align:left;display:none;height:200px;" class="tilebar"
id="bartile"><div style="height:200px;display:table;"><div
style="vertical-align:middle;display:table-cell;padding-left:36px;">
-<div style="float:left;padding:5px;"><div class="tile"><?php if ( $link1 ):
?><a href="http://www.pidgi.net/wiki/";><?php else: ?><a href="<?php echo
$GLOBALS['$url1'] ?>"><?php endif; ?><?php if ( $image1 ): ?><img
src="http://images.pidgi.net/pidgiwikitiletop.png"; /><?php else: ?><img
src="<?php echo $GLOBALS['$picture1'] ?>" /><?php endif; ?></a></div></div><div
style="float:left;padding:5px;"><div class="tile"><?php if ( $link2 ): ?><a
href="http://www.pidgi.net/press/";><?php else: ?><a href="<?php echo
$GLOBALS['$url2'] ?>"><?php endif; ?><?php if ( $image2 ): ?><img
src="http://images.pidgi.net/pidgipresstiletop.png"; /><?php else: ?><img
src="<?php echo $GLOBALS['$picture2'] ?>" /><?php endif; ?></a></div></div><div
style="float:left;padding:5px;"><div class="tile"><?php if ( $link3 ): ?><a
href="http://www.pidgi.net/jcc/";><?php else: ?><a href="<?php echo
$GLOBALS['$url3'] ?>"><?php endif; ?><?php if ( $image3 ): ?><img
src="http://images.pidgi.net/jcctiletop.png"; /><?php else: ?><img src="<?php
echo $GLOBALS['$picture3'] ?>" /><?php endif; ?></a></div></div><div
style="float:left;padding:5px;"><div class="tile"><?php if ( $link4 ): ?><a
href="http://www.petalburgwoods.com/";><?php else: ?><a href="<?php echo
$GLOBALS['$url4'] ?>"><?php endif; ?><?php if ( $image4 ): ?><img
src="http://images.pidgi.net/pwntiletop.png"; /><?php else: ?><img src="<?php
echo $GLOBALS['$picture4'] ?>" /><?php endif; ?></a></div></div><div
style="float:left;padding:5px;"><div class="tile"><?php if ( $link5 ): ?><a
href="<?php echo $GLOBALS['$url5'] ?>"><?php else: ?><?php endif; ?><?php if (
$image5 ): ?><img src="<?php echo $GLOBALS['$picture5'] ?>" /><?php else:
?><?php endif; ?></a></div></div><div style="float:left;padding:5px;"><div
class="tile"><?php if ( $link6 ): ?><a href="<?php echo $GLOBALS['$url6']
?>"><?php else: ?><?php endif; ?><?php if ( $image6 ): ?><img src="<?php echo
$GLOBALS['$picture6'] ?>" /><?php else: ?><?php endif; ?></a></div></div>
+<div style="align:left;margin-left:auto;margin-right:auto;display:none;"
class="tilebar" id="bartile"><div id="tilegrouptable"><div id="tilegroup">
+<?php if ( $wgMetrolookBartile ): ?>
+
+<?php if ( $wgMetrolookTile1 ): ?><div style="float:left;padding:5px;"><div
class="tile"><a href="http://www.pidgi.net/wiki/";><img
src="http://images.pidgi.net/pidgiwikitiletop.png"; /></a></div></div><?php
else: ?><?php endif; ?><?php if ( $wgMetrolookTile2 ): ?><div
style="float:left;padding:5px;"><div class="tile"><a
href="http://www.pidgi.net/press/";><img
src="http://images.pidgi.net/pidgipresstiletop.png"; /></a></div></div><?php
else: ?><?php endif; ?><?php if ( $wgMetrolookTile3 ): ?><div
style="float:left;padding:5px;" id="jcctile"><div class="tile"><a
href="http://www.pidgi.net/jcc/";><img
src="http://images.pidgi.net/jcctiletop.png"; /></a></div></div><?php else:
?><?php endif; ?><?php if ( $wgMetrolookTile4 ): ?><div
style="float:left;padding:5px;"><div class="tile"><a
href="http://www.petalburgwoods.com/";><img
src="http://images.pidgi.net/pwntiletop.png"; /></a></div></div><?php else:
?><?php endif; ?>
+
+<?php else: ?>
+
+<?php if ( $wgMetrolookTile5 ): ?><div style="float:left;padding:5px;"><div
class="tile"><a href="<?php echo $GLOBALS['$wgMetrolookURL1'] ?>"><img
src="<?php echo $GLOBALS['$wgMetrolookImage1'] ?>" /></a></div></div><?php
else: ?><?php endif; ?><?php if ( $wgMetrolookTile6 ): ?><div
style="float:left;padding:5px;"><div class="tile"><a href="<?php echo
$GLOBALS['$wgMetrolookURL2'] ?>"><img src="<?php echo
$GLOBALS['$wgMetrolookImage2'] ?>" /></a></div></div><?php else: ?><?php endif;
?><?php if ( $wgMetrolookTile7 ): ?><div style="float:left;padding:5px;"
id="jcctile"><div class="tile"><a href="<?php echo $GLOBALS['$wgMetrolookURL3']
?>"><img src="<?php echo $GLOBALS['$wgMetrolookImage4'] ?>"
/></a></div></div><?php else: ?><?php endif; ?><?php if ( $wgMetrolookTile8 ):
?><div style="float:left;padding:5px;"><div class="tile"><a href="<?php echo
$GLOBALS['$wgMetrolookURL4'] ?>"><img src="<?php echo
$GLOBALS['$wgMetrolookImage4'] ?>" /></a></div></div><?php else: ?><?php endif;
?><?php if ( $wgMetrolookTile9 ): ?><div style="float:left;padding:5px;"><div
class="tile"><a href="<?php echo $GLOBALS['$wgMetrolookURL5'] ?>"><img
src="<?php echo $GLOBALS['$wgMetrolookImage5'] ?>" /></a></div></div><?php
else: ?><?php endif; ?><?php if ( $wgMetrolookTile10 ): ?><div
style="float:left;padding:5px;"><div class="tile"><a href="<?php echo
$GLOBALS['$wgMetrolookURL6'] ?>"><img src="<?php echo
$GLOBALS['$wgMetrolookImage6'] ?>" /></a></div></div><?php else: ?><?php endif;
?>
+
+<?php endif; ?>
</div></div></div>
</div>
@@ -409,27 +310,53 @@
<?php else: ?>
<?php endif; ?>
<div id="left-navigation">
- <?php if ( $UploadButton ): ?><a href="<?php
echo $this->data['nav_urls']['upload']['href']; ?>"><div class="onhoverbg"
style="padding-left:0.8em;padding-right:0.8em;float:left;height:40px;font-size:10pt;"><img
class="custom" src="<?php echo htmlspecialchars(
$this->getSkin()->getSkinStylePath( 'images/Transparent.gif' ) ) ?>" /> <span
style="color:#fff;position:relative;top:3px; "><?php $this->msg('uploadbtn')
?></span></div></a><?php else: ?><?php endif; ?><?php $this->renderNavigation(
array( 'NAMESPACES', 'VARIANTS', 'VIEWS', 'ACTIONS' ) ); ?>
+ <?php if ( $wgMetrolookUploadButton ): ?><a
href="<?php echo $this->data['nav_urls']['upload']['href']; ?>"><div
class="onhoverbg"
style="padding-left:0.8em;padding-right:0.8em;float:left;height:40px;font-size:10pt;"><img
class="uploadbutton" src="<?php echo htmlspecialchars(
$this->getSkin()->getSkinStylePath( 'images/Transparent.gif' ) ) ?>" /> <span
style="color:#fff;position:relative;top:3px; "><?php $this->msg('uploadbtn')
?></span></div></a><?php else: ?><?php endif; ?><?php $this->renderNavigation(
array( 'NAMESPACES', 'VARIANTS', 'VIEWS', 'ACTIONS' ) ); ?>
</div>
+
+ <div id="editbutton"><img class="editbutton"
src="<?php echo htmlspecialchars( $this->getSkin()->getSkinStylePath(
'images/Transparent.gif' ) ) ?>" /></div>
+ <?php if ( $wgMetrolookSearchBar ): ?>
+ <img class="searchbar" src="<?php echo
htmlspecialchars( $this->getSkin()->getSkinStylePath( 'images/Transparent.gif'
) ) ?>" />
+ <?php else: ?>
+ <?php endif; ?>
+
<div id="right-navigation">
- <?php if ( $SearchBar ): ?>
+ <?php if ( $wgMetrolookSearchBar ): ?>
<?php $this->renderNavigation( array( 'SEARCH'
) ); ?>
<?php else: ?>
- <?php endif; ?>
+ <?php endif; ?>
</div>
</div>
- <?php if ( $SearchBar ): ?>
+
+ <?php if ( $wgMetrolookSearchBar ): ?>
<div id="mw-panel">
+ <?php if ( $wgMetrolookLogo ): ?>
+ <div id="p-logo" role="banner"><a
style="background-image: url(<?php
+ $this->text( 'logopath' )
+ ?>);" href="<?php
+ echo htmlspecialchars(
$this->data['nav_urls']['mainpage']['href'] )
+ ?>" <?php
+ echo Xml::expandAttributes(
Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) )
+ ?>></a></div>
+ <?php else: ?>
+ <?php endif; ?>
+ <?php $this->renderPortals(
$this->data['sidebar'] ); ?>
+ </div>
<?php else: ?>
<div id="mw-panel-custom">
- <?php endif; ?>
- <?php if ( $SearchBar ): ?>
- <?php $this->renderPortals(
$this->data['sidebar'] ); ?>
+ <?php if ( $wgMetrolookLogo ): ?>
+ <div id="p-logo" role="banner"><a
style="background-image: url(<?php
+ $this->text( 'logopath' )
+ ?>);" href="<?php
+ echo htmlspecialchars(
$this->data['nav_urls']['mainpage']['href'] )
+ ?>" <?php
+ echo Xml::expandAttributes(
Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) )
+ ?>></a></div>
<?php else: ?>
+ <?php endif; ?>
<?php $this->renderNavigation( array( 'SEARCH'
) ); ?>
<?php $this->renderPortals(
$this->data['sidebar'] ); ?>
- <?php endif; ?>
</div>
+ <?php endif; ?>
</div>
<?php $this->printTrail(); ?>
@@ -460,7 +387,7 @@
if ( $content === false ) {
continue;
}
-
+
// Numeric strings gets an integer when set as key,
cast back - T73639
$name = (string)$name;
@@ -489,14 +416,14 @@
* @param null|string|array $hook
*/
protected function renderPortal( $name, $content, $msg = null, $hook =
null ) {
- global $SearchBar;
+ global $wgMetrolookSearchBar;
if ( $msg === null ) {
$msg = $name;
}
$msgObj = wfMessage( $msg );
?>
- <?php if ( $SearchBar ): ?>
+ <?php if ( $wgMetrolookSearchBar ): ?>
<div class="portal" role="navigation" id='<?php
echo Sanitizer::escapeId( "p-$name" )
?>'<?php
@@ -517,7 +444,7 @@
echo htmlspecialchars( $msgObj->exists() ?
$msgObj->text() : $msg );
?></h5>
- <?php if ( $SearchBar ): ?>
+ <?php if ( $wgMetrolookSearchBar ): ?>
<div class="body">
<?php else: ?>
<div class="body-custom">
@@ -559,7 +486,7 @@
* @param array $elements
*/
protected function renderNavigation( $elements ) {
- global $SearchBar;
+ global $wgMetrolookSearchBar;
// If only one element was given, wrap it in an array, allowing
more
// flexible arguments
@@ -664,7 +591,10 @@
?>><span><a
href="<?php
echo htmlspecialchars( $link['href'] )
?>" <?php
-
echo $link['key']
+
echo $link['key'];
+
if ( isset ( $link['rel'] ) ) {
+
echo ' rel="' . htmlspecialchars( $link['rel'] ) . '"';
+
}
?>><?php
// $link['text'] can be undefined - bug 27764
if ( array_key_exists( 'text', $link ) ) {
@@ -682,7 +612,7 @@
break;
case 'ACTIONS':
?>
- <div id="p-cactions" role="navigation"
class="vectorMenu<?php
+ <div id="p-cactions" role="navigation"
class="vectorMenu actionmenu<?php
if ( count( $this->data['action_urls']
) == 0 ) {
echo ' emptyPortlet';
}
@@ -731,7 +661,7 @@
break;
case 'SEARCH':
?>
- <?php if ( $SearchBar ): ?>
+ <?php if ( $wgMetrolookSearchBar ): ?>
<div id="p-search" role="search">
<h5<?php $this->html(
'userlangattributes' ) ?>>
<label
for="searchInput"><?php $this->msg( 'search' ) ?></label>
diff --git a/README.md b/README.md
index a2aeacd..0acab05 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@
Please be aware that there are issues in the codes if you see any could you
point it out it would help. and there are things like logos already set sorry i
will put a setting there.
-A working demo of the skin is available at
http://www.pidgi.net/metrolooktest/index.php/Main_Page . This is currently
using MediaWiki 1.25wmf12 and version 3.0 beta 13 of the master branch of the
skin.
+A working demo of the skin is available at
http://www.pidgi.net/metrolooktest/index.php/Main_Page . This is currently
using MediaWiki 1.25wmf18 and a snapshot of the test branch of the skin.
## Installation
@@ -44,15 +44,34 @@
1.24 only
-|Setting|Default|To Enable|
-|-------|-------|---------|
-|logo| `false` | `$logo = true;`|
-|SearchBar| `false` | `$SearchBar = true;`|
-|DownArrow| `false` | `$DownArrow = true;`|
-|Line| `false` | `$Line = true;`|
-|UploadButton| `false` | `$UploadButton = true;`|
-|`$linkN`, `$imageN`<br>Where `N` is between 1 to 6. | `true` | `$link1 =
false;`<br>`$image1 = false;`<br>`$url1 = link of website;`<br>`$picture1 =
image link;`|
+|Setting|Default|To Enable|To Disable|
+|-------|-------|---------|----------|
+|wgMetrolookLogo| `false` | `$wgMetrolookLogo = true;`| `$wgMetrolookLogo =
false;`|
+|wgMetrolookSiteName| `true` | `$wgMetrolookSiteName = true;`|
`$wgMetrolookSiteName = false;`|
+|wgMetrolookSearchBar| `true` | `$wgMetrolookSearchBar = true;`|
`$wgMetrolookSearchBar = false;`|
+|wgMetrolookDownArrow| `true` | `$wgMetrolookDownArrow = true;`|
`$wgMetrolookDownArrow = false;`|
+|wgMetrolookLine| `true` | `$wgMetrolookLine = true;`| `$wgMetrolookLine =
false;`|
+|wgMetrolookUploadButton| `true` | `$wgMetrolookUploadButton = true;`|
`$wgMetrolookUploadButton = false;`|
+|wgMetrolookMobile| `true` | `$wgMetrolookMobile = true;`| `$wgMetrolookMobile
= false;`|
+|wgMetrolookBartile| `true` | `$wgMetrolookBartile = true;`|
`$wgMetrolookBartile = false;`|
+|`$wgMetrolookTileN`<br>Where `N` is between 1 to 4. | `true` |
`$wgMetrolookTile1 = true;`| `$wgMetrolookTile1 = false;` |
+|`$wgMetrolookTileN`<br>Where `N` is between 5 to 10. | | `$wgMetrolookTile5 =
true;`| `$wgMetrolookTile5 = false;` |
+|`$wgMetrolookURLN`, `$wgMetrolookImageN`<br>Where `N` is between 1 to 6. | |
`$wgMetrolookURL1 = link of website;`<br>`$wgMetrolookImage1 = image link;`| |
+$wgBartile is now used to disable the default tiles or enable them so you can
have the default tiles or set your self one.
+
+$link and $picture were removed in favour of using $wgMetrolookBartile and
$wgMetrolookURL1 and $wgMetrolookImage1
+
+$logo was removed in favour of $wgMetrolookLogo and $wgMetrolookSiteName.
+
+
+Note: Tile 5 to 10 is for when you disable bartile.
+
+Note: Image setting should be set like this for example $wgMetrolookImage1 =
file/to/image or can be set like http://example.com/image.png;
+
+## Mobile desgn
+
+Mobile is now out of preview and can be downloaded now.
## Customizing top bar color
@@ -61,7 +80,12 @@
and all you need to do is edit background-colour and the top bar should change
colour but please remember there is also hover which is when you hover it goes
a different colour.
```css
+
+/* Add your custom theme overrides here */
+
/* Top Bar colour and hover colour start */
+
+@import "mediawiki.mixins";
#mw-page-base {
height: 2.5em;
@@ -73,6 +97,18 @@
min-width: auto;
}
+@media (max-width:768px) {
+#mw-page-base {
+ height: 2.5em;
+ background-color: dodgerBlue;
+ background-position: bottom left;
+ background-repeat: repeat-x;
+ /* This image is only a fallback (for IE 6-9), so we do not @embed it.
*/
+ background-image: url('images/page-fade.png');
+ min-width: 24em;
+}
+}
+
@media only screen and (min-device-width : 768px) and (max-device-width :
1024px) and (orientation : portrait) {
#mw-page-base {
height: 2.5em;
@@ -81,9 +117,10 @@
background-repeat: repeat-x;
/* This image is only a fallback (for IE 6-9), so we do not @embed it.
*/
background-image: url('images/page-fade.png');
- min-width:65em;
+ min-width: 25em;
}
}
+
@media only screen and (min-device-width : 768px) and (max-device-width :
1024px) and (orientation : landscape) {
#mw-page-base {
height: 2.5em;
@@ -92,7 +129,7 @@
background-repeat: repeat-x;
/* This image is only a fallback (for IE 6-9), so we do not @embed it.
*/
background-image: url('images/page-fade.png');
- min-width:65em;
+ min-width: 64.7em;
}
}
@@ -104,7 +141,7 @@
background-color: blue;
}
-img.custom3:hover{
+img.downarrow:hover{
background-color: blue;
}
@@ -122,30 +159,41 @@
background-repeat: no-repeat;
.transition(background-position 250ms);
}
+
div.vectorMenu:hover {
background-color: blue;
}
div.vectorMenu ul {
- position: absolute;
- background-color: white;
border: solid 2px dodgerBlue;
- border-top-width: 0;
- list-style-type: none;
- list-style-image: none;
- padding: 0;
- padding-top:5px;
- margin: 0;
- margin-left: -6px;
- text-align: left;
+ border-top: none;
+
}
-/* Top Bar colour and hover colour end */
+@media (max-width: 768px) {
+#hamburgerIcon:hover {
+ background-color: blue;
+}
+
+img.editbutton:hover {
+ background-color: blue;
+}
+
+div.actionmenu ul {
+ border-top: solid 2px dodgerBlue;
+}
+
+#left-navigation {
+ background-color: dodgerBlue;
+}
+}
+
+/* Top Bar colour and hover colour */
```
## Known Issues
-* Mobile view of desktop is not shown correctly.
+* When i recent changes and are in mobile view or on a mobile device bartitle
will show but is harder to click off it.
## Support coming soon
@@ -174,23 +222,4 @@
<link href='http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz:700'
defer="defer" rel='stylesheet' type='text/css'>
<meta name="msapplication-TileImage"
content="http://www.pidgi.net/new/public/images/pidgiwiki.png"/>
<meta name="msapplication-TileColor" content="#BE0027"/>
-```
-
-```html
-<?php if ( $Logoshow ): ?>
- <div id="p-logo" role="banner">
- <a
- style="background-image: url(<?php
- $this->text( 'logopath' )
- ?>);"
- href="<?php
- echo htmlspecialchars(
$this->data['nav_urls']['mainpage']['href'] )
- ?>">
- <?php
- echo Xml::expandAttributes(
Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) )
- ?>
- </a>
- </div>
- <?php else: ?>
-<?php endif; ?>
```
diff --git a/SkinMetrolook.php b/SkinMetrolook.php
index 60be49a..842f081 100644
--- a/SkinMetrolook.php
+++ b/SkinMetrolook.php
@@ -32,10 +32,10 @@
/**
* @var Config
*/
- private $vectorConfig;
+ private $metrolookConfig;
- public function __construct( Config $config ) {
- $this->vectorConfig =
ConfigFactory::getDefaultInstance()->makeConfig( 'metrolook' );
+ public function __construct() {
+ $this->metrolookConfig =
ConfigFactory::getDefaultInstance()->makeConfig( 'metrolook' );
}
protected static $bodyClasses = array( 'vector-animateLayout' );
@@ -69,7 +69,7 @@
parent::setupSkinUserCss( $out );
$styles = array( 'mediawiki.skinning.interface',
'skins.metrolook.styles' );
- wfRunHooks( 'SkinVectorStyleModules', array( $this, &$styles )
);
+ wfRunHooks( 'SkinMetrolookStyleModules', array( $this, &$styles
) );
$out->addModuleStyles( $styles );
}
@@ -77,7 +77,7 @@
* Override to pass our Config instance to it
*/
public function setupTemplate( $classname, $repository = false,
$cache_dir = false ) {
- return new $classname( $this->vectorConfig );
+ return new $classname( $this->metrolookConfig );
}
/**
diff --git a/components/collapsibleNav.less b/components/collapsibleNav.less
index 0cb663b..ea7dad6 100644
--- a/components/collapsibleNav.less
+++ b/components/collapsibleNav.less
@@ -9,9 +9,9 @@
h5 {
background-position: left center;
background-repeat: no-repeat;
-/* .background-image-svg('images/arrow-expanded.svg',
'images/arrow-expanded.png'); */
.background-image-svg('images/open.svg',
'images/open.png');
padding: @collapsible-nav-heading-padding;
+ margin-left: -0.5em;
&:hover {
cursor: pointer;
@@ -67,7 +67,6 @@
color: @collapsible-nav-heading-collapsed-color;
background-position: left center;
background-repeat: no-repeat;
-/*
.background-image-svg('images/arrow-collapsed-ltr.svg',
'images/arrow-collapsed-ltr.png'); */
.background-image-svg('images/closed-ltr.svg',
'images/closed-ltr.png');
&:hover {
@@ -100,9 +99,9 @@
h5 {
background-position: left center;
background-repeat: no-repeat;
-/* .background-image-svg('images/arrow-expanded.svg',
'images/arrow-expanded.png'); */
.background-image-svg('images/open.svg',
'images/open.png');
padding: @collapsible-nav-heading-padding;
+ margin-left: -0.5em;
&:hover {
cursor: pointer;
@@ -158,7 +157,6 @@
color: @collapsible-nav-heading-collapsed-color;
background-position: left center;
background-repeat: no-repeat;
-/*
.background-image-svg('images/arrow-collapsed-ltr.svg',
'images/arrow-collapsed-ltr.png'); */
.background-image-svg('images/closed-ltr.svg',
'images/closed-ltr.png');
&:hover {
diff --git a/components/common.less b/components/common.less
index aa35b08..efb989a 100644
--- a/components/common.less
+++ b/components/common.less
@@ -26,6 +26,74 @@
background-color: #f3f3f3;
}
+body {
+ height: 100%;
+}
+html {
+ height: 100%;
+}
+html,
+body {
+ margin: 0px 0px 0px 0px;
+ padding: 0px 0px 0px 0px;
+ height: 100%;
+}
+#top-tile-bar {
+ background:transparent;
+ left: 0px;
+ height: 200px;
+ position: fixed;
+ z-index: 100;
+}
+.tilebar {
+ position: relative;
+ left: 0px;
+ top: 0px;
+ right: 0px;
+ bottom: 0px;
+ align:right;
+ color:#fff;
+ background:#1D1D1D;
+ width: 21474836.47em;
+ height: 200px;
+ display: block;
+ z-index: 9999999;
+}
+.tile:hover {
+ outline: 3px #4A4A4A solid;
+}
+.onhoverbg:hover {
+ background: #9F6F40;
+}
+
+.topleft {
+ display: inline;
+ position: relative;
+}
+
+.topright .hover {
+ display: none;
+ position: absolute;
+ left:0;
+ z-index: 2000;
+ height: 200px;
+}
+
+img.editbutton {
+ display: none;
+}
+
+#tilegrouptable {
+ height: 130px;
+ padding: 0;
+ border-spacing: 0;
+}
+
+#tilegroup {
+ padding: 35px;
+ height: 130px;
+}
+
/* Content */
.mw-body {
margin-left: 10em;
@@ -191,50 +259,49 @@
}
}
-img.custom {
+img.uploadbutton {
position:inherit;
.background-image-svg('images/uploadlogo.svg', 'images/uploadlogo.png');
- width:26px; /* width of your image */
- height:35px; /* height of your image */
- margin:0; /* If you want no margin */
- padding:0; /* if your want to padding */
+ width: 26px; /* width of your image */
+ height: 35px; /* height of your image */
+ margin: 0; /* If you want no margin */
+ padding: 0; /* if your want to padding */
background-repeat: no-repeat;
}
-img.custom2 {
- position:inherit;
+img.line {
+ position: inherit;
.background-image-svg('images/line.svg', 'images/line.png');
- width:28px; /* width of your image */
- height:35px; /* height of your image */
- margin:0; /* If you want no margin */
- padding:0; /* if your want to padding */
+ width: 28px; /* width of your image */
+ height: 35px; /* height of your image */
+ margin: 0; /* If you want no margin */
+ padding: 0; /* if your want to padding */
background-repeat: no-repeat;
}
-img.custom3 {
- position:inherit;
+img.downarrow {
+ position: inherit;
.background-image-svg('images/downarrow.svg', 'images/downarrow.png');
- margin:-26px; /* If you want no margin */
- padding:0; /* if your want to padding */
- background-repeat: no-repeat;
- background-position: -0px 20px
-}
-img.custom3:hover {
- position:inherit;
- background: #9F6F40;
- .background-image-svg('images/downarrow.svg', 'images/downarrow.png');
- margin:-26px; /* If you want no margin */
- padding:0; /* if your want to padding */
+ margin: -26px; /* If you want no margin */
+ padding: 0; /*if your want to padding */
background-repeat: no-repeat;
background-position: -0px 20px;
}
-img.custom4 {
- .background-image-svg('images/user-icon.svg', 'images/user-icon.png');
- width:26px; /* width of your image */
- height:35px; /* height of your image */
- margin:0; /* If you want no margin */
- padding:0; /* if your want to padding */
+
+img.downarrow:hover {
+ position: inherit;
+ background: #9F6F40;
+ .background-image-svg('images/downarrow.svg', 'images/downarrow.png');
+ margin: -26px; /* If you want no margin */
+ padding: 0; /*if your want to padding */
background-repeat: no-repeat;
+ background-position: -0px 20px;
+}
+
+#hamburgerIcon {
+ position: fixed;
+ top: 40px;
+ z-index: 0;
}
/* Hide empty portlets */
diff --git a/components/mobile.less b/components/mobile.less
new file mode 100644
index 0000000..bc7f49a
--- /dev/null
+++ b/components/mobile.less
@@ -0,0 +1,745 @@
+@import "mediawiki.mixins";
+
+/* different screen sizes */
+
+
+@media only screen and (min-device-width: 481px) and (max-device-width:
1024px) and (orientation:landscape) {
+img.searchbar {
+ display: none;
+}
+
+div#mw-panel {
+ font-size: @menu-main-font-size;
+ position: absolute;
+ top: 40px;
+ bottom: 0;
+ height: auto;
+ overflow-y: auto;
+ overflow-x: hidden;
+ padding-top: 1em;
+ width: 9.5em;
+ left: 0;
+
+ div.portal {
+ margin: 0 0.6em 0 0.7em;
+ padding: 0.25em 0;
+ direction: ltr;
+ background-position: top left;
+ background-repeat: no-repeat;
+ .background-image('images/portal-break.png');
+
+ h5 {
+ font-family: 'Segoe UI Light', Segoe UI, sans-serif;
+ font-weight: 100;
+ font-size: 1em;
+ color: #444444;
+ margin: 0;
+ padding: @menu-main-heading-padding;
+ cursor: default;
+ border: none;
+ }
+
+ div.body {
+ margin: @menu-main-body-margin;
+ padding-top: 0;
+
+ ul {
+ list-style-type: none;
+ list-style-image: none;
+ margin: 0;
+ padding: @menu-main-body-padding;
+
+ li {
+ line-height: 1.125em;
+ margin: 0;
+ padding: 0.25em 0;
+ font-size: @menu-main-body-font-size;
+ word-wrap: break-word;
+
+ a {
+ color:
@menu-main-body-link-color;
+ &:visited {
+ color:
@menu-main-body-link-visited-color;
+ }
+ }
+ }
+ }
+ }
+
+ &.first {
+ background-image: none;
+ margin-top: 0;
+ h5 {
+ display: none;
+ }
+ div.body {
+ margin-left: 0.5em;
+ }
+ }
+ }
+}
+
+div#mw-panel-custom {
+ font-size: @menu-main-font-size;
+ position: absolute;
+ top: 40px;
+ bottom: 0;
+ height: auto;
+ overflow: hidden;
+ padding-top: 1em;
+ width: 11em;
+ left: 0;
+
+ div.portal-custom {
+ margin: 0 0.6em 0 0.7em;
+ padding: 0.25em 0;
+ direction: ltr;
+ background-position: top left;
+ background-repeat: no-repeat;
+ .background-image('images/portal-break.png');
+
+ h5 {
+ font-family: 'Segoe UI Light', Segoe UI, sans-serif;
+ font-weight: 100;
+ font-size: 1em;
+ color: #444444;
+ padding: 0.25em;
+ padding-top: 0;
+ padding-left: 17px;
+ padding-bottom: 0;
+ margin-bottom:0;
+ cursor: default;
+ border: none;
+ }
+
+ div.body-custom {
+ margin: @menu-main-body-margin;
+ padding-top: 0;
+
+ ul {
+ list-style-type: none;
+ list-style-image: none;
+ margin: 0;
+ padding: @menu-main-body-padding;
+
+ li {
+ line-height: 1.125em;
+ margin: 0;
+ padding: 0.25em 0;
+ font-size: @menu-main-body-font-size;
+ word-wrap: break-word;
+
+ a {
+ color:
@menu-main-body-link-color;
+ &:visited {
+ color:
@menu-main-body-link-visited-color;
+ }
+ }
+ }
+ }
+ }
+
+ &.first {
+ background-image: none;
+ margin-top: 0;
+ h5 {
+ display: none;
+ }
+ div.body-custom {
+ margin-left: 0.5em;
+ }
+ }
+ }
+}
+
+.mw-body {
+ margin-left: 11em;
+ padding: 1.25em 1.5em 1.5em 1.5em;
+ /* @embed */
+ background-image: url(images/border.png);
+ background-position: top left;
+ background-repeat: repeat-y;
+ background-color: white;
+ color: black;
+ direction: ltr;
+ height: auto;
+ position: absolute;
+ bottom: 0;
+ right: -0.7em;
+ left: 0;
+ top: 40px;
+ overflow: auto;
+ -webkit-overflow-scrolling: touch;
+
+ .mw-editsection,
+ .mw-editsection-like {
+ font-family: @content-font-family;
+ }
+
+ p {
+ line-height: inherit;
+ margin: 0.5em 0;
+ }
+
+ h1,
+ h2,
+ #firstHeading {
+ font-family: @content-heading-font-family;
+ line-height: @heading-line-height;
+ margin-bottom: 0.25em;
+ padding: 0;
+ }
+
+ h1,
+ #firstHeading {
+ font-size: @content-heading-font-size;
+ }
+
+ h2 {
+ font-size: 1.5em;
+ margin-top: 1em;
+ }
+
+ h3,
+ h4,
+ h5,
+ h6 {
+ line-height: @content-line-height;
+ margin-top: 0.3em;
+ margin-bottom: 0;
+ padding-bottom: 0;
+ }
+
+ h3 {
+ font-size: 1.17em;
+ }
+
+ h3,
+ h4 {
+ font-weight: bold;
+ }
+
+ h4,
+ h5,
+ h6 {
+ font-size: 100%; /* (reset) */
+ }
+
+ #toc h2,
+ .toc h2 {
+ font-size: 100%; /* (reset) */
+ font-family: @content-font-family;
+ }
+}
+
+div#mw-head {
+ position: absolute;
+ top: 0;
+ min-width: 101%;
+
+ h5 {
+ margin: 0;
+ padding: 0;
+ }
+}
+
+#mw-page-base {
+ height: 2.5em;
+ background-color: CF8B54;
+ background-position: bottom left;
+ background-repeat: repeat-x;
+ /* This image is only a fallback (for IE 6-9), so we do not @embed it.
*/
+ background-image: url('images/page-fade.png');
+ min-width: 64.7em;
+}
+
+#p-search {
+ /* @noflip */
+ float: left;
+ margin-right: 0.5em;
+ margin-left: 0.5em;
+
+ h5 {
+ display: none;
+ }
+
+ form,
+ input {
+ margin: 0;
+ margin-top: 0.4em;
+ }
+}
+
+}
+
+@media only screen and (min-device-width: 481px) and (max-device-width:
1024px) and (orientation:portrait) {
+img.searchbar {
+ display: none;
+}
+
+#echoNotifications {
+ float: right;
+ top: 0.3em;
+ position: relative;
+ margin-right: 30px;
+ margin-left: 1em;
+}
+
+div#mw-panel {
+ font-size: @menu-main-font-size;
+ position: absolute;
+ top: 40px;
+ bottom: 0;
+ height: auto;
+ overflow-y: auto;
+ overflow-x: hidden;
+ padding-top: 1em;
+ width: 9.5em;
+ left: 0;
+
+ div.portal {
+ margin: 0 0.6em 0 0.7em;
+ padding: 0.25em 0;
+ direction: ltr;
+ background-position: top left;
+ background-repeat: no-repeat;
+ .background-image('images/portal-break.png');
+
+ h5 {
+ font-family: 'Segoe UI Light', Segoe UI, sans-serif;
+ font-weight: 100;
+ font-size: 1em;
+ color: #444444;
+ margin: 0;
+ padding: @menu-main-heading-padding;
+ cursor: default;
+ border: none;
+ }
+
+ div.body {
+ margin: @menu-main-body-margin;
+ padding-top: 0;
+
+ ul {
+ list-style-type: none;
+ list-style-image: none;
+ margin: 0;
+ padding: @menu-main-body-padding;
+
+ li {
+ line-height: 1.125em;
+ margin: 0;
+ padding: 0.25em 0;
+ font-size: @menu-main-body-font-size;
+ word-wrap: break-word;
+
+ a {
+ color:
@menu-main-body-link-color;
+ &:visited {
+ color:
@menu-main-body-link-visited-color;
+ }
+ }
+ }
+ }
+ }
+
+ &.first {
+ background-image: none;
+ margin-top: 0;
+ h5 {
+ display: none;
+ }
+ div.body {
+ margin-left: 0.5em;
+ }
+ }
+ }
+}
+
+div#mw-panel-custom {
+ font-size: @menu-main-font-size;
+ position: absolute;
+ top: 40px;
+ bottom: 0;
+ height: auto;
+ overflow: hidden;
+ padding-top: 1em;
+ width: 11em;
+ left: 0;
+
+ div.portal-custom {
+ margin: 0 0.6em 0 0.7em;
+ padding: 0.25em 0;
+ direction: ltr;
+ background-position: top left;
+ background-repeat: no-repeat;
+ .background-image('images/portal-break.png');
+
+ h5 {
+ font-family: 'Segoe UI Light', Segoe UI, sans-serif;
+ font-weight: 100;
+ font-size: 1em;
+ color: #444444;
+ padding: 0.25em;
+ padding-top: 0;
+ padding-left: 17px;
+ padding-bottom: 0;
+ margin-bottom:0;
+ cursor: default;
+ border: none;
+ }
+
+ div.body-custom {
+ margin: @menu-main-body-margin;
+ padding-top: 0;
+
+ ul {
+ list-style-type: none;
+ list-style-image: none;
+ margin: 0;
+ padding: @menu-main-body-padding;
+
+ li {
+ line-height: 1.125em;
+ margin: 0;
+ padding: 0.25em 0;
+ font-size: @menu-main-body-font-size;
+ word-wrap: break-word;
+
+ a {
+ color:
@menu-main-body-link-color;
+ &:visited {
+ color:
@menu-main-body-link-visited-color;
+ }
+ }
+ }
+ }
+ }
+
+ &.first {
+ background-image: none;
+ margin-top: 0;
+ h5 {
+ display: none;
+ }
+ div.body-custom {
+ margin-left: 0.5em;
+ }
+ }
+ }
+}
+
+.mw-body {
+ margin-left: 11em;
+ padding: 1.25em 1.5em 1.5em 1.5em;
+ /* @embed */
+ background-image: url(images/border.png);
+ background-position: top left;
+ background-repeat: repeat-y;
+ background-color: white;
+ color: black;
+ direction: ltr;
+ height: auto;
+ position: absolute;
+ bottom: 0;
+ right: 0;
+ left: 0;
+ top: 40px;
+ overflow: auto;
+ -webkit-overflow-scrolling: touch;
+
+ .mw-editsection,
+ .mw-editsection-like {
+ font-family: @content-font-family;
+ }
+
+ p {
+ line-height: inherit;
+ margin: 0.5em 0;
+ }
+
+ h1,
+ h2,
+ #firstHeading {
+ font-family: @content-heading-font-family;
+ line-height: @heading-line-height;
+ margin-bottom: 0.25em;
+ padding: 0;
+ }
+
+ h1,
+ #firstHeading {
+ font-size: @content-heading-font-size;
+ }
+
+ h2 {
+ font-size: 1.5em;
+ margin-top: 1em;
+ }
+
+ h3,
+ h4,
+ h5,
+ h6 {
+ line-height: @content-line-height;
+ margin-top: 0.3em;
+ margin-bottom: 0;
+ padding-bottom: 0;
+ }
+
+ h3 {
+ font-size: 1.17em;
+ }
+
+ h3,
+ h4 {
+ font-weight: bold;
+ }
+
+ h4,
+ h5,
+ h6 {
+ font-size: 100%; /* (reset) */
+ }
+
+ #toc h2,
+ .toc h2 {
+ font-size: 100%; /* (reset) */
+ font-family: @content-font-family;
+ }
+}
+
+div#mw-head {
+ position: absolute;
+ top: 0;
+ min-width: 92.750%;
+
+ h5 {
+ margin: 0;
+ padding: 0;
+ }
+}
+
+#p-search {
+ /* @noflip */
+ float: left;
+ margin-right: 0.5em;
+ margin-left: 0.5em;
+ padding-right: 4em;
+
+ h5 {
+ display: none;
+ }
+
+ form,
+ input {
+ margin: 0;
+ margin-top: 0.4em;
+ }
+}
+}
+
+@media (max-width: 768px) {
+
+div#mw-head {
+ position: absolute;
+ top: 0;
+ min-width: 97%;
+
+ h5 {
+ margin: 0;
+ padding: 0;
+ }
+}
+
+img.hamburger {
+ .background-image-svg('images/hamburger.svg', 'images/hamburger.png');
+ width: 26px; /* width of your image */
+ height: 35px; /*height of your image */
+ margin: 0; /* If you want no margin */
+ padding: 0; /* if your want to padding */
+ background-repeat: no-repeat;
+}
+
+img.searchbar {
+ .background-image-svg('images/search-ltr.svg', 'images/search-ltr.png');
+ width: 26px; /* width of your image */
+ height: 35px; /* height of your image */
+ background-repeat: no-repeat;
+ margin-right: -4.5em;
+ margin-top: 1em;
+ float: right;
+}
+
+img.editbutton {
+ .background-image-svg('images/edit-icon.svg', 'images/edit-icon.png');
+ width: 36px; /* width of your image */
+ height: 35px; /* height of your image */
+ background-repeat: no-repeat;
+ cursor: pointer;
+ display: block;
+ float: right;
+ margin: 8px;
+ margin-left: 0em;
+ margin-top: -0;
+}
+
+img.editbutton:hover {
+ cursor: pointer;
+ display: block;
+ float: right;
+ margin: 8px;
+ margin-left: 0em;
+ margin-top: -0;
+ background-color: #9F6F40;
+}
+
+.tilebar {
+ cursor: pointer;
+ overflow-x: scroll;
+ overflow-y: scroll;
+}
+
+#usermenu {
+ right: -0.8em;
+ padding-right: 0px;
+ padding-left: 5px;
+}
+
+#left-navigation {
+ display: none;
+ position: fixed;
+ top: auto;
+ bottom: 0px;
+ left: auto;
+ z-index: 1000;
+ list-style: none;
+ padding: 0;
+ margin: 0 auto;
+ line-height: 1.5em;
+ background: #CF8B54;
+ width: 100%;
+ text-align: center;
+}
+
+#echoNotifications {
+ float: right;
+ top: 0.3em;
+ position: relative;
+ margin-right: -7px;
+ margin-left: 0.7em;
+}
+
+#p-search {
+ /* @noflip */
+ float: left;
+ margin-right: 1em;
+ margin-left: 0.5em;
+
+ h5 {
+ display: none;
+ }
+
+ form,
+ input {
+ margin: 0;
+ margin-top: 0.4em;
+ }
+}
+
+#username-text {
+ display: none;
+}
+
+#siteLogoBar {
+ float: none;
+ margin: 0 auto;
+}
+
+div#mw-panel {
+ display: none;
+ top: 40px;
+ background: #f3f3f3;
+}
+
+div#mw-panel-custom {
+ display: none;
+ top: 40px;
+ background: #f3f3f3;
+}
+
+.mw-body {
+ top: 40px;
+ margin-left: 0;
+}
+
+#hamburgerIcon {
+ position: static;
+ top: auto;
+ width: 50px;
+ height: 40px;
+ float: left;
+ display: block;
+ padding-left: 0.3em;
+}
+
+#hamburgerIcon:hover {
+ background: #9F6F40;
+}
+
+#hamburgerIcon img {
+ padding: 0 10px;
+}
+
+#hamburgerIcon span {
+ display: none;
+}
+
+#userIcon20 {
+ display: none;
+}
+
+#userIcon40 {
+ display: block;
+}
+
+div.actionmenu ul {
+ position: fixed;
+ border: 0;
+ border-top: solid 2px #CF8B54;
+ margin-left: 0;
+ bottom: 40px;
+ right: -1.3em;
+ width: 100vw;
+}
+
+}
+
+@media (max-width: 600px) {
+
+#jcctile {
+ clear: left;
+}
+
+#tilegrouptable {
+ height: 200px;
+}
+
+#tilegroup {
+ padding: 35px;
+ vertical-align: middle;
+}
+
+#top-tile-bar {
+ height: 330px;
+}
+
+.tilebar {
+ height: 330px;
+}
+
+}
+
+@-ms-viewport { width: device-width; }
+@-o-viewport { width: device-width; }
+@viewport { width: device-width; }
diff --git a/components/navigation.less b/components/navigation.less
index 1bb43bc..ebaa689 100644
--- a/components/navigation.less
+++ b/components/navigation.less
@@ -21,30 +21,6 @@
.vertical-gradient(#CF8B54, #CF8B54, 50%, 100%);
min-width: auto;
}
-@media only screen and (min-device-width : 768px) and (max-device-width :
1024px) and (orientation : portrait) {
-#mw-page-base {
- height: 2.5em;
- background-color: #CF8B54;
- background-position: bottom left;
- background-repeat: repeat-x;
- /* This image is only a fallback (for IE 6-9), so we do not @embed it.
*/
- background-image: url('images/page-fade.png');
- .vertical-gradient(#CF8B54, #CF8B54, 50%, 100%);
- min-width:65em;
-}
-}
-@media only screen and (min-device-width : 768px) and (max-device-width :
1024px) and (orientation : landscape) {
-#mw-page-base {
- height: 2.5em;
- background-color: #CF8B54;
- background-position: bottom left;
- background-repeat: repeat-x;
- /* This image is only a fallback (for IE 6-9), so we do not @embed it.
*/
- background-image: url('images/page-fade.png');
- .vertical-gradient(#CF8B54, #CF8B54, 50%, 100%);
- min-width:65em;
-}
-}
#mw-head-base {
margin-top: -5em;
@@ -67,37 +43,23 @@
}
}
-@media only screen and (min-device-width : 768px) and (max-device-width :
1024px) {
- div#mw-head {
- position: absolute;
- top: 0;
- min-width:106%;
-
- h5 {
- margin: 0;
- padding: 0;
- }
-}
-}
-
/* Navigation Containers */
#left-navigation {
- float: initial;
- /* IE 6 double-margin bug fix */
- display: inline;
+ float: initial;
+ /* IE 6 double-margin bug fix */
+ display: inline;
}
#right-navigation {
- float: right;
+ float: right;
}
/* Logo */
#p-logo {
- position: absolute;
- top: -160px;
left: 0;
width: 10em;
height: 160px;
+ margin-bottom: 1em;
a {
display: block;
@@ -182,80 +144,6 @@
}
}
-/* Panel */
-@media only screen and (min-device-width : 768px) and (max-device-width :
1024px) {
-div#mw-panel {
- font-size: @menu-main-font-size;
- position: absolute;
- top: 40px;
- bottom: 0;
- height: auto;
- overflow-y: auto;
- overflow-x: hidden;
- padding-top: 1em;
- width: 9.5em;
- left: 0;
-
- div.portal {
- margin: 0 0.6em 0 0.7em;
- padding: 0.25em 0;
- direction: ltr;
- background-position: top left;
- background-repeat: no-repeat;
- .background-image('images/portal-break.png');
-
- h5 {
- font-family: 'Segoe UI Light', Segoe UI, sans-serif;
- font-weight: 100;
- font-size: 1em;
- color: #444444;
- margin: 0;
- padding: @menu-main-heading-padding;
- cursor: default;
- border: none;
- }
-
- div.body {
- margin: @menu-main-body-margin;
- padding-top: 0;
-
- ul {
- list-style-type: none;
- list-style-image: none;
- margin: 0;
- padding: @menu-main-body-padding;
-
- li {
- line-height: 1.125em;
- margin: 0;
- padding: 0.25em 0;
- font-size: @menu-main-body-font-size;
- word-wrap: break-word;
-
- a {
- color:
@menu-main-body-link-color;
- &:visited {
- color:
@menu-main-body-link-visited-color;
- }
- }
- }
- }
- }
-
- &.first {
- background-image: none;
- margin-top: 0;
- h5 {
- display: none;
- }
- div.body {
- margin-left: 0.5em;
- }
- }
- }
-}
-}
-
/* custom */
/* Panel */
@@ -330,82 +218,4 @@
}
}
}
-}
-
-/* custom */
-
-/* Panel */
-@media only screen and (min-device-width : 768px) and (max-device-width :
1024px) {
-div#mw-panel-custom {
- font-size: @menu-main-font-size;
- position: absolute;
- top: 40px;
- bottom: 0;
- height: auto;
- overflow: hidden;
- padding-top: 1em;
- width: 11em;
- left: 0;
-
- div.portal-custom {
- margin: 0 0.6em 0 0.7em;
- padding: 0.25em 0;
- direction: ltr;
- background-position: top left;
- background-repeat: no-repeat;
- .background-image('images/portal-break.png');
-
- h5 {
- font-family: 'Segoe UI Light', Segoe
UI, sans-serif;
- font-weight: 100;
- font-size: 1em;
- color: #444444;
- padding: 0.25em;
- padding-top: 0;
- padding-left: 17px;
- padding-bottom: 0;
- margin-bottom:0;
- cursor: default;
- border: none;
- }
-
- div.body-custom {
- margin: @menu-main-body-margin;
- padding-top: 0;
-
- ul {
- list-style-type: none;
- list-style-image: none;
- margin: 0;
- padding: @menu-main-body-padding;
-
- li {
- line-height: 1.125em;
- margin: 0;
- padding: 0.25em 0;
- font-size: @menu-main-body-font-size;
- word-wrap: break-word;
-
- a {
- color:
@menu-main-body-link-color;
- &:visited {
- color:
@menu-main-body-link-visited-color;
- }
- }
- }
- }
- }
-
- &.first {
- background-image: none;
- margin-top: 0;
- h5 {
- display: none;
- }
- div.body-custom {
- margin-left: 0.5em;
- }
- }
- }
-}
}
diff --git a/components/personalMenu.less b/components/personalMenu.less
index 4e093df..1f3aadd 100644
--- a/components/personalMenu.less
+++ b/components/personalMenu.less
@@ -30,6 +30,7 @@
white-space: nowrap;
}
}
+
#username-top {
color: #fff;
height:40px;
@@ -39,12 +40,59 @@
padding-top:1px;
font-family:sans-serif;
}
+
+#usermenu {
+ float:right;
+ background-image:none;
+ vertical-align:middle;
+ height:40px;
+ padding-left:10px;
+ padding-right:10px;
+ position:relative;
+ top:0px;
+ right:10px;
+ width:auto;
+ text-align:right;
+}
+
+img.userIcon20 {
+ .background-image-svg('images/user-icon-20.svg',
'images/user-icon-20.png');
+ width:20px; /*width of your image*/
+ height:37px; /*height of your image*/
+ margin:0; /* If you want no margin */
+ padding:0; /*if your want to padding */
+ background-repeat: no-repeat;
+}
+
+img.userIcon40 {
+ margin:0; /* If you want no margin */
+ padding:0; /*if your want to padding */
+ background-repeat: no-repeat;
+}
+
+#userIcon20 {
+ position:relative;
+ top:2px;
+ background-repeat: no-repeat;
+}
+
+#userIcon40 {
+ position:relative;
+ top:-0.4px;
+ display:none;
+ .background-image-svg('images/user-icon-40.svg',
'images/user-icon-40.png');
+ width:34px; /*width of your image*/
+ height:38px; /*height of your image*/
+ background-repeat: no-repeat;
+}
+
#echoNotifications {
float: right;
top: 0.3em;
position: relative;
margin-right: 20px;
}
+
#echoNotifications ul {
list-style: none;
}
diff --git a/components/search.less b/components/search.less
index 2e4022d..6a266c9 100644
--- a/components/search.less
+++ b/components/search.less
@@ -2,7 +2,7 @@
#p-search {
/* @noflip */
float: left;
- margin-right: 0.5em;
+ margin-right: 3.5em;
margin-left: 0.5em;
h5 {
diff --git a/components/tabs.less b/components/tabs.less
index 165775c..0fac3d2 100644
--- a/components/tabs.less
+++ b/components/tabs.less
@@ -95,7 +95,7 @@
}
a:hover {
- background:#9F6F40;
+ background:#9F6F40;
}
span {
@@ -142,9 +142,11 @@
.background-image('images/tab-break.png');
background-repeat: no-repeat;
background-position: bottom right;
- margin-left: -1px;
+ font-size: 1em;
+ height: 2.5em;
+ padding-right: 1px;
+ margin-right: -1px;
}
-
div.vectorMenu h5 a {
display: inline-block;
@@ -152,7 +154,7 @@
height: 2em;
background-color: #CF8B54;
.background-image-svg('images/arrow-down-icon.svg',
'images/arrow-down-icon.png');
- background-position: 50% 50%;
+ background-position: 100% 70%;
background-repeat: no-repeat;
.transition(background-position 250ms);
}
@@ -168,7 +170,7 @@
div.vectorMenuFocus h5 a {
.background-image-svg('images/arrow-down-focus-icon.svg',
'images/arrow-down-focus-icon.png');
- background-position: 100% 60%;
+ background-position: 100% 60%;
}
div.vectorMenu div.menu {
diff --git a/hooks.txt b/hooks.txt
index 9adeadd..f226ef3 100644
--- a/hooks.txt
+++ b/hooks.txt
@@ -1,6 +1,6 @@
Hooks provided by the Metrolook skin.
-'SkinVectorStyleModules': Called when defining the list of module styles to be
+'SkinMetrolookStyleModules': Called when defining the list of module styles to
be
loaded by the Vector skin.
$skin: SkinMetrolook object
&$styles: Array of module names whose style will be loaded for the skin
\ No newline at end of file
diff --git a/i18n/ast.json b/i18n/ast.json
new file mode 100644
index 0000000..2bcdfe9
--- /dev/null
+++ b/i18n/ast.json
@@ -0,0 +1,9 @@
+{
+ "@metadata": {
+ "authors": [
+ "Xuacu"
+ ]
+ },
+ "metrolook-desc": "Aspeutu Metrolook pa MediaWiki",
+ "metrolook-guest": "Invitáu"
+}
diff --git a/i18n/en-gb.json b/i18n/en-gb.json
new file mode 100644
index 0000000..e6b6cec
--- /dev/null
+++ b/i18n/en-gb.json
@@ -0,0 +1,9 @@
+{
+ "@metadata": {
+ "authors": [
+ "Caliburn"
+ ]
+ },
+ "metrolook-desc": "Metrolook skin for MediaWiki",
+ "metrolook-guest": "Guest"
+}
diff --git a/i18n/fr.json b/i18n/fr.json
index 50f7bc9..709dd79 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -1,8 +1,10 @@
{
"@metadata": {
"authors": [
- "Linedwell"
+ "Linedwell",
+ "Nicolapps"
]
},
+ "metrolook-desc": "Skin Metrolook pour MediaWiki",
"metrolook-guest": "Invité"
}
diff --git a/i18n/hi.json b/i18n/hi.json
new file mode 100644
index 0000000..df2accb
--- /dev/null
+++ b/i18n/hi.json
@@ -0,0 +1,9 @@
+{
+ "@metadata": {
+ "authors": [
+ "Siddhartha Ghai"
+ ]
+ },
+ "metrolook-desc": "मीडियाविकि के लिए मेट्रोलुक त्वचा",
+ "metrolook-guest": "अतिथि"
+}
diff --git a/i18n/it.json b/i18n/it.json
new file mode 100644
index 0000000..bf6f403
--- /dev/null
+++ b/i18n/it.json
@@ -0,0 +1,9 @@
+{
+ "@metadata": {
+ "authors": [
+ "Beta16"
+ ]
+ },
+ "metrolook-desc": "Skin Metrolook per MediaWiki",
+ "metrolook-guest": "Ospite"
+}
diff --git a/i18n/ko.json b/i18n/ko.json
index 61a637a..433c58f 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -4,6 +4,7 @@
"아라"
]
},
+ "skinname-metrolook": "메트로룩",
"metrolook-desc": "미디어위키를 위한 메트로룩 스킨",
"metrolook-guest": "손님"
}
diff --git a/i18n/uk.json b/i18n/uk.json
new file mode 100644
index 0000000..a62b1f2
--- /dev/null
+++ b/i18n/uk.json
@@ -0,0 +1,9 @@
+{
+ "@metadata": {
+ "authors": [
+ "Ата"
+ ]
+ },
+ "metrolook-desc": "Тема оформлення MediaWiki Metrolook",
+ "metrolook-guest": "Гість"
+}
diff --git a/images/closed-ltr.svg b/images/closed-ltr.svg
index 58b647f..604d2fb 100644
--- a/images/closed-ltr.svg
+++ b/images/closed-ltr.svg
@@ -11,7 +11,7 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
id="svg3902"
version="1.1"
- inkscape:version="0.48.5 r10040"
+ inkscape:version="0.91 r13725"
width="16"
height="16"
sodipodi:docname="closed-ltr.svg">
@@ -43,28 +43,27 @@
id="namedview3904"
showgrid="false"
inkscape:zoom="14.75"
- inkscape:cx="8"
- inkscape:cy="8"
+ inkscape:cx="-3.8983051"
+ inkscape:cy="13.169251"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
- inkscape:current-layer="g3940" />
+ inkscape:current-layer="svg3902" />
<g
id="g3940">
- <path
- style="fill:#777777"
- d="M 6.2972556,13.21162 8.9686936,10.423239 6.2570741,7.7116195 C
4.3223605,5.776906 3.9867319,5 5.0856361,5 5.9327359,5 7.8368497,6.2640451
9.317,7.8089892 l 2.691182,2.8089888 -2.8088096,2.691011 C 5.398278,16.950669
2.7985841,16.863446 6.2972556,13.21162 z"
- id="path3946"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#6e6e6e"
- d="M 6.2972556,13.21162 8.9686936,10.423239 6.2570741,7.7116195 C
4.3030466,5.7575921 3.9793315,5 5.0984132,5 6.7956112,5 11,9.0181278
11,10.640137 11,12.091406 6.6234717,16 4.9984576,16 4.1454639,16
4.6371555,14.944391 6.2972556,13.21162 z"
- id="path3944"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#656565"
- d="M 6.825686,13.685549 C 9.539201,10.797144 9.5331108,10.237502
6.7536337,7.0644512 4.9542966,5.0103285 5.1541118,5.0852642 7.7577249,7.4410108
L 11.008182,10.382022 8.317,13.191011 C 6.8368497,14.735955 5.4065673,16
5.1385948,16 4.8706222,16 5.6298133,14.958497 6.825686,13.685549 z"
- id="path3942"
- inkscape:connector-curvature="0" />
+ <g
+ id="g6344"
+ transform="matrix(0,-1.0678303,1,0,-1.0513636,17.902182)">
+ <path
+ style="fill:#6e6e6e;fill-opacity:1"
+ d="M 4.3978226,11.436911 1.875,8.8036522 l 0,-1.2959742 0,-1.295974
2.6141067,2.5044731 2.6141066,2.5044739 2.542143,-2.542144 2.5421437,-2.5421434
0,1.4439202 0,1.4439202 -2.6334272,2.522984 -2.6334275,2.522983
-2.5228227,-2.63326 z"
+ id="path6350"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#6e6e6e"
+ d="M 3.9134194,10.955202 1.875,8.785404 l 0,-1.28685 0,-1.28685
2.6141067,2.5044731 2.6141066,2.5044739 2.542143,-2.542144 2.5421437,-2.5421434
0,1.4558988 0,1.4558988 -2.169798,2.0384198 C 7.278991,13.659466
6.4369175,13.641342 3.9134194,10.955202 Z"
+ id="path6348"
+ inkscape:connector-curvature="0" />
+ </g>
</g>
</svg>
diff --git a/images/closed-rtl.svg b/images/closed-rtl.svg
index 9aa51a2..d65850b 100644
--- a/images/closed-rtl.svg
+++ b/images/closed-rtl.svg
@@ -11,7 +11,7 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
id="svg3912"
version="1.1"
- inkscape:version="0.48.5 r10040"
+ inkscape:version="0.91 r13725"
width="16"
height="16"
sodipodi:docname="closed-rtl.svg">
@@ -23,6 +23,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -42,28 +43,27 @@
id="namedview3914"
showgrid="false"
inkscape:zoom="14.75"
- inkscape:cx="8"
+ inkscape:cx="-3.8983051"
inkscape:cy="8"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
- inkscape:current-layer="g3964" />
+ inkscape:current-layer="svg3912" />
<g
id="g3964">
- <path
- style="fill:#777777"
- d="M 6.683,13.191011 3.9918176,10.382022 6.8006276,7.6910108 C
10.601722,4.0493314 13.201416,4.1365543 9.7027444,7.7883805 L
7.0313064,10.576761 9.7429259,13.28838 C 11.677639,15.223094 12.013268,16
10.914364,16 10.067264,16 8.1631503,14.735955 6.683,13.191011 z"
- id="path3970"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#6e6e6e"
- d="M 7.174314,13.685549 C 4.429903,10.764257 4.4492346,9.8660453
7.3144512,7.174314 10.772044,3.9260741 13.029094,4.4254515 9.7429259,7.7116195
L 7.0313064,10.423239 9.7027444,13.21162 C 11.598188,15.190036 11.934754,16
10.861405,16 10.029378,16 8.3701867,14.958497 7.174314,13.685549 z"
- id="path3968"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#656565"
- d="M 7.683,13.191011 4.9918176,10.382022 8.2422751,7.4410108 C
10.845888,5.0852642 11.045703,5.0103285 9.2463663,7.0644512 6.4668892,10.237502
6.460799,10.797144 9.174314,13.685549 10.370187,14.958497 11.129378,16
10.861405,16 10.593433,16 9.1631503,14.735955 7.683,13.191011 z"
- id="path3966"
- inkscape:connector-curvature="0" />
+ <g
+ transform="matrix(0,1,-1,0,18.712,2.358)"
+ id="g6423">
+ <path
+ style="fill:#6e6e6e;fill-opacity:1"
+ d="M 5.2239464,11.08674 2.53,8.4534812 2.53,7.157507 2.53,5.861533
5.3214223,8.3660061 8.1128446,10.87048 10.827422,8.328336 13.542,5.7861926 l
0,1.4439202 0,1.4439202 -2.812053,2.522984 L 7.9178929,13.72 5.2239464,11.08674
Z"
+ id="path6350"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#6e6e6e"
+ d="M 4.706686,10.605031 2.53,8.435233 l 0,-1.28685 0,-1.28685 L
5.3214223,8.3660061 8.1128446,10.87048 10.827422,8.328336 13.542,5.7861926 l
0,1.4558988 0,1.4558988 -2.316976,2.0384198 C 8.3005453,13.309295
7.4013537,13.291171 4.706686,10.605031 Z"
+ id="path6348"
+ inkscape:connector-curvature="0" />
+ </g>
</g>
</svg>
diff --git a/images/downarrow.svg b/images/downarrow.svg
index ce95300..8536858 100644
--- a/images/downarrow.svg
+++ b/images/downarrow.svg
@@ -11,7 +11,7 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
id="svg2995"
version="1.1"
- inkscape:version="0.48.5 r10040"
+ inkscape:version="0.91 r13725"
width="28"
height="40"
sodipodi:docname="downarrow.svg">
@@ -23,7 +23,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -43,25 +43,25 @@
id="namedview2997"
showgrid="false"
inkscape:zoom="5.9"
- inkscape:cx="3.5254237"
+ inkscape:cx="-26.220339"
inkscape:cy="18.939449"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg2995" />
- <path
- style="fill:#ffffff"
- d="m 10.700319,20.482581 c -3.6090094,-4.722627 -3.5895224,-8.210525
0.02059,-3.684584 l 2.708581,3.395711 2.785257,-3.345392 C 18.170471,14.499278
19,14.062373 19,15.381347 c 0,1.033131 -1.262629,3.394974 -2.805842,5.248538 L
13.388316,24 10.70032,20.482581 z"
- id="path3886"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ffffff"
- d="M 10.184201,19.839131 C 6.9239846,15.488413 7.4658076,12.846501
10.79758,16.848316 l 2.785256,3.345392 2.708581,-3.395711 c 1.951839,-2.44699
2.708582,-2.852373 2.708582,-1.450969 0,2.125368 -4.013626,7.390445
-5.633818,7.390445 -0.555556,0 -1.987447,-1.304254 -3.18198,-2.898342 z"
- id="path3884"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ffffff"
- d="m 10.4506,18.677235 c -2.3531074,-3.260456 -2.4279584,-3.510681
-0.376139,-1.257406 3.169496,3.480687 3.728511,3.488314 6.61368,0.09023
1.271522,-1.497568 2.311858,-2.448289 2.311858,-2.112711 0,0.335576
-1.262629,2.126692 -2.805843,3.980256 L 13.388315,22.747717 10.4506,18.677232 z"
- id="path3882"
- inkscape:connector-curvature="0" />
+ <g
+ id="g6344"
+ transform="matrix(1.0678303,0,0,1,5.9978182,9.929829)"
+ style="fill:#ffffff">
+ <path
+ style="fill:#ffffff;fill-opacity:1"
+ d="M 4.3978226,11.436911 1.875,8.8036522 l 0,-1.2959742 0,-1.295974
2.6141067,2.5044731 2.6141066,2.5044739 2.542143,-2.542144 2.5421437,-2.5421434
0,1.4439202 0,1.4439202 -2.6334272,2.522984 -2.6334275,2.522983
-2.5228227,-2.63326 z"
+ id="path6350"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#ffffff"
+ d="M 3.9134194,10.955202 1.875,8.785404 l 0,-1.28685 0,-1.28685
2.6141067,2.5044731 2.6141066,2.5044739 2.542143,-2.542144 2.5421437,-2.5421434
0,1.4558988 0,1.4558988 -2.169798,2.0384198 C 7.278991,13.659466
6.4369175,13.641342 3.9134194,10.955202 Z"
+ id="path6348"
+ inkscape:connector-curvature="0" />
+ </g>
</svg>
diff --git a/images/edit-icon.png b/images/edit-icon.png
new file mode 100644
index 0000000..815cd4f
--- /dev/null
+++ b/images/edit-icon.png
Binary files differ
diff --git a/images/edit-icon.svg b/images/edit-icon.svg
new file mode 100644
index 0000000..18e9276
--- /dev/null
+++ b/images/edit-icon.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="37.5"
+ height="37.5"
+ viewBox="0 0 744.09449 1052.3622"
+ id="svg3346"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="edit-icon.svg">
+ <defs
+ id="defs3348" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="14.29"
+ inkscape:cx="14.000287"
+ inkscape:cy="18.525418"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1366"
+ inkscape:window-height="705"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata3351">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <path
+ style="fill:#cdcdcd"
+ d="M -27.595681,864.08205 C -21.505171,822.58448 6.1067578,754.08397
16.6724,760.90664 l 5.707997,3.68285 60.38308,64.27695 60.382833,64.2746
-36.82723,11.50108 c -20.254807,6.32604 -61.163122,16.76425 -90.907507,23.19474
l -54.080974,11.69368 z m 557.493341,30.43048 -52.61778,-52.61806 0,-62.55039
0,-62.55038 -40.70896,-33.78613 -40.7092,-33.7838 L 284.4996,758.51638
173.13769,867.81133 101.78035,796.45413 30.422985,725.09461 140.21092,613.23074
249.99839,501.36453 201.70821,448.00387 153.41804,394.6455 l -69.587283,0
-69.587056,0 -31.570672,-31.57223 -31.57066,-31.56992 0,-64.5879 0,-64.58791
52.1240328,47.17155 52.1244932,47.17154 38.982358,-32.35197 38.982377,-32.35196
-41.514918,-63.3603 -41.514675,-63.3603 53.764363,0 53.7646,0 41.34239,41.34444
41.34262,41.34211 0,59.81437 0,59.81666 53.35967,48.2901 53.36011,48.29009
111.8656,-109.78924 111.86558,-109.7869 71.35736,71.35718 71.35715,71.3572
-109.29376,111.36263 -109.29349,111.36261 33.78547,40.70859 33.78544,40.70858
62.5509,0 62.55092,0 52.61755,52.61806 52.61779,52.61808 0,52.61807 0,52.61574
-3.38387,21.30355 c 0,0 -45.74377,-49.43988 -67.09826,-67.86713 C
674.2583,753.69847 674.2583,753.69847 674.2583,753.69847 l -71.81576,90.15229
46.73151,51.63645 46.7319,51.63877 -56.6954,0 -56.69512,0 z m
-148.14867,-279.8755 -22.85905,-22.6749 -85.50409,77.27016 c -38.98189,35.22955
-88.94872,82.56587 -85.50361,85.50378 35.33999,30.14272 4.12293,59.08336
193.86675,-140.09904 z m -44.76437,-48.68922 -30.71245,-26.60376
-85.50408,77.27016 c -34.26649,30.96887 -88.73782,82.33614 -85.50362,85.50379
30.55403,29.9362 -8.22321,55.42372 201.72015,-136.17019 z m
309.81642,-224.21509 -26.7859,-28.56702 -83.54041,92.97854 c -23.17378,25.79155
-88.5808,82.18298 -85.50385,85.50379 33.37682,36.0325 9.79854,43.19165
195.83016,-149.91531 z m -52.61776,-50.65483 -24.82224,-24.6405
-85.50407,87.08878 c -44.40708,45.22918 -89.0091,82.63781 -85.50363,85.50379
39.26682,32.10599 11.77978,41.23073 195.82994,-147.95207 z m 67.98302,-66.66951
-61.06531,-65.00097 34.24059,-41.25857 34.24055,-41.256238 74.3756,71.255078
74.37528,71.25742 -29.04923,35.00212 C 749.02973,302.9108 732.17954,298.93325
662.1663,224.40838 Z"
+ id="path10930"
+ inkscape:connector-curvature="0"
+
sodipodi:nodetypes="sscccsscscccccccccccccccccccccccccccccccccccccccccccccccccscccccccccsscccsscccsscccsscscccccss"
/>
+ </g>
+</svg>
diff --git a/images/hamburger.png b/images/hamburger.png
new file mode 100644
index 0000000..050c0c6
--- /dev/null
+++ b/images/hamburger.png
Binary files differ
diff --git a/images/hamburger.svg b/images/hamburger.svg
new file mode 100644
index 0000000..59a03b5
--- /dev/null
+++ b/images/hamburger.svg
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="37.5"
+ height="37.5"
+ viewBox="0 0 744.09449 1052.3622"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="hamburger.svg">
+ <defs
+ id="defs4">
+ <pattern
+ y="0"
+ x="0"
+ height="6"
+ width="6"
+ patternUnits="userSpaceOnUse"
+ id="EMFhbasepattern" />
+ <pattern
+ y="0"
+ x="0"
+ height="6"
+ width="6"
+ patternUnits="userSpaceOnUse"
+ id="EMFhbasepattern-5" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="6.29"
+ inkscape:cx="14.920665"
+ inkscape:cy="32.343871"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1366"
+ inkscape:window-height="705"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <image
+ width="1052.3622"
+ height="1052.3622"
+ preserveAspectRatio="none"
+ style="fill:#ffffff;image-rendering:optimizeQuality"
+
xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACx
jwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41
LjExR/NCNwAAALRJREFUWEftlLEJw0AQBL8LgftR6A4UuwE14FgduBMV4TrUxmsxxwWCP3gWjpfZ
gUk2uYmu1FrLqPzaFEigQBYFstw7EPsEH4lOdtrBFgYeMJPDTjvYFNjD/wXu8JvobqcdbO3AEVAg
SxiIfYXvRFc77WALA/VmLiiQpTtwga9EFzvtYGsHjoACWcJA7Bv8JLrZaQdbGKg3c0GBLN2BM3wm
OttpB1s7cAQUyKJAFgWy3CCwlhPwsK1XMCV7cQAAAABJRU5ErkJggg== "
+ id="image3344-3"
+ x="-907.15137"
+ y="-8.3729545e-005"
+ transform="scale(-1,1)" />
+ <rect
+ style="fill:#ffffff"
+ id="rect6720"
+ width="777.67285"
+ height="151.21416"
+ x="-3.6440258"
+ y="210.24545" />
+ <rect
+ style="fill:#ffffff"
+ id="rect6722"
+ width="777.67273"
+ height="154.97009"
+ x="-3.6440163"
+ y="448.57333" />
+ <rect
+ style="fill:#ffffff"
+ id="rect6724"
+ width="777.67285"
+ height="149.07863"
+ x="0.81750679"
+ y="681.73407" />
+ </g>
+</svg>
diff --git a/images/open.svg b/images/open.svg
index 9290109..a801256 100644
--- a/images/open.svg
+++ b/images/open.svg
@@ -11,7 +11,7 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
id="svg3826"
version="1.1"
- inkscape:version="0.48.5 r10040"
+ inkscape:version="0.91 r13725"
width="16"
height="16"
sodipodi:docname="open.svg">
@@ -42,29 +42,24 @@
id="namedview3828"
showgrid="false"
inkscape:zoom="14.75"
- inkscape:cx="8"
- inkscape:cy="8"
+ inkscape:cx="-3.8983051"
+ inkscape:cy="1.4177547"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
- inkscape:current-layer="g3880" />
+ inkscape:current-layer="svg3826" />
<g
- id="g3880"
- transform="translate(24.40678,-1.0169492)">
+ id="g6344"
+ transform="matrix(1.0678303,0,0,1,0.52781819,-0.350171)">
<path
- style="fill:#777777"
- d="m -19.173396,11.928186 c -3.613059,-3.7712203 -3.59355,-6.5564567
0.02061,-2.9422983 l 2.711619,2.7116203 2.788381,-2.6714388 c
1.957921,-1.8758076 2.78838,-2.2246953 2.78838,-1.171438 0,0.825
-1.264045,2.7110328 -2.808989,4.1911828 l -2.808989,2.691182 -2.691011,-2.80881
z"
- id="path3886"
+ style="fill:#6e6e6e;fill-opacity:1"
+ d="M 4.3978226,11.436911 1.875,8.8036522 l 0,-1.2959742 0,-1.295974
2.6141067,2.5044731 2.6141066,2.5044739 2.542143,-2.542144 2.5421437,-2.5421434
0,1.4439202 0,1.4439202 -2.6334272,2.522984 -2.6334275,2.522983
-2.5228227,-2.63326 z"
+ id="path6350"
inkscape:connector-curvature="0" />
<path
style="fill:#6e6e6e"
- d="m -19.690093,11.414363 c -3.263874,-3.474235 -2.721443,-5.5839146
0.614067,-2.3882938 l 2.78838,2.6714388 2.711619,-2.7116203 c
1.954028,-1.9540275 2.71162,-2.2777426 2.71162,-1.1586609 0,1.697198
-4.018128,5.9015872 -5.640137,5.9015872 -0.556179,0 -1.989676,-1.041503
-3.185549,-2.314451 z"
- id="path3884"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#656565"
- d="m -19.423396,10.486539 c -2.355747,-2.6036136 -2.430682,-2.8034288
-0.37656,-1.0040917 3.173051,2.7794777 3.732693,2.7855677 6.621098,0.072052
1.272948,-1.1958727 2.314451,-1.9550638 2.314451,-1.6870912 0,0.2679725
-1.264045,1.6982549 -2.808989,3.1784059 l -2.808989,2.691182
-2.941011,-3.250457 z"
- id="path3882"
+ d="M 3.9134194,10.955202 1.875,8.785404 l 0,-1.28685 0,-1.28685
2.6141067,2.5044731 2.6141066,2.5044739 2.542143,-2.542144 2.5421437,-2.5421434
0,1.4558988 0,1.4558988 -2.169798,2.0384198 C 7.278991,13.659466
6.4369175,13.641342 3.9134194,10.955202 Z"
+ id="path6348"
inkscape:connector-curvature="0" />
</g>
</svg>
diff --git a/images/uploadlogo.svg b/images/uploadlogo.svg
index 4c66405..276dbd4 100644
--- a/images/uploadlogo.svg
+++ b/images/uploadlogo.svg
@@ -11,7 +11,7 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
id="svg2985"
version="1.1"
- inkscape:version="0.48.5 r10040"
+ inkscape:version="0.91 r13725"
width="26"
height="40"
sodipodi:docname="uploadlogo.svg">
@@ -23,7 +23,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -43,15 +43,52 @@
id="namedview2987"
showgrid="false"
inkscape:zoom="12.95"
- inkscape:cx="13"
- inkscape:cy="15.667704"
+ inkscape:cx="-0.55212355"
+ inkscape:cy="15.664896"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg2985" />
- <path
- style="fill:#ffffff"
- d="M 3.6736487,29.135119 C -2.1539453,23.423119 -0.82803125,12.236876
6.0923817,8.729178 15.638772,3.8904693 26,9.711877 26,19.914181 26,31.603607
12.064165,37.359203 3.6736487,29.135119 z M 20.511765,26.713457 C
29.839647,17.582256 15.735239,3.5842143 6.2148717,12.524381 c
-3.839359,3.605377 -4.661386,7.32455 -2.572535,11.639162 3.287285,6.790027
11.3006313,8.001291 16.8694283,2.549914 z m -8.424328,-2.535351 c 0,-3.025929
-0.212283,-3.35573 -1.490632,-2.315839 -2.3952343,1.948436 -1.9205663,-2.238832
0.496877,-4.383192 1.917954,-1.701296 2.057064,-1.701296 3.975018,0
2.417444,2.14436 2.892111,6.331628 0.496878,4.383192 -1.278349,-1.039891
-1.490632,-0.71009 -1.490632,2.315839 0,1.940629 -0.44719,3.528416
-0.993755,3.528416 -0.546565,0 -0.993754,-1.587787 -0.993754,-3.528416 z M
9.1061737,14.069924 c 0,-0.535723 1.7887573,-0.974042 3.9750173,-0.974042
2.18626,0 3.975018,0.438319 3.975018,0.974042 0,0.535724 -1.788758,0.974043
-3.975018,0.974043 -2.18626,0 -3.9750173,-0.438319 -3.9750173,-0.974043 z"
- id="path3025"
- inkscape:connector-curvature="0" />
+ <g
+ id="g10564"
+ style="fill:#ffffff">
+ <path
+ sodipodi:nodetypes="ssssssss"
+ inkscape:connector-curvature="0"
+ id="path3025"
+ d="M 3.6736487,29.135119 C -2.1539453,23.423119 -0.1704381,12.512868
6.401262,8.9608382 15.458885,4.0651576 26,9.711877 26,19.914181 26,31.603607
12.064165,37.359203 3.6736487,29.135119 Z M 20.512,26.713457 C
29.839882,17.582256 15.735239,3.5842143 6.2148717,12.524381 2.3755127,16.129758
1.5534857,19.848931 3.6423367,24.163543 6.9296217,30.95357 14.943203,32.164834
20.512,26.713457 Z"
+ style="fill:#ffffff" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path5201"
+ d="m 8.8572622,13.679 q 0.1345238,-0.375 0.5380952,-0.5
0.4035726,-0.125 0.9416666,-0.125 0.538094,0 1.076188,0 0.5381,0 1.076194,0
0.538094,0 1.076188,0 0.538094,0 1.076194,0 0.538094,0 1.076188,0 0.538094,0
0.941666,0.125 0.403572,0.125 0.538094,0.5 0.134528,0.375 0,0.75
-0.134522,0.375 -0.538094,0.5 -0.403572,0.125 -0.941666,0.125 -0.538094,0
-1.076188,0 -0.5381,0 -1.076194,0 -0.538094,0 -1.076188,0 -0.538094,0
-1.076194,0 -0.538094,0 -1.076188,0 -0.538094,0 -0.9416666,-0.125
-0.4035714,-0.125 -0.5380952,-0.5 -0.1345244,-0.375 0,-0.75"
+ style="fill:#ffffff;fill-opacity:1" />
+ <g
+ id="g10550"
+ style="fill:#ffffff">
+ <path
+ style="fill:#ffffff;fill-opacity:1"
+ d="m 12.21674,17.918357 c 0.08325,-0.229882 0.249766,-0.383138
0.499531,-0.459768 0.249765,-0.07663 0.499531,-0.07663 0.749296,0
0.249765,0.07663 0.416274,0.229886 0.499528,0.459768 0.08326,0.229886
0.249768,0.383142 0.499535,0.45977 0.249764,0.07663 0.416274,0.229882
0.499531,0.459764 0.08325,0.229891 0.249761,0.383151 0.499525,0.45978
0.249767,0.07663 0.416277,0.229884 0.49953,0.459771 0.08326,0.229884
0.291396,0.344827 0.624416,0.344827 l 0.49953,0 0,0.45977 -0.0415,0.999216
-0.207515,0.419935 -0.125633,-0.154784 c -0.161157,-0.19855 -0.416273,-0.229886
-0.49953,-0.459778 -0.08325,-0.229882 -0.249763,-0.383136 -0.49953,-0.459763
-0.249764,-0.07663 -0.416272,-0.229884 -0.499525,-0.459768 -0.08326,-0.229886
-0.291396,-0.344828 -0.624416,-0.344828 -0.33302,0 -0.541158,0.114942
-0.624415,0.344828 -0.08325,0.229884 -0.03642,0.43582 0.140495,0.617811 l
0.265377,0.272997 0.04683,-0.04306 0.04684,-0.04306 -0.09366,0.08619 c
-0.06244,0.05746 -0.114476,0.143669 -0.156103,0.258615 l -0.06244,0.172412
0.09366,-0.258622 0.09366,-0.258615 -0.12488,0.344825 c -0.08326,0.229884
-0.124885,0.498085 -0.124885,0.804603 l 0,0.919533 0,0.919545 0,0.919534
0,0.919539 c 0,0.306518 -0.04163,0.574722 -0.12488,0.804612 -0.08326,0.229881
-0.249767,0.383136 -0.499531,0.459763 -0.249765,0.07663 -0.49953,0.07663
-0.749295,0 -0.249766,-0.07663 -0.416276,-0.229882 -0.499531,-0.459763
-0.08326,-0.22989 -0.124882,-0.498094 -0.124882,-0.804612 l 0,-0.919539
0,-0.919534 0,-0.919545 0,-0.919533 c 0,-0.306518 -0.04163,-0.574719
-0.124883,-0.804603 l -0.124883,-0.344895 0.09366,0.258621 0.09366,0.258622
-0.06244,-0.172417 c -0.04163,-0.114942 -0.09366,-0.201147 -0.156104,-0.258616
l -0.09366,-0.0862 0.04682,0.04306 -0.493721,-0.729141 0.805917,0.499214 c
0.176924,-0.181978 0.223758,-0.38791 0.140503,-0.617795 -0.08325,-0.229885
-0.291392,-0.344827 -0.624413,-0.344827 -0.33302,0 -0.541158,0.114942
-0.624413,0.344827 -0.08325,0.229885 -0.249765,0.383142 -0.49953,0.459772
-0.249766,0.07663 -0.416276,0.229881 -0.4995309,0.459765 -0.083255,0.229887
-0.2497652,0.383144 -0.4995304,0.459769 l -0.3746479,0.114946 0,-0.459775
0,-0.919535 0,-0.459769 0.4995305,0 c 0.3330203,0 0.5411577,-0.114942
0.6244127,-0.344826 0.08326,-0.229887 0.249766,-0.383144 0.499531,-0.459772
0.249765,-0.07663 0.416275,-0.229888 0.49953,-0.459772 0.08325,-0.229886
0.249766,-0.383142 0.499531,-0.459769 0.249765,-0.07663 0.416275,-0.229883
0.49953,-0.459767"
+ id="path5245-6"
+ inkscape:connector-curvature="0"
+
sodipodi:nodetypes="cccsscccsccccsscssscccccscccsscccscsscscccsccccscccccssscscccccsscssc"
/>
+ <path
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ d="m 12.091858,17.005706 q 0.249765,-0.229885 0.624413,-0.344827
0.374648,-0.114941 0.749296,0 0.374647,0.114942 0.624413,0.344827
0.249765,0.22989 0.49953,0.459772 0.249765,0.229886 0.499531,0.459774
0.249765,0.229881 0.49953,0.45977 0.249765,0.229876 0.49953,0.459771
0.249766,0.229884 0.499531,0.459765 0.249765,0.229888 0.374644,0.574717 l
0.124886,0.344827 -0.49953,0 q -0.499531,0 -0.624416,-0.344827
-0.12488,-0.344829 -0.49953,-0.459773 -0.374645,-0.114944 -0.499525,-0.459769
-0.124886,-0.344835 -0.499531,-0.459774 -0.37465,-0.114937 -0.499535,-0.459767
-0.124881,-0.344828 -0.499528,-0.459767 -0.374648,-0.114947 -0.749296,0
-0.374648,0.114939 -0.499531,0.459767 -0.124882,0.34483 -0.49953,0.459767
-0.374648,0.114939 -0.499531,0.459774 -0.124882,0.344825 -0.49953,0.459769
-0.374648,0.114944 -0.49953,0.459773 -0.124883,0.344827 -0.6244135,0.344827 l
-0.4995305,0 0.1248826,-0.344827 q 0.1248826,-0.344829 0.3746479,-0.574717
0.2497652,-0.229881 0.4995305,-0.459765 0.249765,-0.229895 0.49953,-0.459771
0.249766,-0.229889 0.499531,-0.45977 0.249765,-0.229888 0.49953,-0.459774
0.249766,-0.229882 0.499531,-0.459772"
+ id="path5235-9"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#ffffff;fill-opacity:1;stroke:none"
+ d="m 10.960404,20.25116 c 0.08325,-0.229886 0.291393,-0.344829
0.624414,-0.344829 0.33302,0 0.541157,0.114943 0.624412,0.344829
0.08325,0.229885 0.356154,0.663455 0.108526,0.737335 l -0.514393,0.15347
0.04682,0.04305 0.04682,0.04306 -0.09366,-0.08619 c -0.06244,-0.05743
-0.135279,-0.08614 -0.218534,-0.08614 l -0.124883,0 0.187324,0 0.187324,0
-0.249765,0 c -0.16651,0 -0.33302,0.07663 -0.499531,0.22989 l -0.49953,0.45977
-0.499531,0.459767 c -0.1665099,0.15326 -0.33302,0.22989 -0.4995301,0.22989
-0.1665102,0 -0.2913928,-0.114943 -0.3746479,-0.344827 l -0.1248826,-0.34483
0.3746479,-0.114942 c 0.2497652,-0.07663 0.4162753,-0.229887
0.4995302,-0.459773 0.083255,-0.229885 0.2497655,-0.383141 0.4995305,-0.459767
0.249765,-0.07663 0.416276,-0.229889 0.499531,-0.459772"
+ id="path5259-1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csssccccscccssccsscsscc" />
+ <path
+ style="fill:#ffffff;fill-opacity:1"
+ d="m 13.931105,20.193148 c 0.08325,-0.229883 0.291392,-0.344824
0.624412,-0.344824 0.33302,0 0.541158,0.114941 0.624414,0.344824
0.08325,0.229883 0.249765,0.383141 0.49953,0.459775 0.249764,0.07663
0.416275,0.229884 0.49953,0.459768 0.08326,0.229886 0.249765,0.383141
0.499531,0.459767 l 0.374646,0.114944 -0.124881,0.344825 c -0.08326,0.22989
-0.208139,0.344834 -0.374649,0.344834 -0.16651,0 -0.33302,-0.07663
-0.49953,-0.229886 l -0.49953,-0.459773 -0.499531,-0.459766 c
-0.16651,-0.153258 -0.33302,-0.229887 -0.49953,-0.229887 l -0.249766,0
0.187324,0 0.187325,0 -1.203962,1.195204 c -0.05787,0.05745 0.922976,-1.166473
0.860535,-1.109009 l -0.09366,0.0862 0.04683,-0.04306 0.04683,-0.04306
-0.721907,2.316612 c -0.176916,-0.182034 0.232788,-2.977603 0.316043,-3.207486"
+ id="path5261-8"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csscsccssscsscccscccccc" />
+ </g>
+ </g>
</svg>
diff --git a/images/user-icon-20.png b/images/user-icon-20.png
new file mode 100644
index 0000000..b3e94dc
--- /dev/null
+++ b/images/user-icon-20.png
Binary files differ
diff --git a/images/user-icon-20.svg b/images/user-icon-20.svg
new file mode 100644
index 0000000..ea22b33
--- /dev/null
+++ b/images/user-icon-20.svg
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="20.129"
+ height="21.445"
+ viewBox="0 0 744.09449 1052.3622"
+ id="svg3396"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="user-icon-20.svg">
+ <defs
+ id="defs3398" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="12.59"
+ inkscape:cx="11.114972"
+ inkscape:cy="7.5505425"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1366"
+ inkscape:window-height="705"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata3401">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <g
+ id="g6066"
+ transform="matrix(63.919959,0,0,64.5868,-23484.589,-25520.824)">
+ <g
+ id="g6068">
+ <path
+ d="m 380.4,410.3 c -0.3,0.5 0.7,0.47316 -0.7,0.37316 -1.1,0
0.83461,0.60676 -0.26539,0.60676 -4.6,-0.1 -8.95318,0.0734 -13.55318,-0.0266
6.46934,-18.04804 -5.54394,-7.38971 4.31857,-8.15328 1.8,0.7 3.6,1.2 5.4,0
2.5,0 3.2,1.9 3.9,3.8 0.3,1 -0.1,2.4 0.9,3.4 z"
+ id="path6070"
+ inkscape:connector-curvature="0"
+ style="fill:#fdfdfd;fill-opacity:1"
+ sodipodi:nodetypes="ccccccccc" />
+ <path
+ d="m 380.36825,411.44505 c -1.07902,0.1 -0.62093,0.17058
-1.2367,-1.71886 -0.5,-1.9 -1.53155,-6.02619 -3.93155,-5.92619 -0.3,-0.2
-0.5,-0.5 -0.6,-0.8 -0.1,-0.6 -0.1,-1.2 -0.1,-1.8 0,-1.2 -0.4,-2.3 -1.8,-2.3
-1.8,0 -1.7,1.4 -1.6,2.6 0,0.5 0.1,1 0.1,1.5 -0.1,0.3 -0.3,0.6 -0.5,0.9 -4.6,0
-3.28255,8.93946 -5.2,7.4 l 0,-16.07336 c 4.4133,0 9.15789,-0.0656 13.5,-0.0867
2.0007,0 2.39603,-0.163 1.95343,1.76038 0.0358,4.73579 0.12053,10.37183
0.10866,14.54505 z"
+ id="path6072"
+ inkscape:connector-curvature="0"
+ style="fill:#474747"
+ sodipodi:nodetypes="ccccssccccccccc" />
+ <path
+ d="m 370.6,403.7 c 0,-0.3 0,-0.7 0.1,-1 1.5,-0.4 2.9,-0.3 4.4,-0.1
0,0.4 0.1,0.7 0.1,1.1 -1.5,1.7 -3,1.7 -4.6,0 z"
+ id="path6074"
+ style="fill:#474747;fill-opacity:1"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 375.1,402.6 c -1.4,1.1 -2.9,1 -4.4,0.1 -1,-1.7 -1.3,-3.5
0.4,-4.9 0.9,-0.8 2.2,-0.7 3.1,0 1.7,1.2 1.7,3 0.9,4.8 z"
+ id="path6076"
+ style="fill:#fdfdfd;fill-opacity:1"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/images/user-icon-40.png b/images/user-icon-40.png
new file mode 100644
index 0000000..1ec9dc3
--- /dev/null
+++ b/images/user-icon-40.png
Binary files differ
diff --git a/images/user-icon-40.svg b/images/user-icon-40.svg
new file mode 100644
index 0000000..a528421
--- /dev/null
+++ b/images/user-icon-40.svg
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="37.5"
+ height="37.5"
+ viewBox="0 0 744.09449 1052.3622"
+ id="svg3348"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="user-icon-40.svg">
+ <defs
+ id="defs3350" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="6.29"
+ inkscape:cx="14.557547"
+ inkscape:cy="31.576571"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1366"
+ inkscape:window-height="705"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata3353">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <g
+ id="g6066"
+ transform="matrix(69.17894,0,0,64.950357,-25439.036,-25664.465)">
+ <g
+ id="g6068">
+ <path
+ d="m 380.4,410.3 c -0.3,0.5 0.7,0.47316 -0.7,0.37316 -1.1,0
0.83461,0.60676 -0.26539,0.60676 -4.6,-0.1 -8.95318,0.0734 -13.55318,-0.0266
6.46934,-18.04804 -5.54394,-7.38971 4.31857,-8.15328 1.8,0.7 3.6,1.2 5.4,0
2.5,0 3.2,1.9 3.9,3.8 0.3,1 -0.1,2.4 0.9,3.4 z"
+ id="path6070"
+ inkscape:connector-curvature="0"
+ style="fill:#fdfdfd;fill-opacity:1"
+ sodipodi:nodetypes="ccccccccc" />
+ <path
+ d="m 380.55119,411.3847 c -1.07902,0.1 -0.80387,0.23093
-1.41964,-1.65851 -0.5,-1.9 -1.53155,-6.02619 -3.93155,-5.92619 -0.3,-0.2
-0.5,-0.5 -0.6,-0.8 -0.1,-0.6 -0.1,-1.2 -0.1,-1.8 0,-1.2 -0.4,-2.3 -1.8,-2.3
-1.8,0 -1.7,1.4 -1.6,2.6 0,0.5 0.1,1 0.1,1.5 -0.1,0.3 -0.3,0.6 -0.5,0.9 -4.6,0
-2.79472,8.09457 -5.2,7.4 l 0,-16.07336 c 4.4133,0 9.15789,-0.0656 13.5,-0.0867
1.3867,0 2.20478,-0.12869 1.75797,1.69135 0.04,4.53738 0.0111,10.19078
-0.0133,14.4847 z"
+ id="path6072"
+ inkscape:connector-curvature="0"
+ style="fill:#474747"
+ sodipodi:nodetypes="ccccssccccccccc" />
+ <path
+ d="m 370.6,403.7 c 0,-0.3 0,-0.7 0.1,-1 1.5,-0.4 2.9,-0.3 4.4,-0.1
0,0.4 0.1,0.7 0.1,1.1 -1.5,1.7 -3,1.7 -4.6,0 z"
+ id="path6074"
+ style="fill:#474747;fill-opacity:1"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 375.1,402.6 c -1.4,1.1 -2.9,1 -4.4,0.1 -1,-1.7 -1.3,-3.5
0.4,-4.9 0.9,-0.8 2.2,-0.7 3.1,0 1.7,1.2 1.7,3 0.9,4.8 z"
+ id="path6076"
+ style="fill:#fdfdfd;fill-opacity:1"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/collapsibleNav.js b/js/collapsibleNav.js
similarity index 100%
rename from collapsibleNav.js
rename to js/collapsibleNav.js
diff --git a/collapsibleTabs.js b/js/collapsibleTabs.js
similarity index 100%
rename from collapsibleTabs.js
rename to js/collapsibleTabs.js
diff --git a/js/mediawiki.searchSuggest.custom.js
b/js/mediawiki.searchSuggest.custom.js
new file mode 100644
index 0000000..0d96acb
--- /dev/null
+++ b/js/mediawiki.searchSuggest.custom.js
@@ -0,0 +1,200 @@
+/*!
+ * Add search suggestions to the search form.
+ */
+( function ( mw, $ ) {
+ $( function () {
+ var api, map, resultRenderCache, searchboxesSelectors,
+ // Region where the suggestions box will appear
directly below
+ // (using the same width). Can be a container element
or the input
+ // itself, depending on what suits best in the
environment.
+ // For Vector the suggestion box should align with the
simpleSearch
+ // container's borders, in other skins it should align
with the input
+ // element (not the search form, as that would leave
the buttons
+ // vertically between the input and the suggestions).
+ $searchRegion = $( '#simpleSearch, #simpleSearchSearch,
#searchInput' ).first(),
+ $searchInput = $( '#searchInput' );
+
+ // Compatibility map
+ map = {
+ // SimpleSearch is broken in Opera < 9.6
+ opera: [['>=', 9.6]],
+ // Older Konquerors are unable to position the
suggestions correctly (bug 50805)
+ konqueror: [['>=', '4.11']],
+ docomo: false,
+ blackberry: false,
+ // Support for iOS 6 or higher. It has not been tested
on iOS 5 or lower
+ ipod: [['>=', 6]],
+ iphone: [['>=', 6]]
+ };
+
+ if ( !$.client.test( map ) ) {
+ return;
+ }
+
+ // Compute form data for search suggestions functionality.
+ function computeResultRenderCache( context ) {
+ var $form, baseHref, linkParams;
+
+ // Compute common parameters for links' hrefs
+ $form = context.config.$region.closest( 'form' );
+
+ baseHref = $form.attr( 'action' );
+ baseHref += baseHref.indexOf( '?' ) > -1 ? '&' : '?';
+
+ linkParams = {};
+ $.each( $form.serializeArray(), function ( idx, obj ) {
+ linkParams[ obj.name ] = obj.value;
+ } );
+
+ return {
+ textParam: context.data.$textbox.attr( 'name' ),
+ linkParams: linkParams,
+ baseHref: baseHref
+ };
+ }
+
+ // The function used to render the suggestions.
+ function renderFunction( text, context ) {
+ if ( !resultRenderCache ) {
+ resultRenderCache = computeResultRenderCache(
context );
+ }
+
+ // linkParams object is modified and reused
+ resultRenderCache.linkParams[
resultRenderCache.textParam ] = text;
+
+ // this is the container <div>, jQueryfied
+ this.text( text )
+ .wrap(
+ $( '<a>' )
+ .attr( 'href',
resultRenderCache.baseHref + $.param( resultRenderCache.linkParams ) )
+ .attr( 'title', text )
+ .addClass(
'mw-searchSuggest-link' )
+ );
+ }
+
+ function specialRenderFunction( query, context ) {
+ var $el = this;
+
+ if ( !resultRenderCache ) {
+ resultRenderCache = computeResultRenderCache(
context );
+ }
+
+ // linkParams object is modified and reused
+ resultRenderCache.linkParams[
resultRenderCache.textParam ] = query;
+
+ if ( $el.children().length === 0 ) {
+ $el
+ .append(
+ $( '<div>' )
+ .addClass(
'special-label' )
+ .text( mw.msg(
'searchsuggest-containing' ) ),
+ $( '<div>' )
+ .addClass(
'special-query' )
+ .text( query )
+ )
+ .show();
+ } else {
+ $el.find( '.special-query' )
+ .text( query );
+ }
+
+ if ( $el.parent().hasClass( 'mw-searchSuggest-link' ) )
{
+ $el.parent().attr( 'href',
resultRenderCache.baseHref + $.param( resultRenderCache.linkParams ) +
'&fulltext=1' );
+ } else {
+ $el.wrap(
+ $( '<a>' )
+ .attr( 'href',
resultRenderCache.baseHref + $.param( resultRenderCache.linkParams ) +
'&fulltext=1' )
+ .addClass(
'mw-searchSuggest-link' )
+ );
+ }
+ }
+
+ // Generic suggestions functionality for all search boxes
+ searchboxesSelectors = [
+ // Primary searchbox on every page in standard skins
+ '#searchInput',
+ // Special:Search
+ '#powerSearchText',
+ '#searchText',
+ // Generic selector for skins with multiple searchboxes
(used by CologneBlue)
+ // and for MediaWiki itself (special pages with page
title inputs)
+ '.mw-searchInput'
+ ];
+ $( searchboxesSelectors.join( ', ' ) )
+ .suggestions( {
+ fetch: function ( query, response ) {
+ var node = this[0];
+
+ api = api || new mw.Api();
+
+ $.data( node, 'request', api.get( {
+ action: 'opensearch',
+ search: query,
+ namespace: 0,
+ suggest: ''
+ } ).done( function ( data ) {
+ response( data[ 1 ] );
+ } ) );
+ },
+ cancel: function () {
+ var node = this[0],
+ request = $.data( node,
'request' );
+
+ if ( request ) {
+ request.abort();
+ $.removeData( node, 'request' );
+ }
+ },
+ result: {
+ render: renderFunction,
+ select: function () {
+ // allow the form to be
submitted
+ return true;
+ }
+ },
+ cache: true,
+ highlightInput: true
+ } )
+ .bind( 'paste cut drop', function () {
+ // make sure paste and cut events from the
mouse and drag&drop events
+ // trigger the keypress handler and cause the
suggestions to update
+ $( this ).trigger( 'keypress' );
+ } )
+ // In most skins (at least Monobook and Vector), the
font-size is messed up in <body>.
+ // (they use 2 elements to get a sane font-height). So,
instead of making exceptions for
+ // each skin or adding more stylesheets, just copy it
from the active element so auto-fit.
+ .each( function () {
+ var $this = $( this );
+ $this
+ .data( 'suggestions-context' )
+ .data.$container
+ .css( 'fontSize', $this.css(
'fontSize' ) );
+ } );
+
+ // Ensure that the thing is actually present!
+ if ( $searchRegion.length === 0 ) {
+ // Don't try to set anything up if simpleSearch is
disabled sitewide.
+ // The loader code loads us if the option is present,
even if we're
+ // not actually enabled (anymore).
+ return;
+ }
+
+ // Special suggestions functionality for skin-provided search
box
+ $searchInput.suggestions( {
+ special: {
+ render: specialRenderFunction,
+ select: function ( $input ) {
+ $input.closest( 'form' )
+ .append( $( '<input
type="hidden" name="fulltext" value="1"/>' ) );
+ return true; // allow the form to be
submitted
+ }
+ },
+ $region: $searchRegion
+ } );
+
+ // If the form includes any fallback fulltext search buttons,
remove them
+ $searchInput.closest( 'form' ).find( '.mw-fallbackSearchButton'
).remove();
+ } );
+
+}( mediaWiki, jQuery ) );
+
diff --git a/js/metrolook.js b/js/metrolook.js
new file mode 100644
index 0000000..2556204
--- /dev/null
+++ b/js/metrolook.js
@@ -0,0 +1,132 @@
+var openDiv, $;
+function toggleDiv(divID) {
+ $("#" + divID).fadeToggle(150, function() {
+ openDiv = $(this).is(':visible') ? divID : null;
+ });
+}
+
+$(document).click(function(e) {
+ if (!$(e.target).closest('#'+openDiv).length) {
+ toggleDiv(openDiv);
+ }
+});
+
+function is_touch_device() {
+ return !!('ontouchstart' in window);
+}
+
+$(document).ready(function() {
+ if(is_touch_device()) {
+ if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera
Mini/i.test(navigator.userAgent) ) {
+ $( '#usermenu > div' ).toggleClass( 'no-js js' );
+ $( '#usermenu .js div' ).hide();
+ $( '#usermenu .js' ).click(function(e) {
+ $( '#usermenu .js div' ).fadeToggle(150);
+ $( '#usermenu' ).toggleClass( 'active' );
+ e.stopPropagation();
+ });
+
+ $(document).click(function() {
+ if ($( '#usermenu .js div' ).is( ':visible' )) {
+ $( '#usermenu .js div',
this).fadeOut(150);
+ $( '#usermenu' ).removeClass( 'active'
);
+ }
+ });
+ }
+ }
+});
+
+$(function () {
+ if(is_touch_device()) {
+ if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera
Mini/i.test(navigator.userAgent) ) {
+ $( '.actionmenu > div' ).toggleClass('no-js js');
+ $( '.actionmenu .js div' ).hide();
+ $( '.actionmenu .js' ).click(function(e) {
+ $( '.actionmenu .js div' ).fadeToggle(150);
+ $( '.clicker' ).toggleClass( 'active' );
+ e.stopPropagation();
+ });
+
+ $(document).click(function() {
+ if ($( '.actionmenu .js div' ).is( ':visible'
)) {
+ $( '.actionmenu .js div',
this).fadeOut(150);
+ $( '.clicker' ).removeClass( 'active' );
+ }
+ });
+ }
+ }
+});
+
+$(function () {
+ $( '#hamburgerIcon' ).click(function(e) {
+ $( '#mw-panel' ).fadeToggle(150);
+ $( '.clicker' ).toggleClass( 'active' );
+ e.stopPropagation();
+ });
+ $( '#hamburgerIcon' ).click(function() {
+ if ($( '#mw-panel' ).is( ':visible' )) {
+ $( '#mw-panel', this).fadeOut(150);
+ $( '.clicker' ).removeClass( 'active' );
+ }
+ });
+});
+
+$(function () {
+ $( '#hamburgerIcon' ).click(function(e) {
+ $( '#mw-panel-custom' ).fadeToggle(150);
+ $('.clicker').toggleClass('active');
+ e.stopPropagation();
+ });
+ $( '#hamburgerIcon' ).click(function() {
+ if ($( '#mw-panel-custom' ).is( ':visible' )) {
+ $( '#mw-panel-custom', this).fadeOut(150);
+ $( '.clicker' ).removeClass('active');
+ }
+ });
+});
+
+$(function () {
+ if(is_touch_device()) {
+ if( /Android|webOS|iPhone|iPod|BlackBerry|IEMobile|Opera
Mini/i.test(navigator.userAgent) ) {
+ $( '#p-search' ).hide();
+ $( 'img.searchbar' ).click(function(e) {
+ $( '#p-search' ).fadeToggle(150);
+ $('.clicker').toggleClass( 'active' );
+ e.stopPropagation();
+ });
+ $( 'img.searchbar').click(function() {
+ if ($( '#p-search' ).is( ':visible' )) {
+ $( '#p-search', this).fadeOut(150);
+ $( '.clicker' ).removeClass( 'active' );
+ }
+ });
+ }
+ }
+});
+
+$(function () {
+ $('img.editbutton').click(function(e) {
+ $('#left-navigation').fadeToggle(150);
+ $('.clicker').toggleClass('active');
+ e.stopPropagation();
+ });
+ $('img.editbutton').click(function() {
+ if ($('#left-navigation').is(':visible')) {
+ $('#left-navigation', this).fadeOut(150);
+ $('.clicker').removeClass('active');
+ }
+ });
+});
+
+$(function () {
+ $('img.downarrow').click(function(e) {
+ $( 'img.downarrow' ).on( 'click', toggleDiv( 'bartile' ) );
+ e.stopPropagation();
+ });
+ $('img.downarrow').click(function() {
+ if ($('#bartile').is(':visible')) {
+ $('#bartile', this).fadeOut(150);
+ $('.clicker').removeClass('active');
+ }
+ });
+});
diff --git a/overthrow.js b/js/overthrow.js
similarity index 100%
rename from overthrow.js
rename to js/overthrow.js
diff --git a/vector.js b/js/vector.js
similarity index 100%
rename from vector.js
rename to js/vector.js
diff --git a/screen-hd.less b/screen-hd.less
index ded5289..93538b1 100644
--- a/screen-hd.less
+++ b/screen-hd.less
@@ -16,9 +16,6 @@
#mw-panel {
padding-left: 0.5em;
}
-#p-search {
- margin-right: 3.5em;
-}
#left-navigation {
left: 190px;
}
diff --git a/screen.less b/screen.less
index 5ef0bd8..a3942ae 100644
--- a/screen.less
+++ b/screen.less
@@ -7,4 +7,5 @@
@import "components/navigation.less";
@import "components/footer.less";
@import "components/externalLinks.less";
+@import "components/mobile.less";
@import "theme.less";
diff --git a/theme.less b/theme.less
index 17ab0ff..02b1351 100644
--- a/theme.less
+++ b/theme.less
@@ -4,4 +4,4 @@
-/* Top Bar colour and hover colour end */
+/* Top Bar colour and hover colour */
--
To view, visit https://gerrit.wikimedia.org/r/196510
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0e7f4a0fd7651a83e3dda3078159e108eb56c644
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: REL1_24
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
![http://images.pidgi.net/pidgiwikitiletop.png"](http://images.pidgi.net/pidgiwikitiletop.png"){kind=link}
![http://images.pidgi.net/pidgipresstiletop.png"](http://images.pidgi.net/pidgipresstiletop.png"){kind=link}
![http://images.pidgi.net/jcctiletop.png"](http://images.pidgi.net/jcctiletop.png"){kind=link}
![http://images.pidgi.net/pwntiletop.png"](http://images.pidgi.net/pwntiletop.png"){kind=link}
![http://www.pidgi.net/new/public/images/pidgiwiki.png"/](http://www.pidgi.net/new/public/images/pidgiwiki.png"/){kind=link}