Skip to content

Commit a04dc02

Browse files
author
Adam Bradley
committed
firefox .button-bar, fixes #176
1 parent 41581e3 commit a04dc02

File tree

4 files changed

+22
-19
lines changed

4 files changed

+22
-19
lines changed

dist/css/ionic.css

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,6 +1139,7 @@ a.subdued {
11391139
.tabs {
11401140
display: -webkit-box;
11411141
display: -webkit-flex;
1142+
display: -moz-box;
11421143
display: -moz-flex;
11431144
display: -ms-flexbox;
11441145
display: flex;
@@ -1294,6 +1295,7 @@ a.subdued {
12941295
.item.tabs {
12951296
display: -webkit-box;
12961297
display: -webkit-flex;
1298+
display: -moz-box;
12971299
display: -moz-flex;
12981300
display: -ms-flexbox;
12991301
display: flex;
@@ -1592,6 +1594,7 @@ button.item.item-complex {
15921594
.item-icon-right .icon {
15931595
display: -webkit-box;
15941596
display: -webkit-flex;
1597+
display: -moz-box;
15951598
display: -moz-flex;
15961599
display: -ms-flexbox;
15971600
display: flex;
@@ -1646,6 +1649,7 @@ button.item.item-complex {
16461649
.item-button-left .item-content > .button {
16471650
display: -webkit-box;
16481651
display: -webkit-flex;
1652+
display: -moz-box;
16491653
display: -moz-flex;
16501654
display: -ms-flexbox;
16511655
display: flex;
@@ -1676,6 +1680,7 @@ button.item.item-button-right {
16761680
.item-button-right .item-content > .button {
16771681
display: -webkit-box;
16781682
display: -webkit-flex;
1683+
display: -moz-box;
16791684
display: -moz-flex;
16801685
display: -ms-flexbox;
16811686
display: flex;
@@ -1712,6 +1717,7 @@ button.item:after {
17121717
/* By default, both <a> and <button> have right side arrow icons */
17131718
display: -webkit-box;
17141719
display: -webkit-flex;
1720+
display: -moz-box;
17151721
display: -moz-flex;
17161722
display: -ms-flexbox;
17171723
display: flex;
@@ -1833,6 +1839,7 @@ button.item-button-right:after {
18331839
.item-edit .button .icon, .item-edit .button i {
18341840
display: -webkit-box;
18351841
display: -webkit-flex;
1842+
display: -moz-box;
18361843
display: -moz-flex;
18371844
display: -ms-flexbox;
18381845
display: flex;
@@ -1874,6 +1881,7 @@ button.item-button-right:after {
18741881
.item-drag .button .icon, .item-drag .button i {
18751882
display: -webkit-box;
18761883
display: -webkit-flex;
1884+
display: -moz-box;
18771885
display: -moz-flex;
18781886
display: -ms-flexbox;
18791887
display: flex;
@@ -2100,6 +2108,7 @@ button.item-button-right:after {
21002108
.split-pane {
21012109
display: -webkit-box;
21022110
display: -webkit-flex;
2111+
display: -moz-box;
21032112
display: -moz-flex;
21042113
display: -ms-flexbox;
21052114
display: flex;
@@ -2172,6 +2181,7 @@ textarea {
21722181
.item-input {
21732182
display: -webkit-box;
21742183
display: -webkit-flex;
2184+
display: -moz-box;
21752185
display: -moz-flex;
21762186
display: -ms-flexbox;
21772187
display: flex;
@@ -2415,6 +2425,7 @@ input[type="checkbox"][readonly] {
24152425
.item-checkbox .checkbox {
24162426
display: -webkit-box;
24172427
display: -webkit-flex;
2428+
display: -moz-box;
24182429
display: -moz-flex;
24192430
display: -ms-flexbox;
24202431
display: flex;
@@ -2585,6 +2596,7 @@ input[type="range"] {
25852596
.range {
25862597
display: -webkit-box;
25872598
display: -webkit-flex;
2599+
display: -moz-box;
25882600
display: -moz-flex;
25892601
display: -ms-flexbox;
25902602
display: flex;
@@ -3025,21 +3037,11 @@ a.button {
30253037
.button-bar {
30263038
display: -webkit-box;
30273039
display: -webkit-flex;
3040+
display: -moz-box;
30283041
display: -moz-flex;
30293042
display: -ms-flexbox;
30303043
display: flex;
3031-
-webkit-box-flex: 1;
3032-
-webkit-flex: 1;
3033-
-moz-box-flex: 1;
3034-
-moz-flex: 1;
3035-
-ms-flex: 1;
3036-
flex: 1;
3037-
-webkit-box-direction: normal;
3038-
-webkit-box-orient: horizontal;
3039-
-webkit-flex-direction: horizontal;
3040-
-moz-flex-direction: horizontal;
3041-
-ms-flex-direction: horizontal;
3042-
flex-direction: horizontal; }
3044+
width: 100%; }
30433045

30443046
.button-bar > .button {
30453047
-webkit-box-flex: 1;
@@ -3048,9 +3050,9 @@ a.button {
30483050
-moz-flex: 1;
30493051
-ms-flex: 1;
30503052
flex: 1;
3053+
display: block;
30513054
overflow: hidden;
30523055
padding: 0 16px;
3053-
width: 0;
30543056
border-width: 1px 0px 1px 1px;
30553057
border-radius: 0;
30563058
text-align: center;
@@ -3412,10 +3414,12 @@ a.button {
34123414
.row {
34133415
display: -webkit-box;
34143416
display: -webkit-flex;
3417+
display: -moz-box;
34153418
display: -moz-flex;
34163419
display: -ms-flexbox;
34173420
display: flex;
3418-
padding: 5px; }
3421+
padding: 5px;
3422+
width: 100%; }
34193423

34203424
.row + .row {
34213425
margin-top: -5px;

scss/_button-bar.scss

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,17 @@
66

77
.button-bar {
88
@include display-flex();
9-
@include flex(1);
10-
@include flex-direction(horizontal);
9+
width: 100%;
1110
}
1211

1312
.button-bar > .button {
1413
@include flex(1);
14+
display: block;
1515

1616
overflow: hidden;
1717

1818
padding: 0 16px;
1919

20-
// Fix for unequal widths of buttons
21-
width: 0;
22-
2320
border-width: 1px 0px 1px 1px;
2421
border-radius: 0;
2522
text-align: center;

scss/_grid.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
.row {
1313
@include display-flex();
1414
padding: ($grid-padding-width / 2);
15+
width: 100%;
1516
}
1617

1718
.row + .row {

scss/_mixins.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,7 @@
388388
@mixin display-flex {
389389
display: -webkit-box;
390390
display: -webkit-flex;
391+
display: -moz-box;
391392
display: -moz-flex;
392393
display: -ms-flexbox;
393394
display: flex;

0 commit comments

Comments
 (0)