openstack/horizon
Code Issues Proposed changes

Merge "Some tweaks to improve work with Material Theme"

Browse Source
This commit is contained in:
Zuul 2022-05-12 13:17:18 +00:00 committed by Gerrit Code Review
commit e6744f27dd
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
horizon/static/framework/util/navigations/navigations.service.js
View File

@ -75,6 +75,8 @@
// open panelgroup on nav_bar if exists // open panelgroup on nav_bar if exists
if (panelgroup.length) { if (panelgroup.length) {
panelgroup.removeClass("collapsed").attr("aria-expanded", true); panelgroup.removeClass("collapsed").attr("aria-expanded", true);
panelgroup.siblings("ul").addClass("in").attr("style", null);
panelgroup.siblings("ul").removeClass("collapsed").attr("aria-expanded", true);
// get panelgroup label // get panelgroup label
labels.push(panelgroup.text().trim()); labels.push(panelgroup.text().trim());
} }

6
openstack_dashboard/themes/material/static/_styles.scss
View File

@ -1,2 +1,8 @@
@import "bootstrap/styles"; @import "bootstrap/styles";
@import "horizon/styles"; @import "horizon/styles";
#sidebar {
.openstack-panel-group {
text-align: left;
}
}

4
openstack_dashboard/themes/material/templates/horizon/_sidebar.html
View File

@ -21,7 +21,7 @@
{% with panels|has_permissions_on_list:user as filtered_panels %} {% with panels|has_permissions_on_list:user as filtered_panels %}
{% if filtered_panels %} {% if filtered_panels %}
{% if group.name %} {% if group.name %}
<li class="nav-header"> <li class="nav-header openstack-panel-group">
<a data-toggle="collapse" <a data-toggle="collapse"
data-parent="#sidebar-drawer-{{ dashboard.slug }}" data-parent="#sidebar-drawer-{{ dashboard.slug }}"
data-target="#sidebar-drawer-{{ dashboard.slug }}-{{ group.slug }}" data-target="#sidebar-drawer-{{ dashboard.slug }}-{{ group.slug }}"
@ -40,7 +40,7 @@
{% endif %} {% endif %}
{% for panel in filtered_panels %} {% for panel in filtered_panels %}
<li class="openstack-panel"> <li class="openstack-panel">
<a class="openstack-spin {% if current.slug == dashboard.slug and current_panel == panel.slug %}active{% endif %}" href="{{ panel.get_absolute_url }}" <a class="openstack-spin openstack-panel {% if current.slug == dashboard.slug and current_panel == panel.slug %}active{% endif %}" href="{{ panel.get_absolute_url }}"
target="_self" target="_self"
tabindex="{{ forloop.counter }}" > tabindex="{{ forloop.counter }}" >
{{ panel.name }} {{ panel.name }}