diff --git a/src/components/toolbar/toolbar.ios.scss b/src/components/toolbar/toolbar.ios.scss index fdb76da198..5115346390 100644 --- a/src/components/toolbar/toolbar.ios.scss +++ b/src/components/toolbar/toolbar.ios.scss @@ -14,7 +14,6 @@ $toolbar-order-ios: ( menu-toggle-end: 7, ); -$toolbar-ios-padding: 4px !default; $toolbar-ios-button-font-size: 1.7rem !default; $toolbar-ios-title-font-size: 1.7rem !default; @@ -80,8 +79,6 @@ $navbar-ios-height: $toolbar-ios-height !default; } .toolbar-title-ios { - margin-top: 1px; - font-size: $toolbar-ios-title-font-size; font-weight: $toolbar-ios-title-font-weight; text-align: $toolbar-ios-title-text-align; @@ -157,7 +154,7 @@ $navbar-ios-height: $toolbar-ios-height !default; // -------------------------------------------------- .bar-button-ios { - padding: 0 5px; + padding: 0 4px; height: 32px; diff --git a/src/components/toolbar/toolbar.md.scss b/src/components/toolbar/toolbar.md.scss index c59184ba8b..4cbb41568e 100644 --- a/src/components/toolbar/toolbar.md.scss +++ b/src/components/toolbar/toolbar.md.scss @@ -14,7 +14,6 @@ $toolbar-order-md: ( menu-toggle-end: 7, ); -$toolbar-md-padding: 4px !default; $toolbar-md-title-font-size: 2rem !default; $toolbar-md-title-text-color: color-contrast($colors-md, $toolbar-md-background, md) !default; diff --git a/src/components/toolbar/toolbar.wp.scss b/src/components/toolbar/toolbar.wp.scss index 6304f96d7a..490c0b40ac 100644 --- a/src/components/toolbar/toolbar.wp.scss +++ b/src/components/toolbar/toolbar.wp.scss @@ -14,7 +14,6 @@ $toolbar-order-wp: ( menu-toggle-end: 7, ); -$toolbar-wp-padding: 4px !default; $toolbar-wp-title-padding: 0 6px !default; $toolbar-wp-title-font-size: 1.5rem !default; $toolbar-wp-title-font-weight: bold !default; diff --git a/src/platform/cordova.ios.scss b/src/platform/cordova.ios.scss index 5c473c0b5e..a35a77f0b7 100644 --- a/src/platform/cordova.ios.scss +++ b/src/platform/cordova.ios.scss @@ -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); } \ No newline at end of file diff --git a/src/platform/cordova.md.scss b/src/platform/cordova.md.scss index a1838f4ea2..4449c019aa 100644 --- a/src/platform/cordova.md.scss +++ b/src/platform/cordova.md.scss @@ -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); } diff --git a/src/platform/cordova.scss b/src/platform/cordova.scss index 8524d6dfef..f8da72a66b 100644 --- a/src/platform/cordova.scss +++ b/src/platform/cordova.scss @@ -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}); diff --git a/src/platform/cordova.wp.scss b/src/platform/cordova.wp.scss index 79a4280edf..a6b3928ed1 100644 --- a/src/platform/cordova.wp.scss +++ b/src/platform/cordova.wp.scss @@ -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); } diff --git a/src/themes/ionic.theme.default.ios.scss b/src/themes/ionic.theme.default.ios.scss index 14377b73bf..20e00ac0dc 100644 --- a/src/themes/ionic.theme.default.ios.scss +++ b/src/themes/ionic.theme.default.ios.scss @@ -21,6 +21,7 @@ $content-ios-margin: $content-margin !default; // -------------------------------------------------- $toolbar-ios-height: 44px !default; +$toolbar-ios-padding: 4px !default; $toolbar-ios-background: $toolbar-background !default; $toolbar-ios-border-color: rgba(0, 0, 0, .3) !default; $toolbar-ios-text-color: $toolbar-text-color !default; diff --git a/src/themes/ionic.theme.default.md.scss b/src/themes/ionic.theme.default.md.scss index dceda8f2ab..86dca77f3d 100644 --- a/src/themes/ionic.theme.default.md.scss +++ b/src/themes/ionic.theme.default.md.scss @@ -21,6 +21,7 @@ $content-md-margin: $content-margin !default; // -------------------------------------------------- $toolbar-md-height: 56px !default; +$toolbar-md-padding: 4px !default; $toolbar-md-background: $toolbar-background !default; $toolbar-md-border-color: $toolbar-border-color !default; $toolbar-md-text-color: #424242 !default; diff --git a/src/themes/ionic.theme.default.wp.scss b/src/themes/ionic.theme.default.wp.scss index f98ca66528..4620c2b034 100644 --- a/src/themes/ionic.theme.default.wp.scss +++ b/src/themes/ionic.theme.default.wp.scss @@ -21,6 +21,7 @@ $content-wp-margin: $content-margin !default; // -------------------------------------------------- $toolbar-wp-height: 46px !default; +$toolbar-wp-padding: 4px !default; $toolbar-wp-background: $toolbar-background !default; $toolbar-wp-border-color: $toolbar-border-color !default; $toolbar-wp-text-color: $toolbar-text-color !default;