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

Fix footer blocks visibility of items
This commit is contained in:
Jared Tabor 2017-09-14 10:58:15 -07:00 committed by GitHub
commit bd5846d143
3 changed files with 15 additions and 17 deletions

View File

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

View File

@ -76,8 +76,10 @@
</at-side-nav-item>
</at-side-nav>
<div class="at-Layout-main">
<ng-transclude></ng-transclude>
<div class="at-Layout-footer">
<div class="at-Layout-content">
<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>|
{{ vm.getString('FOOTER_COPYRIGHT') }}
</div>

View File

@ -196,6 +196,7 @@
@at-padding-side-nav-item-icon: @at-space-3x;
@at-padding-between-side-nav-icon-text: @at-space-3x;
@at-padding-footer-right: @at-space-4x;
@at-padding-footer-bottom: @at-space-4x;
@at-margin-input-message: @at-space;
@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-icon-socket-top-makeup: -3px;
@at-margin-after-footer-link: @at-space;
@at-margin-footer-top: @at-space-4x;
@at-margin-top-search-key: @at-space-2x;