openstack/deb-horizon
Code Issues Proposed changes

Merge "Set proper z-index value on messages and navbar"

Browse Source
This commit is contained in:
Jenkins 2016-02-10 02:01:58 +00:00 committed by Gerrit Code Review
commit 4493ade2f0
5 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,10 +13,10 @@ $navbar-border-size: 1px !default;
$navbar-true-height: $navbar-height + $navbar-border-size !default; $navbar-true-height: $navbar-height + $navbar-border-size !default;
#main_content { #main_content {
height: 100%; /* fallback if needed --> its scrolls, but it works */ height: 100%;
height: calc(100% - #{$navbar-true-height});
display: table; display: table;
min-width: $main-content-min-width; min-width: $main-content-min-width;
padding-top: $navbar-true-height;
} }
#content_body, #content_body,

6
openstack_dashboard/static/dashboard/scss/components/_messages.scss
View File

@ -1,8 +1,8 @@
.messages { .messages {
position: fixed; position: fixed;
z-index: 9999; z-index: $zindex-dropdown + 1;
top: $padding-large-vertical*2; padding-top: $padding-small-vertical;
right: $padding-large-vertical*2; right: $padding-large-horizontal;
// TODO (hurgleburlger) RESPONSIVE // TODO (hurgleburlger) RESPONSIVE
// We will readdress this when we address the responsiveness of Horizon // We will readdress this when we address the responsiveness of Horizon

2
openstack_dashboard/templates/header/_header.html
View File

@ -1,7 +1,7 @@
{% load i18n %} {% load i18n %}
{% spaceless %} {% spaceless %}
<nav class="navbar navbar-default"> <nav class="navbar navbar-default navbar-fixed-top">
<div class="container-fluid"> <div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display --> <!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header"> <div class="navbar-header">

8
openstack_dashboard/themes/material/static/horizon/_styles.scss
View File

@ -16,7 +16,6 @@
} }
#content_body { #content_body {
padding-top: $navbar-height;
transition: padding-left $sidebar-animation; transition: padding-left $sidebar-animation;
display: block; display: block;
padding-left: $sidebar-width + $content-body-padding; padding-left: $sidebar-width + $content-body-padding;
@ -33,13 +32,6 @@
} }
// The top nav is fixed, even when the page scrolls
.topbar {
width: 100%;
position: fixed;
z-index: 4;
}
// Border radius is unattractive here // Border radius is unattractive here
.navbar { .navbar {
border-radius: 0; border-radius: 0;

2
openstack_dashboard/themes/material/templates/header/_header.html
View File

@ -2,7 +2,7 @@
{% load context_selection %} {% load context_selection %}
{% load compress %} {% load compress %}
<nav class="navbar-inverse"> <nav class="navbar-inverse navbar-fixed-top">
<div class="container-fluid"> <div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display --> <!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header"> <div class="navbar-header">