VolkerE has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227499
Change subject: Removing obsolete container div
......................................................................
Removing obsolete container div
Fixing extra padding on div.container-fluid by removing it - unnecessary for
our goals.
Bug: T105081
Change-Id: I4ade685cc44e1337dfb5cc007b921d525d54f782
---
M resources/master.less
M templates/Skin.php
M templates/Skin.template
3 files changed, 64 insertions(+), 67 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Blueprint
refs/changes/99/227499/1
diff --git a/resources/master.less b/resources/master.less
index b309f98..b5fa167 100644
--- a/resources/master.less
+++ b/resources/master.less
@@ -193,6 +193,7 @@
text-transform: uppercase;
font-size: 0.9em;
font-weight: 500;
+ margin-left: -15px;
padding-left: 40px;
padding-right: 40px;
}
diff --git a/templates/Skin.php b/templates/Skin.php
index 0035c42..f203489 100644
--- a/templates/Skin.php
+++ b/templates/Skin.php
@@ -231,39 +231,37 @@
'.'</div>
<nav class="navbar navbar-fixed-top">
- <div class="container-fluid">
- <div class="navbar-header">
- <ul class="nav navbar-nav navbar-head" >
- <li><a href="javascript:void(0)"
id="toc-toggle"></a></li>
- <li><a class="navbar-brand"
href="/">'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('sitename')),
ENT_QUOTES, 'UTF-8').'</a></li>
- <li id="extra-space"></li>
- </ul>
- </div>
+ <div class="navbar-header">
+ <ul class="nav navbar-nav navbar-head" >
+ <li><a href="javascript:void(0)"
id="toc-toggle"></a></li>
+ <li><a class="navbar-brand"
href="/">'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('sitename')),
ENT_QUOTES, 'UTF-8').'</a></li>
+ <li id="extra-space"></li>
+ </ul>
+ </div>
- <div class="collapse navbar-collapse"
id="navbar-collapse">
- <div id="navbar-right">
- <form class="navbar-form navbar-left"
action="'.$cx['funcs']['v']($cx, $in, array('scriptpath')).'" role="search">
- <input
- type="text"
- id="searchInput"
- class="form-control
search-input"
- placeholder="Search"
- name="search"
- >
- <input type="hidden"
name="title" value="Special:Search">
- </form>
+ <div class="collapse navbar-collapse" id="navbar-collapse">
+ <div id="navbar-right">
+ <form class="navbar-form navbar-left"
action="'.$cx['funcs']['v']($cx, $in, array('scriptpath')).'" role="search">
+ <input
+ type="text"
+ id="searchInput"
+ class="form-control
search-input"
+ placeholder="Search"
+ name="search"
+ >
+ <input type="hidden" name="title"
value="Special:Search">
+ </form>
- <ul class="nav navbar-nav navbar-right">
- <li class="dropdown">
- <a href="#"
class="account-menu dropdown-toggle" data-toggle="dropdown" role="button"
aria-expanded="false">
+ <ul class="nav navbar-nav navbar-right">
+ <li class="dropdown">
+ <a href="#" class="account-menu
dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('personal_urls')), $in, true, function($cx, $in) {return
''.(($cx['funcs']['ifvar']($cx, $cx['funcs']['v']($cx, $cx['sp_vars'],
array('first')))) ? '
'.htmlentities((string)$cx['funcs']['v']($cx, $in,
array('text')), ENT_QUOTES, 'UTF-8').'
' : '').'';}).' </a>
- <ul
class="dropdown-menu" role="menu">
+ <ul class="dropdown-menu"
role="menu">
'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('personal_urls')), $in, true, function($cx, $in) {return '
<li><a
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>
- </li>
- </ul>
- </div>
+ </li>
+ </ul>
</div>
</div>
</nav>
diff --git a/templates/Skin.template b/templates/Skin.template
index bf62a20..eb7e69f 100755
--- a/templates/Skin.template
+++ b/templates/Skin.template
@@ -5,47 +5,45 @@
</div>
<nav class="navbar navbar-fixed-top">
- <div class="container-fluid">
- <div class="navbar-header">
- <ul class="nav navbar-nav navbar-head" >
- <li><a href="javascript:void(0)"
id="toc-toggle"></a></li>
- <li><a class="navbar-brand" href="/">{{
sitename }}</a></li>
- <li id="extra-space"></li>
+ <div class="navbar-header">
+ <ul class="nav navbar-nav navbar-head" >
+ <li><a href="javascript:void(0)"
id="toc-toggle"></a></li>
+ <li><a class="navbar-brand" href="/">{{
sitename }}</a></li>
+ <li id="extra-space"></li>
+ </ul>
+ </div>
+
+ <div class="collapse navbar-collapse" id="navbar-collapse">
+ <div id="navbar-right">
+ <form class="navbar-form navbar-left"
action="{{{scriptpath}}}" role="search">
+ <input
+ type="text"
+ id="searchInput"
+ class="form-control
search-input"
+ placeholder="Search"
+ name="search"
+ >
+ <input type="hidden" name="title"
value="Special:Search">
+ </form>
+
+ <ul class="nav navbar-nav navbar-right">
+ <li class="dropdown">
+ <a href="#" class="account-menu
dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
+ {{! HACK:
personal_urls.0.text not working }}
+ {{#each personal_urls}}
+ {{#if @first}}
+ {{text}}
+ {{/if}}
+ {{/each}}
+ {{! /HACK }}
+ </a>
+ <ul class="dropdown-menu"
role="menu">
+ {{#each personal_urls}}
+ <li><a
href="{{href}}" class="{{class}}">{{text}}</a></li>
+ {{/each}}
+ </ul>
+ </li>
</ul>
- </div>
-
- <div class="collapse navbar-collapse"
id="navbar-collapse">
- <div id="navbar-right">
- <form class="navbar-form navbar-left"
action="{{{scriptpath}}}" role="search">
- <input
- type="text"
- id="searchInput"
- class="form-control
search-input"
- placeholder="Search"
- name="search"
- >
- <input type="hidden"
name="title" value="Special:Search">
- </form>
-
- <ul class="nav navbar-nav navbar-right">
- <li class="dropdown">
- <a href="#"
class="account-menu dropdown-toggle" data-toggle="dropdown" role="button"
aria-expanded="false">
- {{! HACK:
personal_urls.0.text not working }}
- {{#each
personal_urls}}
- {{#if
@first}}
-
{{text}}
- {{/if}}
- {{/each}}
- {{! /HACK }}
- </a>
- <ul
class="dropdown-menu" role="menu">
- {{#each
personal_urls}}
- <li><a
href="{{href}}" class="{{class}}">{{text}}</a></li>
- {{/each}}
- </ul>
- </li>
- </ul>
- </div>
</div>
</div>
</nav>
--
To view, visit https://gerrit.wikimedia.org/r/227499
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ade685cc44e1337dfb5cc007b921d525d54f782
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Blueprint
Gerrit-Branch: master
Gerrit-Owner: VolkerE <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
