From 4dc6452dea0b6458d294547599f3a328cb8301b9 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Mon, 8 Oct 2018 12:22:57 -0400 Subject: [PATCH] updating suit name and variabilize colors for sub nav pane --- .../client/lib/components/layout/_index.less | 33 +++++++------------ .../components/layout/side-nav.partial.html | 4 +-- 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/awx/ui/client/lib/components/layout/_index.less b/awx/ui/client/lib/components/layout/_index.less index 7b8e1977ab..f45735c19a 100644 --- a/awx/ui/client/lib/components/layout/_index.less +++ b/awx/ui/client/lib/components/layout/_index.less @@ -87,16 +87,8 @@ } &-side { - // background: @at-color-side-nav-background; - // position: fixed; - // bottom: 0; margin-top: @at-height-top-side-nav-makeup; - // overflow-y: auto; - // max-height: 100vh; - // min-width: @at-width-collapsed-side-nav; width: @at-width-collapsed-side-nav; - // overflow-x: hidden; - // z-index: @at-z-index-side-nav; .at-Popover-container { margin-top: 2px; @@ -259,14 +251,13 @@ } /* Tower Sub Nav Dropdown */ -.twr-nav-dropdown { +.at-SettingsSubPane { position: relative; - // display: inline-block; } -.twr-nav-dropdown-content { +.at-SettingsSubPane-content { display: none; position: absolute; - background-color: #848992; + background-color: @at-gray-848992; min-width: 140px; box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); bottom: 0px; @@ -274,14 +265,14 @@ z-index: 2000; } -.at-Layout-side--expanded + .twr-nav-dropdown { - .twr-nav-dropdown-content { +.at-Layout-side--expanded + .at-SettingsSubPane { + .at-SettingsSubPane-content { left: @at-width-expanded-side-nav; } } -.twr-nav-dropdown-content a { - color: #ffffff; +.at-SettingsSubPane-content a { + color: @at-white; font-size: 0.85em; padding: 10px 20px; text-decoration: none; @@ -289,12 +280,12 @@ } // hover stuff -.twr-nav-dropdown-content a:hover { - background-color: #b7b7b7; +.at-SettingsSubPane-content a:hover { + background-color: @at-gray-b7; } -.twr-nav-dropdown.twr-nav-dropdown--visible .twr-nav-dropdown-content { +.at-SettingsSubPane.at-SettingsSubPane--visible .at-SettingsSubPane-content { display: block; } -.twr-nav-dropdown.twr-nav-dropdown--visible .nav-button { - background-color: #b7b7b7; +.at-SettingsSubPane.at-SettingsSubPane--visible .nav-button { + background-color: @at-gray-b7; } \ No newline at end of file diff --git a/awx/ui/client/lib/components/layout/side-nav.partial.html b/awx/ui/client/lib/components/layout/side-nav.partial.html index dc28846f8d..14bf34231e 100644 --- a/awx/ui/client/lib/components/layout/side-nav.partial.html +++ b/awx/ui/client/lib/components/layout/side-nav.partial.html @@ -6,8 +6,8 @@ -
-