chore(sass): move z-index vars to separate file, remove unused vars

This commit is contained in:
Adam Bradley
2016-06-17 23:21:15 -05:00
parent 48c1ffd4f9
commit cdb1f8503c
4 changed files with 29 additions and 46 deletions

View File

@@ -1,44 +1,5 @@
@import "../../globals.core";
// Z-Index
// --------------------------------------------------
// Grouped by elements which would be siblings
$z-index-menu-overlay: 80;
$z-index-menu-backdrop: 79;
$z-index-overlay: 1000;
$z-index-click-block: 9999;
$z-index-fixed-content: 2;
$z-index-scroll-content: 1;
$z-index-refresher: 0;
$z-index-navbar-section: 10;
$z-index-page-container: 0;
$z-index-selected-tab: 1;
$z-index-toolbar: 10;
$z-index-toolbar-background: 0;
$z-index-toolbar-border: 20;
$z-index-list-border: 50;
$z-index-backdrop: 2;
$z-index-overlay-wrapper: 10;
$z-index-item-options: 1;
// Flex Order
// --------------------------------------------------
$flex-order-toolbar-top: -10;
$flex-order-toolbar-bottom: 10;
$flex-order-tabbar-navbar: -30;
$flex-order-tabbar-top: -20;
$flex-order-tabbar-bottom: 20;
@import "./z-index";
// App Structure
@@ -132,7 +93,7 @@ ion-page {
height: 100%;
// do not show, but still render so we can get dimensions
visibility: hidden;
opacity: 0;
}
ion-content {
@@ -156,7 +117,7 @@ ion-page scroll-content {
ion-page.show-page {
// show the page now that it's ready
visibility: visible;
opacity: 1;
}
ion-page.show-page scroll-content {
@@ -208,11 +169,11 @@ ion-tabbar {
width: 100%;
// default to hidden until ready
visibility: hidden;
opacity: 0;
}
ion-tabbar.show-tabbar {
visibility: visible;
opacity: 1;
}
[tabbarPlacement=top] > ion-tabbar {

View File

@@ -0,0 +1,23 @@
// Z-Index
// --------------------------------------------------
// Grouped by elements which would be siblings
$z-index-menu-overlay: 80;
$z-index-menu-backdrop: 79;
$z-index-overlay: 1000;
$z-index-click-block: 9999;
$z-index-fixed-content: 2;
$z-index-scroll-content: 1;
$z-index-refresher: 0;
$z-index-page-container: 0;
$z-index-selected-tab: 1;
$z-index-toolbar: 10;
$z-index-toolbar-background: 0;
$z-index-backdrop: 2;
$z-index-overlay-wrapper: 10;
$z-index-item-options: 1;

View File

@@ -8,9 +8,7 @@ export function run() {
it('should have the correct properties on modal view controller instance', () => {
let modalViewController = Modal.create(ComponentToPresent);
expect(modalViewController.modalViewType).toEqual("ComponentToPresent");
expect(modalViewController.componentType).toEqual(ModalCmp);
expect(modalViewController.viewType).toEqual("modal");
expect(modalViewController.isOverlay).toEqual(true);
expect(modalViewController instanceof ViewController).toEqual(true);
});

View File

@@ -30,6 +30,7 @@ $toolbar-ios-button-border-radius: 4px !default;
$navbar-ios-height: $toolbar-ios-height !default;
.toolbar {
padding: $toolbar-ios-padding;