github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-29 08:48:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make space for admin bar by adding body top margin.

Browse Source 
This may hopefully help interactions between absolutely positioned
subreddit elements and the admin bar.
This commit is contained in:
Max Goodman
2013-03-08 04:07:45 -08:00
parent fc6724530b
commit 90dc3e877b
2 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
r2/r2/public/static/js/adminbar.js
View File

@@ -51,7 +51,10 @@ r.adminbar.AdminBar = Backbone.View.extend({
this.$('.timelines').toggleClass('zoomed', this.zoomTimings)
this.$el.parent().css('height', this.$el.outerHeight())
$('body').css({
'margin-top': this.$el.outerHeight(),
'position': 'relative'
})
if (r.adminbar.timings.isEmpty()) {
return

56
r2/r2/templates/adminbar.html
View File

@@ -39,38 +39,36 @@
</%def>
%if c.show_admin_bar:
<div class="top-bar-container">
<div id="admin-bar" ${classes('admin' if c.user_is_admin else None, 'debug' if g.debug else None)}>
<div class="status-bar">
<span class="caption">${_('status')}</span>
${indicator('admin', _('admin mode enabled'), c.user_is_admin)}
<div id="admin-bar" ${classes('admin' if c.user_is_admin else None, 'debug' if g.debug else None)}>
<div class="status-bar">
<span class="caption">${_('status')}</span>
${indicator('admin', _('admin mode enabled'), c.user_is_admin)}
%if c.user_is_admin:
<span class="admin-off">${_('admin off')}</span>
%endif
${indicator('debug', _('debug mode'), g.debug)}
${indicator('secure', _('secure'), c.secure)}
${indicator('dev-statics', _('development statics'), g.uncompressedJS)}
${indicator('prod-statics', _('production statics'), g.debug and not g.uncompressedJS)}
${indicator('disabled', _('ads disabled'), g.disable_ads)}
${indicator('disabled', _('captcha disabled'), g.disable_captcha)}
${indicator('disabled', _('ratelimit disabled'), g.disable_ratelimit)}
<span class="controls">
%if c.user_is_admin:
<span class="admin-off">${_('admin off')}</span>
${admin_menu(selected=None)}
%endif
${indicator('debug', _('debug mode'), g.debug)}
${indicator('secure', _('secure'), c.secure)}
${indicator('dev-statics', _('development statics'), g.uncompressedJS)}
${indicator('prod-statics', _('production statics'), g.debug and not g.uncompressedJS)}
${indicator('disabled', _('ads disabled'), g.disable_ads)}
${indicator('disabled', _('captcha disabled'), g.disable_captcha)}
${indicator('disabled', _('ratelimit disabled'), g.disable_ratelimit)}
<span class="controls">
%if c.user_is_admin:
${admin_menu(selected=None)}
%endif
<span class="timings-button"><span class="state">-</span>${_('timings')}</span>
<span class="hide-button">${_('hide')}</span>
</span>
</div>
<div class="timings-bar">
<div class="expand-button">+</div>
<div class="timelines">
<div class="timeline timeline-browser"></div>
<div class="timeline timeline-server"></div>
</div>
</div>
<div class="show-button"></div>
<span class="timings-button"><span class="state">-</span>${_('timings')}</span>
<span class="hide-button">${_('hide')}</span>
</span>
</div>
<div class="timings-bar">
<div class="expand-button">+</div>
<div class="timelines">
<div class="timeline timeline-browser"></div>
<div class="timeline timeline-server"></div>
</div>
</div>
<div class="show-button"></div>
</div>
<% from r2.lib import js %>
${unsafe(js.use('admin'))}