Merge branch '2.0' of github.com:driftyco/ionic into 2.0

This commit is contained in:
Dan Bucholtz
2016-06-09 13:54:54 -05:00
3 changed files with 3 additions and 3 deletions

View File

@ -18,7 +18,7 @@ ion-menu {
} }
@media only screen and (max-width: $cordova-ios-statusbar-padding-modal-max-width) { @media only screen and (max-width: $cordova-ios-statusbar-padding-modal-max-width) {
.modal-wrapper > ion-page { .modal-wrapper > ion-modal-inner {
@include toolbar-statusbar-padding($toolbar-ios-height, $content-ios-padding); @include toolbar-statusbar-padding($toolbar-ios-height, $content-ios-padding);
@include toolbar-title-statusbar-padding($toolbar-ios-height, $content-ios-padding); @include toolbar-title-statusbar-padding($toolbar-ios-height, $content-ios-padding);
} }

View File

@ -16,7 +16,7 @@ ion-menu {
} }
@media only screen and (max-width: $cordova-md-statusbar-padding-modal-max-width) { @media only screen and (max-width: $cordova-md-statusbar-padding-modal-max-width) {
.modal-wrapper > ion-page { .modal-wrapper > ion-modal-inner {
@include toolbar-statusbar-padding($toolbar-md-height, $content-md-padding); @include toolbar-statusbar-padding($toolbar-md-height, $content-md-padding);
} }
} }

View File

@ -16,7 +16,7 @@ ion-menu {
} }
@media only screen and (max-width: $cordova-wp-statusbar-padding-modal-max-width) { @media only screen and (max-width: $cordova-wp-statusbar-padding-modal-max-width) {
.modal-wrapper > ion-page { .modal-wrapper > ion-modal-inner {
@include toolbar-statusbar-padding($toolbar-wp-height, $content-wp-padding); @include toolbar-statusbar-padding($toolbar-wp-height, $content-wp-padding);
} }
} }