External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 01:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

sidenav sub pane feedback

Browse Source 
make height the same as side nav items
no tooltip for collapsed settings
This commit is contained in:
John Mitchell
2018-10-08 15:07:09 -04:00
parent 8f4aa5511b
commit b0dd10b538
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui/client/lib/components/layout/_index.less
View File

@@ -116,6 +116,10 @@
width: 50px; width: 50px;
} }
i.is-no-tooltip {
padding-left: @at-padding-left-side-nav-item-icon-no-tooltip;
}
&:hover, &:hover,
&.is-active { &.is-active {
background: @at-color-side-nav-item-background-hover; background: @at-color-side-nav-item-background-hover;
@@ -273,10 +277,11 @@
.at-SettingsSubPane-content a { .at-SettingsSubPane-content a {
color: @at-white; color: @at-white;
font-size: 0.85em; font-size: 13px;
padding: 10px 20px; padding: 10px 20px;
text-decoration: none; text-decoration: none;
display: block; display: block;
height: 39px;
} }
// hover stuff // hover stuff

2
awx/ui/client/lib/components/layout/layout.partial.html
View File

@@ -96,7 +96,7 @@
ng-show="$parent.layoutVm.isSuperUser || $parent.layoutVm.isOrgAdmin"> ng-show="$parent.layoutVm.isSuperUser || $parent.layoutVm.isOrgAdmin">
</at-side-nav-item> </at-side-nav-item>
<at-side-nav-item icon-class="fa-cog" route="settings" name="SETTINGS" <at-side-nav-item icon-class="fa-cog" route="settings" name="SETTINGS"
system-admin-only="true" show-settings-sub-menu="true"> system-admin-only="true" show-settings-sub-menu="true" no-tooltip-on-collapsed="true">
</at-side-nav-item> </at-side-nav-item>
</at-side-nav> </at-side-nav>
<div class="at-Layout-main" ng-class="{'at-Layout-main--noLicense': vm.licenseIsMissing}"> <div class="at-Layout-main" ng-class="{'at-Layout-main--noLicense': vm.licenseIsMissing}">

3
awx/ui/client/lib/components/layout/side-nav-item.directive.js
View File

@@ -61,7 +61,8 @@ function atSideNavItem () {
iconClass: '@', iconClass: '@',
name: '@', name: '@',
route: '@', route: '@',
systemAdminOnly: '@' systemAdminOnly: '@',
noTooltipOnCollapsed: '@'
} }
}; };
} }

5
awx/ui/client/lib/components/layout/side-nav-item.partial.html
View File

@@ -1,9 +1,10 @@
<a class="at-Layout-sideNavItem" ui-sref="{{ route }}" ng-class="{'is-active': vm.isRoute}" <a class="at-Layout-sideNavItem" ui-sref="{{ route }}" ng-class="{'is-active': vm.isRoute}"
ng-show="(!systemAdminOnly || layoutVm.isSuperUser) && layoutVm.isLoggedIn && ng-show="(!systemAdminOnly || layoutVm.isSuperUser) && layoutVm.isLoggedIn &&
!layoutVm.licenseIsMissing"> !layoutVm.licenseIsMissing">
<at-popover state="vm.tooltip" ng-if="!navVm.isExpanded"></at-popover> <at-popover ng-if="!noTooltipOnCollapsed && !navVm.isExpanded" state="vm.tooltip"></at-popover>
<i class="fa {{ iconClass }}" ng-show="navVm.isExpanded"></i> <i class="fa {{ iconClass }}" ng-class="{'is-no-tooltip': noTooltipOnCollapsed}"
ng-show="noTooltipOnCollapsed || navVm.isExpanded"></i>
<span class="at-Layout-sideNavItemName" ng-show="navVm.isExpanded"> <span class="at-Layout-sideNavItemName" ng-show="navVm.isExpanded">
{{ layoutVm.getString(name) }} {{ layoutVm.getString(name) }}
</span> </span>

1
awx/ui/client/lib/theme/_variables.less
View File

@@ -238,6 +238,7 @@
@at-padding-left-side-nav-toggle-icon: 15px; @at-padding-left-side-nav-toggle-icon: 15px;
@at-padding-left-side-nav-item-icon: 10px; @at-padding-left-side-nav-item-icon: 10px;
@at-padding-left-side-nav-item-icon-expanded: 15px; @at-padding-left-side-nav-item-icon-expanded: 15px;
@at-padding-left-side-nav-item-icon-no-tooltip: 18px;
@at-padding-between-side-nav-icon-text: @at-space-3x; @at-padding-between-side-nav-icon-text: @at-space-3x;
@at-padding-list-empty: @at-space-2x; @at-padding-list-empty: @at-space-2x;
@at-padding-list-row-item-tag: 3px 9px; @at-padding-list-row-item-tag: 3px 9px;