openstack
/
horizon
Code Issues Proposed changes

Removing container ID element 

Removing the element, as it was not really needed at all.
Also, removed a debug statement that was discovered in
material.hamburger.js while refactoring for this change.

Added a 'container-fluid' class to the content body
as well, because it is not possible to configure Horizon
as a non-fluid layout without a container element around
the first 'row' element.

Change-Id: I097ea31f991e8d15987b7cf54b77a309d6155771
Closes-bug: #1368924
This commit is contained in:
Diana Whitten 2015-12-21 16:21:26 -07:00 committed by Richard Jones
parent 78bfa9727d
commit 21c94bd218
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstack_dashboard/static/dashboard/scss/_layout.scss
View File

@ -1,7 +1,8 @@
// Make the sidebar span the entire page, instead of just the Viewport
// Display Table is not ideal, but it will allow dynamic resizing of
// the sidebar while growing its container to fill the entire window
html, body:not(#splash), #container {
html,
body:not(#splash) {
height: 100%;
}

20
openstack_dashboard/templates/base.html
View File

@ -24,16 +24,16 @@
</div>
</noscript>
{% block content %}
<div id="container">
<div class='topbar'>
{% include "header/_header.html" %}
</div>
<div id='main_content'>
{% include "horizon/_messages.html" %}
{% block sidebar %}
{% include 'horizon/common/_sidebar.html' %}
{% endblock %}
<div id='content_body'>
<div class='topbar'>
{% include "header/_header.html" %}
</div>
<div id='main_content'>
{% include "horizon/_messages.html" %}
{% block sidebar %}
{% include 'horizon/common/_sidebar.html' %}
{% endblock %}
<div id='content_body'>
<div class='container-fluid'>
<div class="row">
<div class="col-xs-12">
{% block page_header %}

3
openstack_dashboard/themes/material/static/js/material.hamburger.js
View File

@ -19,11 +19,10 @@ $(document).ready(function () {
var $sidenav = $('#sidebar');
var $mask = $(document.createElement('div'))
.prop('id', 'md-hamburger-mask')
.appendTo($('#container'));
.appendTo($('#content_body'));
// Hamburger Happiness !!!
$(document).on('click', '.md-hamburger', function () {
var $foo = $(this).find('.md-hamburger-layer');
$(this).find('.md-hamburger-layer')
.toggleClass('md-hamburger-arrow')
.toggleClass('md-hamburger-menu');