Merge pull request #763 from bdharrington7/master

added login register selectors to close the nav when clicked
v1.18.x
Barış Soner Uşaklı 11 years ago
commit dea43ee008

2
.gitignore vendored

@ -14,7 +14,7 @@ Vagrantfile
.vagrant .vagrant
provision.sh provision.sh
*.komodoproject *.komodoproject
.DS_Store
feeds/recent.rss feeds/recent.rss
# winston? # winston?

@ -508,7 +508,7 @@ var socket,
} }
$('#main-nav a,#user-control-list a,#logged-out-menu .dropdown-menu a').off('click').on('click', function() { $('#main-nav a,#user-control-list a,#logged-out-menu li a').off('click').on('click', function() {
if($('.navbar .navbar-collapse').hasClass('in')) if($('.navbar .navbar-collapse').hasClass('in'))
$('.navbar-header button').click(); $('.navbar-header button').click();
}); });

@ -66,9 +66,11 @@
<li class="{adminDisplay}"> <li class="{adminDisplay}">
<a href="{relative_path}/admin"><i class="fa fa-cogs" title="[[global:header.admin]]"></i></a> <a href="{relative_path}/admin"><i class="fa fa-cogs" title="[[global:header.admin]]"></i></a>
</li> </li>
<!-- IF allowGuestSearching -->
<li class="visible-xs"> <li class="visible-xs">
<a href="{relative_path}/search">[[global:header.search]]</a> <a href="{relative_path}/search">[[global:header.search]]</a>
</li> </li>
<!-- ENDIF allowGuestSearching -->
<!-- BEGIN navigation --> <!-- BEGIN navigation -->
<li class="{navigation.class}"> <li class="{navigation.class}">
<a href="{relative_path}{navigation.route}" title="{navigation.title}"> <a href="{relative_path}{navigation.route}" title="{navigation.title}">

Loading…
Cancel
Save