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

Merge pull request #95 from Zokormazo/fix-footer-blocking

Browse Source 
Fix footer blocks visibility of items
This commit is contained in:
Jared Tabor
2017-09-14 10:58:15 -07:00
committed by GitHub
parent a5ade10bff 7dc7f7815a
commit bd5846d143
3 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,31 +142,25 @@
overflow-x: hidden; overflow-x: hidden;
} }
&-content {
flex: 1px;
}
&-footer { &-footer {
height: 40px;
background-color: @at-color-footer-background; background-color: @at-color-footer-background;
color: @at-color-footer; color: @at-color-footer;
z-index: 1040; position: relative;
position: absolute; padding-right: @at-padding-footer-right;
right: @at-padding-footer-right; padding-bottom: @at-padding-footer-bottom;
left: 0; margin-top: @at-margin-footer-top;
bottom: 0; flex: 0;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
margin-left: (@at-width-collapsed-side-nav + 5);
a { a {
cursor: pointer; cursor: pointer;
margin-right: @at-margin-after-footer-link; margin-right: @at-margin-after-footer-link;
} }
} }
&-side--expanded {
+ .at-Layout-main {
.at-Layout-footer {
margin-left: @at-width-expanded-side-nav;
}
}
}
} }

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

@@ -76,8 +76,10 @@
</at-side-nav-item> </at-side-nav-item>
</at-side-nav> </at-side-nav>
<div class="at-Layout-main"> <div class="at-Layout-main">
<ng-transclude></ng-transclude> <div class="at-Layout-content">
<div class="at-Layout-footer"> <ng-transclude></ng-transclude>
</div>
<div class="at-Layout-footer" ng-show="vm.isLoggedIn">
<a ui-sref="about">{{ vm.getString('FOOTER_ABOUT') }} {{ vm.getString('BRAND_NAME') }}</a>| <a ui-sref="about">{{ vm.getString('FOOTER_ABOUT') }} {{ vm.getString('BRAND_NAME') }}</a>|
{{ vm.getString('FOOTER_COPYRIGHT') }} {{ vm.getString('FOOTER_COPYRIGHT') }}
</div> </div>

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

@@ -196,6 +196,7 @@
@at-padding-side-nav-item-icon: @at-space-3x; @at-padding-side-nav-item-icon: @at-space-3x;
@at-padding-between-side-nav-icon-text: @at-space-3x; @at-padding-between-side-nav-icon-text: @at-space-3x;
@at-padding-footer-right: @at-space-4x; @at-padding-footer-right: @at-space-4x;
@at-padding-footer-bottom: @at-space-4x;
@at-margin-input-message: @at-space; @at-margin-input-message: @at-space;
@at-margin-item-column: @at-space-3x; @at-margin-item-column: @at-space-3x;
@@ -208,6 +209,7 @@
@at-margin-top-nav-item-between-icon-and-name: @at-space-2x; @at-margin-top-nav-item-between-icon-and-name: @at-space-2x;
@at-margin-top-nav-item-icon-socket-top-makeup: -3px; @at-margin-top-nav-item-icon-socket-top-makeup: -3px;
@at-margin-after-footer-link: @at-space; @at-margin-after-footer-link: @at-space;
@at-margin-footer-top: @at-space-4x;
@at-margin-top-search-key: @at-space-2x; @at-margin-top-search-key: @at-space-2x;