diff --git a/horizon/static/framework/widgets/table/table.scss b/horizon/static/framework/widgets/table/table.scss index a6b0f04eb4..5cb7aff98d 100644 --- a/horizon/static/framework/widgets/table/table.scss +++ b/horizon/static/framework/widgets/table/table.scss @@ -297,7 +297,7 @@ $em-per-priority: floor($table-col-avg-width / $font-size-base) * 3; } @media (min-width: 0em) { - $content-width: $body-min-width - $sidebar-width - (2 * $content-body-padding); + $content-width: $main-content-min-width - $sidebar-width - (2 * $content-body-padding); $max-priority: floor($content-width / $font-size-base / $em-per-priority); @for $i from 1 through $max-priority { @@ -359,4 +359,4 @@ $em-per-priority: floor($table-col-avg-width / $font-size-base) * 3; .pagination > li > span { cursor: pointer; } -} \ No newline at end of file +} diff --git a/openstack_dashboard/static/dashboard/scss/_variables.scss b/openstack_dashboard/static/dashboard/scss/_variables.scss index 519ad94da8..84ba111e3f 100644 --- a/openstack_dashboard/static/dashboard/scss/_variables.scss +++ b/openstack_dashboard/static/dashboard/scss/_variables.scss @@ -11,7 +11,7 @@ $webroot: "" !default; /* Horizon Custom Variables */ $code-font-family: Menlo, Monaco, Consolas, 'Courier New' !default; -$body-min-width: 900px !default; +$main-content-min-width: 900px !default; $sidebar-background-color: #f9f9f9 !default; $sidebar-width: 220px !default; $border-color: #dddddd !default; diff --git a/openstack_dashboard/static/dashboard/scss/components/_topbar.scss b/openstack_dashboard/static/dashboard/scss/components/_topbar.scss deleted file mode 100644 index f2b8aac11a..0000000000 --- a/openstack_dashboard/static/dashboard/scss/components/_topbar.scss +++ /dev/null @@ -1,97 +0,0 @@ -.topbar { - background: $gray-lighter; - border-bottom: 1px solid $gray-light; - padding-right: 15px; - h1.brand { - display: inline-block; - width: 222px; - margin: 0 0 0 10px; - line-height: 1; - a { - background: url(../img/logo.png) left center no-repeat; - display: block; - text-indent: -9999px; - } - } - .switcher_bar { - display: inline-block; - vertical-align: top; - font-size: 0px; - - .btn.btn-topnav{ - @include button-size(8px, $padding-base-horizontal, $font-size-base, $line-height-base, 0); - @include button-variant($btn-default-color, $gray-lighter, $gray-lighter); - &:hover, &:active { - @include box-shadow(none); - } - } - - .dropdown-menu.topbar-dropdown-menu { - border-radius: 0; - &:before, &:after { - position: absolute; - display: inline-block; - content: ''; - } - &:before { - top: -7px; - left: 9px; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-left: 7px solid transparent; - border-bottom-color: rgba(0, 0, 0, 0.2); - } - &:after { - top: -6px; - left: 10px; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - border-left: 6px solid transparent; - } - &.pull-right:before { - left: auto; - right: 9px; - } - &.pull-right:after { - left: auto; - right: 10px; - } - } - - .context-selection { - .dropdown-menu { - padding: 0; - } - - .context-lists { - display: table; - width: 100%; - ul { - display: table-cell; - padding: .5em 0; - li { - a { - @extend .dropdown-menu > li > a; - } - } - &:not(:last-child) { - border-right: 1px solid $gray-light; - } - } - } - - .footer { - padding: 0.4em 1em; - background: whitesmoke; - border-top: 1px solid $gray-light; - text-align: right; - } - - .disabled { - cursor: not-allowed; - color: $gray-light; - } - } - - } -} diff --git a/openstack_dashboard/static/dashboard/scss/horizon.scss b/openstack_dashboard/static/dashboard/scss/horizon.scss index eb54391b94..3c67febfb7 100644 --- a/openstack_dashboard/static/dashboard/scss/horizon.scss +++ b/openstack_dashboard/static/dashboard/scss/horizon.scss @@ -15,7 +15,6 @@ // Dashboard Components @import "splash"; @import "components/resource_browser"; -@import "components/topbar"; @import "components/accordion_nav"; @import "components/inline_edit"; @import "components/charts"; @@ -63,7 +62,6 @@ body { background-position: -200px top; } color: $text-color; - min-width: $body-min-width; } small { @@ -953,6 +951,8 @@ tr.terminated { } #main_content { + min-width: $main-content-min-width; + .nav-tabs { border-bottom: 1px solid $nav-tabs-border-color; border-top: none; diff --git a/openstack_dashboard/templates/_header.html b/openstack_dashboard/templates/_header.html index 3a8d2fca03..2cf3bfd4e0 100644 --- a/openstack_dashboard/templates/_header.html +++ b/openstack_dashboard/templates/_header.html @@ -2,55 +2,69 @@ {% load url from future %} {% load context_selection %} -

{% site_branding %}

+ diff --git a/openstack_dashboard/templates/context_selection/_overview.html b/openstack_dashboard/templates/context_selection/_overview.html index 29aa1a7f9b..aa32246ee8 100644 --- a/openstack_dashboard/templates/context_selection/_overview.html +++ b/openstack_dashboard/templates/context_selection/_overview.html @@ -1,13 +1,12 @@ - - {% if domain_supported %} - {{ domain_name }} - · - {% endif %} - {{ project_name }} - {% if multi_region %} - · - {{ region_name }} - {% endif %} - - + + {% if domain_supported %} + {{ domain_name }} + · + {% endif %} + {{ project_name }} + {% if multi_region %} + · + {{ region_name }} + {% endif %} + diff --git a/openstack_dashboard/templates/context_selection/_project_list.html b/openstack_dashboard/templates/context_selection/_project_list.html index 3c8a17ae7d..01bcbec94b 100644 --- a/openstack_dashboard/templates/context_selection/_project_list.html +++ b/openstack_dashboard/templates/context_selection/_project_list.html @@ -2,7 +2,7 @@ {% load url from future %} {% with dashboard_url=request.horizon.dashboard.get_absolute_url %} -