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

fix toolbar height

Browse Source
This commit is contained in:
Adam Bradley
2015-07-29 16:34:21 -05:00
parent 22b3e0d99e
commit 60624a7fe0
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ionic/components/toolbar/extensions/ios.scss
View File

@ -17,6 +17,7 @@ $toolbar-ios-title-font-size: 1.7rem !default;
.toolbar[mode="ios"] { .toolbar[mode="ios"] {
border-bottom: 1px solid $toolbar-ios-border-color; border-bottom: 1px solid $toolbar-ios-border-color;
min-height: $toolbar-ios-height;
.toolbar-title { .toolbar-title {
order: map-get($toolbar-order-ios, title); order: map-get($toolbar-order-ios, title);

10
ionic/components/toolbar/extensions/material.scss
View File

@ -2,18 +2,20 @@
// Material Design Toolbar // Material Design Toolbar
// -------------------------------------------------- // --------------------------------------------------
$toolbar-material-title-font-size: 2rem !default; $toolbar-md-height: 5.6rem !default;
$toolbar-material-button-font-size: 1.4rem !default; $toolbar-md-title-font-size: 2rem !default;
$toolbar-md-button-font-size: 1.4rem !default;
.toolbar[mode="md"] { .toolbar[mode="md"] {
min-height: $toolbar-md-height;
.toolbar-inner-title { .toolbar-inner-title {
padding: 0px 12px; padding: 0px 12px;
} }
ion-title { ion-title {
font-size: $toolbar-material-title-font-size; font-size: $toolbar-md-title-font-size;
font-weight: 500; font-weight: 500;
} }
@ -23,7 +25,7 @@ $toolbar-material-button-font-size: 1.4rem !default;
button, button,
[button] { [button] {
font-size: $toolbar-material-button-font-size; font-size: $toolbar-md-button-font-size;
} }
} }

2
ionic/components/toolbar/toolbar.scss
View File

@ -19,8 +19,6 @@ $toolbar-title-text-color: #000 !default;
z-index: $z-index-toolbar; z-index: $z-index-toolbar;
width: 100%; width: 100%;
height: 100%;
min-height: 4.4rem;
padding: 4px; padding: 4px;
display: flex; display: flex;