Werdna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199880
Change subject: Move navigation from sidebar to the navbar
......................................................................
Move navigation from sidebar to the navbar
Change-Id: Ia6b2cdba1b47f82c54c449cd6fdef5756dbad76e
---
M resources/master.less
M templates/Skin.php
M templates/Skin.template
M templates/sidebar.template
4 files changed, 29 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Blueprint
refs/changes/80/199880/1
diff --git a/resources/master.less b/resources/master.less
index 2103e3b..aadce38 100644
--- a/resources/master.less
+++ b/resources/master.less
@@ -230,6 +230,21 @@
background-repeat: no-repeat, no-repeat;
}
+ .navigation-menu {
+ border-right: 2px solid #eee;
+ min-width: 80px;
+ padding-left: 30px;
+ font-size: 0.9em;
+ background-image: url(caret-down.svg);
+ background-position: center right 10px;
+ background-repeat: no-repeat;
+
+ span {
+ font-weight: bold;
+ text-transform: uppercase;
+ }
+ }
+
.dropdown-menu {
border-left: 2px solid #eee;
padding: 17px 30px;
@@ -283,17 +298,6 @@
}
}
}
- }
-
- a.navbar-brand {
- border-right: 2px solid #eee;
- display: inline-block;
- height: 100%;
- line-height: 50px;
- padding: 0 20px;
- color: #333;
- text-transform: uppercase;
- font-weight: bold;
}
}
/* Navbar */
diff --git a/templates/Skin.php b/templates/Skin.php
index 5d0f912..6e22787 100644
--- a/templates/Skin.php
+++ b/templates/Skin.php
@@ -221,18 +221,16 @@
</li>
</ul>
-
- <h2 id="navigation-header">Navigation</h2>
- <ul aria-labelledby="navigation-header">
-'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('sidebar','navigation')), $in, true, function($cx, $in) {return '
<li id="'.htmlentities((string)$cx['funcs']['v']($cx, $in,
array('id')), ENT_QUOTES, 'UTF-8').'">
- <a
href="'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('href')),
ENT_QUOTES, 'UTF-8').'">'.htmlentities((string)$cx['funcs']['v']($cx, $in,
array('text')), ENT_QUOTES, 'UTF-8').'</a>
- </li>
-';}).' </ul>
'.' </div>
<div id="site-wrap">
<nav class="navbar">
- <a class="navbar-brand"
href="javascript:void(0)">'.htmlentities((string)$cx['funcs']['v']($cx, $in,
array('sitename')), ENT_QUOTES, 'UTF-8').'</a>
+ <div class="navigation-menu dropdown-menu" tabindex="0">
+
<span>'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('sitename')),
ENT_QUOTES, 'UTF-8').'</span>
+ <ul class="navigation-menu-content
dropdown-menu-content">
+'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('sidebar','navigation')), $in, true, function($cx, $in) {return '
<li><a
id="'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('id')),
ENT_QUOTES, 'UTF-8').'" href="'.htmlentities((string)$cx['funcs']['v']($cx,
$in, array('href')), ENT_QUOTES, 'UTF-8').'"
class="'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('class')),
ENT_QUOTES, 'UTF-8').'">'.htmlentities((string)$cx['funcs']['v']($cx, $in,
array('text')), ENT_QUOTES, 'UTF-8').'</a></li>
+';}).' </ul>
+ </div>
<form class="navbar-form navbar-left"
action="'.$cx['funcs']['v']($cx, $in, array('scriptpath')).'" role="search">
<input
diff --git a/templates/Skin.template b/templates/Skin.template
index 8124965..9c607b3 100755
--- a/templates/Skin.template
+++ b/templates/Skin.template
@@ -6,7 +6,14 @@
<div id="site-wrap">
<nav class="navbar">
- <a class="navbar-brand"
href="javascript:void(0)">{{sitename}}</a>
+ <div class="navigation-menu dropdown-menu" tabindex="0">
+ <span>{{sitename}}</span>
+ <ul class="navigation-menu-content
dropdown-menu-content">
+ {{#each sidebar.navigation}}
+ <li><a id="{{id}}"
href="{{href}}" class="{{class}}">{{text}}</a></li>
+ {{/each}}
+ </ul>
+ </div>
<form class="navbar-form navbar-left"
action="{{{scriptpath}}}" role="search">
<input
diff --git a/templates/sidebar.template b/templates/sidebar.template
index d80925e..0123057 100644
--- a/templates/sidebar.template
+++ b/templates/sidebar.template
@@ -23,12 +23,3 @@
</li>
</ul>
-
-<h2 id="navigation-header">Navigation</h2>
-<ul aria-labelledby="navigation-header">
- {{#each sidebar.navigation}}
- <li id="{{id}}">
- <a href="{{href}}">{{text}}</a>
- </li>
- {{/each}}
-</ul>
--
To view, visit https://gerrit.wikimedia.org/r/199880
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6b2cdba1b47f82c54c449cd6fdef5756dbad76e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Blueprint
Gerrit-Branch: master
Gerrit-Owner: Werdna <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
