diff --git a/dist/ionic.css b/dist/ionic.css index e259013f7e..326e1f0c73 100644 --- a/dist/ionic.css +++ b/dist/ionic.css @@ -1099,16 +1099,19 @@ a.list-item { display: box; height: 100%; list-style: none; + box-orient: horizontal; -webkit-box-orient: horizontal; - box-orient: horizontal; } + -moz-box-orient: horizontal; } /* Navigational tab */ .tab-item { height: 100%; text-align: center; box-sizing: border-box; + box-flex: 1; -webkit-box-flex: 1; - box-flex: 1; } + -moz-box-flex: 1; + width: 0; } .tab-item a { text-decoration: none; display: block; diff --git a/example/index.html b/example/index.html index 50107c2c6f..d9db52a6b6 100644 --- a/example/index.html +++ b/example/index.html @@ -22,24 +22,24 @@
-

Alerts

-

Buttons

-

Button Groups

-

Events

-

Footers

-

Forms

-

Grids

-

Headers

-

Image Swipe

-

Input: Slider

-

Input: Text

-

Input: Toggle

-

Lists

-

Modals

-

Panels

-

Popovers

-

Pull To Refresh

-

Tab Bars

+

Alerts

+

Buttons

+

Button Groups

+

Events

+

Footers

+

Forms

+

Grids

+

Headers

+

Image Swipe

+

Input: Slider

+

Input: Text

+

Input: Toggle

+

Lists

+

Modals

+

Panels

+

Popovers

+

Pull To Refresh

+

Tab Bars

diff --git a/scss/ionic/_mixins.scss b/scss/ionic/_mixins.scss index e89758e297..be1c991b49 100644 --- a/scss/ionic/_mixins.scss +++ b/scss/ionic/_mixins.scss @@ -1,3 +1,7 @@ +// _mixins.scss +// +// Useful utilities and mixins for SCSS files. + @mixin button-style($bgColor, $borderColor, $color) { color: $color; background-color: $bgColor; @@ -405,6 +409,18 @@ filter: alpha(opacity=$opacity); } +@mixin box-orient($orientation) { + box-orient: $orientation; + -webkit-box-orient: $orientation; + -moz-box-orient: $orientation; +} + +@mixin box-flex($flex) { + box-flex: 1; + -webkit-box-flex: $flex; + -moz-box-flex: $flex; +} + // BACKGROUNDS diff --git a/scss/ionic/structure/_tabs.scss b/scss/ionic/structure/_tabs.scss index 94ef0270c4..4c5fa99539 100644 --- a/scss/ionic/structure/_tabs.scss +++ b/scss/ionic/structure/_tabs.scss @@ -14,8 +14,7 @@ display: box; height: 100%; list-style: none; - -webkit-box-orient: horizontal; - box-orient: horizontal; + @include box-orient(horizontal); } /* Navigational tab */ @@ -23,8 +22,11 @@ height: 100%; text-align: center; box-sizing: border-box; - -webkit-box-flex: 1; - box-flex: 1; + + @include box-flex(1); + + // Required to force box elements to be the same size; + width: 0; a { text-decoration: none;