diff --git a/example/headers.html b/example/headers.html index 1d1703ecfc..ffefae5e12 100644 --- a/example/headers.html +++ b/example/headers.html @@ -20,14 +20,9 @@ - - Back - This - Really really really really really really really really long title! - - Forward - + Back + This @@ -37,19 +32,13 @@ - - Back - This - + Back Success Warning Danger - - Back - This - + This diff --git a/scss/ionic/structure/_bar.scss b/scss/ionic/structure/_bar.scss index 3c31130559..46a574da79 100644 --- a/scss/ionic/structure/_bar.scss +++ b/scss/ionic/structure/_bar.scss @@ -3,6 +3,9 @@ .bar { @include disable-user-select(); + display: -webkit-box; + display: box; + position: fixed; left: 0; right: 0; @@ -19,9 +22,9 @@ position: absolute; z-index: 0; - width: 100%; top: 0; left: 0; + right: 0; line-height: $barHeight; @@ -44,41 +47,20 @@ color: inherit; } + .button { + @include box-flex(0); + } + // Place the last button in a bar on the right of the bar - /* .title + .button:last-child, - .button + .button:last-child, - .button.pull-right { + > .button + > .button:last-child, + > .button.pull-right { position: absolute; top: 5px; right: 5px; } - */ } -.buttons { - position: absolute; - - // Lift the buttons container above the title - z-index: 1; - - padding: $barPaddingPortrait; - line-height: $barButtonsLineHeight; - - - .button { - padding: 6px 12px; - line-height: 14px; - } -} -.buttons:first-child { - left: 0; - top: 0; -} -.buttons:last-child { - right: 0; - top: 0; -} // Header at top .bar-header { diff --git a/scss/ionic/structure/_button-group.scss b/scss/ionic/structure/_button-group.scss index f601dec10d..4ff1f60320 100644 --- a/scss/ionic/structure/_button-group.scss +++ b/scss/ionic/structure/_button-group.scss @@ -75,7 +75,6 @@ .button-bar > .button { @include box-flex(1); // Fix for box-flex width issue - width: 0; line-height: 8px; border-radius: 0;