codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-28 01:56:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: Don't outline buttons when menu is in slide out

Browse source
This commit is contained in:
Robin Ward 2015-08-31 15:30:51 -04:00
parent 989c915a02
commit e2b7b2f2cf
2 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/discourse/components/menu-panel.js.es6
View file

@ -37,11 +37,13 @@ export default Ember.Component.extend({
contentHeight = fullHeight - (offsetTop - scrollTop) - PANEL_BODY_MARGIN; contentHeight = fullHeight - (offsetTop - scrollTop) - PANEL_BODY_MARGIN;
} }
$panelBody.height(contentHeight); $panelBody.height(contentHeight);
$('body').addClass('drop-down-visible');
} else { } else {
$panelBody.height('auto'); $panelBody.height('auto');
const $header = $('header.d-header'); const $header = $('header.d-header');
const headerHeight = parseInt($header.height() + $header.offset().top - $(window).scrollTop() + 3); const headerHeight = parseInt($header.height() + $header.offset().top - $(window).scrollTop() + 3);
this.$().css({ left: "auto", top: headerHeight + "px" }); this.$().css({ left: "auto", top: headerHeight + "px" });
$('body').removeClass('drop-down-visible');
} }
}, },
@ -76,6 +78,7 @@ export default Ember.Component.extend({
$('html').off('click.close-menu-panel'); $('html').off('click.close-menu-panel');
$(window).off('scroll.discourse-menu-panel'); $(window).off('scroll.discourse-menu-panel');
this._stopWatchingSize(); this._stopWatchingSize();
$('body').removeClass('drop-down-visible');
} }
}, },

2
app/assets/stylesheets/common/base/header.scss
View file

@ -82,6 +82,7 @@
background-color: dark-light-diff($primary, $secondary, 90%, -60%); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
} }
} }
.drop-down-visible & {
.active .icon { .active .icon {
position: relative; position: relative;
color: #7b7b7b; color: #7b7b7b;
@ -105,6 +106,7 @@
border-bottom: none; border-bottom: none;
} }
} }
}
[class^="fa fa-"] { [class^="fa fa-"] {
width: 32px; width: 32px;
height: 32px; height: 32px;