Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-06 22:40:14 -05:00
Code Issues Activity

Fixed menus not hiding

Browse source 
Also fixed `.dropdown` usage on menu bar.
This commit is contained in:
Matthew Harrison-Jones 2013-06-25 12:30:00 +01:00
parent ade3327a2a
commit 3b63eb78dc
4 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/admin/assets/js/toggle.js
View file

@ -13,9 +13,10 @@
$el.find('[data-toggle]').on('click', function (e) { $el.find('[data-toggle]').on('click', function (e) {
e.preventDefault(); e.preventDefault();
e.stopPropagation();
$(this).toggleClass('active'); $(this).toggleClass('active');
var toggle = $(this).data('toggle'); var toggle = $(this).data('toggle');
$(this).parent().children(toggle).fadeToggle(100).toggleClass('open'); $(this).parent().children(toggle).fadeToggle(200).toggleClass('open');
}); });
}; };

9
core/admin/assets/sass/modules/global.scss
View file

@ -643,12 +643,6 @@ nav {
@include transition(left 0.3s ease 0s); @include transition(left 0.3s ease 0s);
} }
> a { > a {
@include icon-after($i-chevron-down, 12px) {
position:absolute;
right: 20px;
top: 15px;
}
&:hover { background: inherit; } &:hover { background: inherit; }
&.active { background: darken($grey, 3%); } &.active { background: darken($grey, 3%); }
} }
@ -694,7 +688,8 @@ nav {
}; };
&.active { &.active {
@include icon-after($i-chevron-down, 8px, $darkgrey); color: $darkgrey;
@include icon-after($i-chevron-down, 8px);
} }
} }

2
core/admin/assets/tpl/preview.hbs
View file

@ -9,7 +9,7 @@
<section class="post-controls"> <section class="post-controls">
<a class="post-edit" href="#"><span class="hidden">Edit Post</span></a> <a class="post-edit" href="#"><span class="hidden">Edit Post</span></a>
<a class="post-settings" href="#" data-toggle=".menu-drop-right"><span class="hidden">Post Settings</span></a> <a class="post-settings" href="#" data-toggle=".menu-drop-right"><span class="hidden">Post Settings</span></a>
<ul class="menu-drop-right"> <ul class="menu-drop-right overlay">
<li><a href="#" class="url">URL</a></li> <li><a href="#" class="url">URL</a></li>
<li><a href="#" class="something">Something</a></li> <li><a href="#" class="something">Something</a></li>
<li><a href="#" class="delete">Delete</a></li> <li><a href="#" class="delete">Delete</a></li>

4
core/admin/views/partials/navbar.hbs
View file

@ -8,11 +8,11 @@
{{/each}} {{/each}}
<li id="usermenu" class="subnav"> <li id="usermenu" class="subnav">
<a href="#" data-toggle="ul"> <a href="#" data-toggle="ul" class="dropdown">
<img class="avatar" src="/core/admin/assets/img/user.jpg" alt="Avatar" /> <img class="avatar" src="/core/admin/assets/img/user.jpg" alt="Avatar" />
<span class="name">User Menu</span> <span class="name">User Menu</span>
</a> </a>
<ul> <ul class="overlay">
<li class="usermenu-profile"><a href="#">Your Profile</a></li> <li class="usermenu-profile"><a href="#">Your Profile</a></li>
<li class="divider"></li> <li class="divider"></li>
<li class="usermenu-help"><a href="#">Help / Support</a></li> <li class="usermenu-help"><a href="#">Help / Support</a></li>