javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(nav): back button and title not aligned on baseline

Browse Source 
fixes #8983
This commit is contained in:
Manu Mtz.-Almeida
2016-11-27 18:09:23 +01:00
parent 78e1e97975
commit d82bb01505
10 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/platform/cordova.ios.scss
View File

@@ -11,5 +11,5 @@ $cordova-ios-statusbar-padding-modal-max-width: $cordova-statusbar-paddi
// Cordova mixins are in the main cordova file
.ios {
@include statusbar-padding($toolbar-ios-height, $content-ios-padding, $cordova-ios-statusbar-padding, $cordova-ios-statusbar-padding-modal-max-width, true);
@include statusbar-padding($toolbar-ios-height, $toolbar-ios-padding, $content-ios-padding, $cordova-ios-statusbar-padding, $cordova-ios-statusbar-padding-modal-max-width, true);
}

2
src/platform/cordova.md.scss
View File

@@ -11,6 +11,6 @@ $cordova-md-statusbar-padding-modal-max-width: $cordova-statusbar-paddin
// Cordova mixins are in the main cordova file
.md {
@include statusbar-padding($toolbar-md-height, $content-md-padding, $cordova-md-statusbar-padding, $cordova-md-statusbar-padding-modal-max-width);
@include statusbar-padding($toolbar-md-height, $toolbar-md-padding, $content-md-padding, $cordova-md-statusbar-padding, $cordova-md-statusbar-padding-modal-max-width);
}

10
src/platform/cordova.scss
View File

@@ -7,7 +7,7 @@
$cordova-statusbar-padding-modal-max-width: 767px !default;
@mixin statusbar-padding($toolbar-height, $content-padding, $cordova-statusbar-padding, $modal-max-width, $style-title: false) {
@mixin statusbar-padding($toolbar-height, $toolbar-padding, $content-padding, $cordova-statusbar-padding, $modal-max-width, $style-title: false) {
ion-nav > .ion-page,
ion-nav > .ion-page > ion-header,
@@ -16,7 +16,7 @@ $cordova-statusbar-padding-modal-max-width: 767px !default;
ion-menu > .menu-inner,
ion-menu > .menu-inner > ion-header {
@include toolbar-statusbar-padding($toolbar-height, $content-padding, $cordova-statusbar-padding);
@include toolbar-statusbar-padding($toolbar-height, $toolbar-padding, $content-padding, $cordova-statusbar-padding);
// If we should style the title elements in the toolbar
@if ($style-title) {
@@ -26,7 +26,7 @@ $cordova-statusbar-padding-modal-max-width: 767px !default;
@media only screen and (max-width: $modal-max-width) {
.modal-wrapper > .ion-page > ion-header {
@include toolbar-statusbar-padding($toolbar-height, $content-padding, $cordova-statusbar-padding);
@include toolbar-statusbar-padding($toolbar-height, $toolbar-padding, $content-padding, $cordova-statusbar-padding);
// If we should style the title elements in the toolbar
@if ($style-title) {
@@ -40,10 +40,10 @@ $cordova-statusbar-padding-modal-max-width: 767px !default;
// The first-child should get modified padding-top for the status bar
// --------------------------------------------------------------------------------
@mixin toolbar-statusbar-padding($toolbar-height, $content-padding, $cordova-statusbar-padding) {
@mixin toolbar-statusbar-padding($toolbar-height, $toolbar-padding, $content-padding, $cordova-statusbar-padding) {
> .toolbar.statusbar-padding:first-child {
padding-top: $cordova-statusbar-padding;
padding-top: calc(#{$cordova-statusbar-padding} + #{$toolbar-padding});
height: calc(#{$toolbar-height} + #{$cordova-statusbar-padding});
min-height: calc(#{$toolbar-height} + #{$cordova-statusbar-padding});

2
src/platform/cordova.wp.scss
View File

@@ -11,5 +11,5 @@ $cordova-wp-statusbar-padding-modal-max-width: $cordova-statusbar-paddin
// Cordova mixins are in the main cordova file
.wp {
@include statusbar-padding($toolbar-wp-height, $content-wp-padding, $cordova-wp-statusbar-padding, $cordova-wp-statusbar-padding-modal-max-width);
@include statusbar-padding($toolbar-wp-height, $toolbar-wp-padding, $content-wp-padding, $cordova-wp-statusbar-padding, $cordova-wp-statusbar-padding-modal-max-width);
}