From b4295a7df7bba36beaa6ce153a18fdf2d440d1be Mon Sep 17 00:00:00 2001 From: Diana Whitten Date: Mon, 16 Nov 2015 15:04:17 -0700 Subject: [PATCH] Basic Tabs now inherit from a Bootstrap Theme Tabs were pretty basic. For the most, tabs were using the standard styles nicely, except when embedded inside of a modal. There was a lot of adding padding and removing padding to the tab-content and modal container. This has been cleaned up. Also, the 'asterisk' that is used to show when a tab has required information for a workflow was changed to an icon font. Many unused styles were removed from horizon.scss. Partially-Implements: blueprint horizon-theme-css-reorg Partially-Implements: blueprint bootstrap-html-standards Change-Id: I929de0ae31a3c2cca9e332956eed755c4e279f3d --- doc/source/topics/customizing.rst | 24 +-- horizon/templates/horizon/_nav_list.html | 2 +- .../templates/horizon/common/_workflow.html | 15 +- horizon/test/tests/templatetags.py | 2 +- .../dashboard/scss/components/_workflow.scss | 7 + .../static/dashboard/scss/horizon.scss | 165 ------------------ .../material/static/horizon/_icons.scss | 1 + 7 files changed, 33 insertions(+), 183 deletions(-) diff --git a/doc/source/topics/customizing.rst b/doc/source/topics/customizing.rst index 0f89439e40..784e88de26 100644 --- a/doc/source/topics/customizing.rst +++ b/doc/source/topics/customizing.rst @@ -129,6 +129,7 @@ full use of the Bootstrap theme architecture. * Tables_ * Login_ +* Tabs_ Step 1 ------ @@ -147,10 +148,8 @@ more useful ones include: tools will provide the ``variables.less`` file, which will need to be converted to ``_variables.scss`` -.. _Top Navbar: - -The Top Navbar --------------- +Top Navbar +---------- The top navbar in Horizon now uses a native Bootstrap ``navbar``. There are a number of variables that can be used to customize this element. Please see the @@ -165,17 +164,13 @@ The top navbar is now responsive on smaller screens. When the window size hits your ``$screen-sm`` value, the topbar will compress into a design that is better suited for small screens. -.. _Side Nav: - -The Side Nav ------------- +Side Nav +-------- The side navigation component has been refactored to use the native Stacked Pills element from Bootstrap. See **Pills** section of your variables file for specific variables to customize. -.. _Pie Charts: - Pie Charts ---------- @@ -186,8 +181,6 @@ Since there is no native element in Bootstrap specifically for pie charts, the look and feel of the charts are inheriting from other elements of the theme. Please see ``_pie_charts.scss`` for specifics. -.. _Tables: - Tables ------ @@ -217,6 +210,13 @@ The modal login experience, as used when switching regions, uses a standard Bootstrap dialog. See the **Modals** section of your variables file for specific variables to customize. +Tabs +---- + +The standard tabs make use of the native Bootstrap tab markup. + +See **Tabs** section of your variables file for variables to customize. + Bootswatch and Material Design ------------------------------ diff --git a/horizon/templates/horizon/_nav_list.html b/horizon/templates/horizon/_nav_list.html index 25e195130f..2218fc5444 100644 --- a/horizon/templates/horizon/_nav_list.html +++ b/horizon/templates/horizon/_nav_list.html @@ -1,6 +1,6 @@ {% load horizon i18n %} -
+
    {% for component in components %} {% if user|has_permissions:component %} diff --git a/horizon/templates/horizon/common/_workflow.html b/horizon/templates/horizon/common/_workflow.html index d8c795aa7b..bbb1b6e074 100644 --- a/horizon/templates/horizon/common/_workflow.html +++ b/horizon/templates/horizon/common/_workflow.html @@ -1,5 +1,7 @@ {% load i18n %} + {% with workflow.get_entry_point as entry_point %} +
    {% csrf_token %} {% if REDIRECT_URL %}{% endif %} @@ -11,12 +13,15 @@

    {{ workflow.name }}

    {% endblock %}
    -
    +
    {% block modal-body %} @@ -37,10 +42,10 @@ {% if workflow.wizard %}
    - +
    @@ -54,7 +59,9 @@
    + {% endwith %} + {% block modal-js %} {% if workflow.wizard %}