Skip to content

Commit ab6fb75

Browse files
committed
finalize-release: v1.0.0-beta.4 "antimony-antelope"
1 parent e9ef78d commit ab6fb75

13 files changed

+11553
-778
lines changed

bower.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ionic",
3-
"version": "1.0.0-beta.3",
4-
"codename": "americium",
3+
"version": "1.0.0-beta.4",
4+
"codename": "antimony-antelope",
55
"homepage": "https://github.com/driftyco/ionic",
66
"authors": [
77
"Max Lynch <[email protected]>",

component.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"repo": "driftyco/ionic",
33
"development": {},
4-
"version": "1.0.0-beta.3",
4+
"version": "1.0.0-beta.4",
55
"styles": [
66
"dist/css/ionic.css"
77
],

config/CODENAMES

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
1-
antimony-antelope
2-
barium-bobcat
3-
cadmium-camel
4-
darmstadtium-dingo
5-
einsteinium-emu
6-
fermium-flamingo
7-
gadolinium-gator
8-
hafnium-heron
1+
barium-bobcat cadmium-camel darmstadtium-dingo einsteinium-emu fermium-flamingo gadolinium-gator hafnium-heron

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "ionic",
33
"private": false,
44
"version": "1.0.0-beta.4",
5-
"codename": "americium",
5+
"codename": "antimony-antelope",
66
"repository": {
77
"url": "git://github.com/driftyco/ionic.git"
88
},

release/css/ionic.css

+34-17
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright 2014 Drifty Co.
33
* http://drifty.com/
44
*
5-
* Ionic, v1.0.0-beta.3
5+
* Ionic, v1.0.0-beta.4
66
* A powerful HTML5 mobile app framework.
77
* http://ionicframework.com/
88
*
@@ -2116,6 +2116,8 @@ body.grade-b, body.grade-c {
21162116
.scroll-refresher .ionic-refresher-content .text-refreshing, .scroll-refresher .ionic-refresher-content .text-pulling {
21172117
line-height: 16px;
21182118
font-size: 16px; }
2119+
.scroll-refresher .ionic-refresher-content.ionic-refresher-with-text {
2120+
bottom: 10px; }
21192121
.scroll-refresher .icon-refreshing, .scroll-refresher .icon-pulling {
21202122
width: 100%;
21212123
-webkit-backface-visibility: hidden;
@@ -2232,8 +2234,7 @@ ion-infinite-scroll.active .scroll-infinite {
22322234
left: 0;
22332235
width: 100%;
22342236
height: 100%;
2235-
background-color: #fff;
2236-
overflow: hidden; }
2237+
background-color: #fff; }
22372238

22382239
/**
22392240
* Typography
@@ -3000,7 +3001,7 @@ a.subdued {
30003001
.tabs-item-hide > .tabs, .tabs.tabs-item-hide {
30013002
display: none; }
30023003

3003-
.tabs-icon-top > .tabs .tab-item, .tabs-icon-bottom > .tabs .tab-item {
3004+
.tabs-icon-top > .tabs .tab-item, .tabs-icon-top.tabs .tab-item, .tabs-icon-bottom > .tabs .tab-item, .tabs-icon-bottom.tabs .tab-item {
30043005
font-size: 12px;
30053006
line-height: 14px; }
30063007

@@ -3010,22 +3011,22 @@ a.subdued {
30103011
height: 32px;
30113012
font-size: 32px; }
30123013

3013-
.tabs-icon-left > .tabs .tab-item, .tabs-icon-right > .tabs .tab-item {
3014+
.tabs-icon-left.tabs .tab-item, .tabs-icon-left > .tabs .tab-item, .tabs-icon-right.tabs .tab-item, .tabs-icon-right > .tabs .tab-item {
30143015
font-size: 12px; }
3015-
.tabs-icon-left > .tabs .tab-item .icon, .tabs-icon-right > .tabs .tab-item .icon {
3016+
.tabs-icon-left.tabs .tab-item .icon, .tabs-icon-left > .tabs .tab-item .icon, .tabs-icon-right.tabs .tab-item .icon, .tabs-icon-right > .tabs .tab-item .icon {
30163017
display: inline-block;
30173018
vertical-align: top; }
3018-
.tabs-icon-left > .tabs .tab-item .icon:before, .tabs-icon-right > .tabs .tab-item .icon:before {
3019+
.tabs-icon-left.tabs .tab-item .icon:before, .tabs-icon-left > .tabs .tab-item .icon:before, .tabs-icon-right.tabs .tab-item .icon:before, .tabs-icon-right > .tabs .tab-item .icon:before {
30193020
font-size: 24px;
30203021
line-height: 49px; }
30213022

3022-
.tabs-icon-left .tab-item .icon {
3023+
.tabs-icon-left > .tabs .tab-item .icon, .tabs-icon-left.tabs .tab-item .icon {
30233024
padding-right: 3px; }
30243025

3025-
.tabs-icon-right .tab-item .icon {
3026+
.tabs-icon-right > .tabs .tab-item .icon, .tabs-icon-right.tabs .tab-item .icon {
30263027
padding-left: 3px; }
30273028

3028-
.tabs-icon-only .icon {
3029+
.tabs-icon-only > .tabs .icon, .tabs-icon-only.tabs .icon {
30293030
line-height: inherit; }
30303031

30313032
.tab-item.has-badge {
@@ -3165,7 +3166,7 @@ a.subdued {
31653166

31663167
.modal-open {
31673168
pointer-events: none; }
3168-
.modal-open .modal {
3169+
.modal-open .modal, .modal-open .modal-backdrop {
31693170
pointer-events: auto; }
31703171

31713172
/**
@@ -4463,10 +4464,14 @@ input[type="radio"][disabled], input[type="checkbox"][disabled], input[type="rad
44634464
transform: translate3d(22px, 0, 0);
44644465
background-color: #fff; }
44654466

4466-
.item-toggle {
4467+
.item-toggle.active {
4468+
box-shadow: none; }
4469+
4470+
.item-toggle, .item-toggle.item-complex .item-content {
44674471
padding-right: 99px; }
4468-
.item-toggle.active {
4469-
box-shadow: none; }
4472+
4473+
.item-toggle.item-complex {
4474+
padding-right: 0; }
44704475

44714476
.item-toggle .toggle {
44724477
position: absolute;
@@ -6194,9 +6199,10 @@ a.button {
61946199
.invisible {
61956200
visibility: hidden; }
61966201

6197-
.keyboard-open .bar-footer, .keyboard-open .tabs, .footer-hide .bar-footer, .footer-hide .tabs {
6202+
.keyboard-open .hide-on-keyboard-open {
61986203
display: none; }
6199-
.keyboard-open .has-footer, .keyboard-open .has-tabs, .footer-hide .has-footer, .footer-hide .has-tabs {
6204+
6205+
.keyboard-open .tabs.hide-on-keyboard-open + .pane .has-tabs, .keyboard-open .bar-footer.hide-on-keyboard-open + .pane .has-footer {
62006206
bottom: 0; }
62016207

62026208
.inline {
@@ -6220,6 +6226,9 @@ a.button {
62206226
-ms-touch-action: none;
62216227
-ms-content-zooming: none; }
62226228

6229+
.no-resize {
6230+
resize: none; }
6231+
62236232
.block {
62246233
display: block;
62256234
clear: both; }
@@ -6359,7 +6368,7 @@ a.button {
63596368
/**
63606369
* Platform
63616370
* --------------------------------------------------
6362-
* Platform specific tweaks when in Cordova.
6371+
* Platform specific tweaks
63636372
*/
63646373
.platform-ios7.platform-cordova:not(.fullscreen) .bar-header:not(.bar-subheader) {
63656374
height: 64px; }
@@ -6379,3 +6388,11 @@ a.button {
63796388
top: 157px; }
63806389
.platform-ios7.platform-cordova.status-bar-hide {
63816390
margin-bottom: 20px; }
6391+
6392+
@media (orientation: landscape) {
6393+
.platform-ios7.platform-browser.platform-ipad {
6394+
position: fixed; } }
6395+
6396+
.platform-android2:not(.enable-transitions) * {
6397+
-webkit-transition: none !important;
6398+
transition: none !important; }

release/css/ionic.min.css

+34-17
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright 2014 Drifty Co.
33
* http://drifty.com/
44
*
5-
* Ionic, v1.0.0-beta.3
5+
* Ionic, v1.0.0-beta.4
66
* A powerful HTML5 mobile app framework.
77
* http://ionicframework.com/
88
*
@@ -2116,6 +2116,8 @@ body.grade-b, body.grade-c {
21162116
.scroll-refresher .ionic-refresher-content .text-refreshing, .scroll-refresher .ionic-refresher-content .text-pulling {
21172117
line-height: 16px;
21182118
font-size: 16px; }
2119+
.scroll-refresher .ionic-refresher-content.ionic-refresher-with-text {
2120+
bottom: 10px; }
21192121
.scroll-refresher .icon-refreshing, .scroll-refresher .icon-pulling {
21202122
width: 100%;
21212123
-webkit-backface-visibility: hidden;
@@ -2232,8 +2234,7 @@ ion-infinite-scroll.active .scroll-infinite {
22322234
left: 0;
22332235
width: 100%;
22342236
height: 100%;
2235-
background-color: #fff;
2236-
overflow: hidden; }
2237+
background-color: #fff; }
22372238

22382239
/**
22392240
* Typography
@@ -3000,7 +3001,7 @@ a.subdued {
30003001
.tabs-item-hide > .tabs, .tabs.tabs-item-hide {
30013002
display: none; }
30023003

3003-
.tabs-icon-top > .tabs .tab-item, .tabs-icon-bottom > .tabs .tab-item {
3004+
.tabs-icon-top > .tabs .tab-item, .tabs-icon-top.tabs .tab-item, .tabs-icon-bottom > .tabs .tab-item, .tabs-icon-bottom.tabs .tab-item {
30043005
font-size: 12px;
30053006
line-height: 14px; }
30063007

@@ -3010,22 +3011,22 @@ a.subdued {
30103011
height: 32px;
30113012
font-size: 32px; }
30123013

3013-
.tabs-icon-left > .tabs .tab-item, .tabs-icon-right > .tabs .tab-item {
3014+
.tabs-icon-left.tabs .tab-item, .tabs-icon-left > .tabs .tab-item, .tabs-icon-right.tabs .tab-item, .tabs-icon-right > .tabs .tab-item {
30143015
font-size: 12px; }
3015-
.tabs-icon-left > .tabs .tab-item .icon, .tabs-icon-right > .tabs .tab-item .icon {
3016+
.tabs-icon-left.tabs .tab-item .icon, .tabs-icon-left > .tabs .tab-item .icon, .tabs-icon-right.tabs .tab-item .icon, .tabs-icon-right > .tabs .tab-item .icon {
30163017
display: inline-block;
30173018
vertical-align: top; }
3018-
.tabs-icon-left > .tabs .tab-item .icon:before, .tabs-icon-right > .tabs .tab-item .icon:before {
3019+
.tabs-icon-left.tabs .tab-item .icon:before, .tabs-icon-left > .tabs .tab-item .icon:before, .tabs-icon-right.tabs .tab-item .icon:before, .tabs-icon-right > .tabs .tab-item .icon:before {
30193020
font-size: 24px;
30203021
line-height: 49px; }
30213022

3022-
.tabs-icon-left .tab-item .icon {
3023+
.tabs-icon-left > .tabs .tab-item .icon, .tabs-icon-left.tabs .tab-item .icon {
30233024
padding-right: 3px; }
30243025

3025-
.tabs-icon-right .tab-item .icon {
3026+
.tabs-icon-right > .tabs .tab-item .icon, .tabs-icon-right.tabs .tab-item .icon {
30263027
padding-left: 3px; }
30273028

3028-
.tabs-icon-only .icon {
3029+
.tabs-icon-only > .tabs .icon, .tabs-icon-only.tabs .icon {
30293030
line-height: inherit; }
30303031

30313032
.tab-item.has-badge {
@@ -3165,7 +3166,7 @@ a.subdued {
31653166

31663167
.modal-open {
31673168
pointer-events: none; }
3168-
.modal-open .modal {
3169+
.modal-open .modal, .modal-open .modal-backdrop {
31693170
pointer-events: auto; }
31703171

31713172
/**
@@ -4463,10 +4464,14 @@ input[type="radio"][disabled], input[type="checkbox"][disabled], input[type="rad
44634464
transform: translate3d(22px, 0, 0);
44644465
background-color: #fff; }
44654466

4466-
.item-toggle {
4467+
.item-toggle.active {
4468+
box-shadow: none; }
4469+
4470+
.item-toggle, .item-toggle.item-complex .item-content {
44674471
padding-right: 99px; }
4468-
.item-toggle.active {
4469-
box-shadow: none; }
4472+
4473+
.item-toggle.item-complex {
4474+
padding-right: 0; }
44704475

44714476
.item-toggle .toggle {
44724477
position: absolute;
@@ -6194,9 +6199,10 @@ a.button {
61946199
.invisible {
61956200
visibility: hidden; }
61966201

6197-
.keyboard-open .bar-footer, .keyboard-open .tabs, .footer-hide .bar-footer, .footer-hide .tabs {
6202+
.keyboard-open .hide-on-keyboard-open {
61986203
display: none; }
6199-
.keyboard-open .has-footer, .keyboard-open .has-tabs, .footer-hide .has-footer, .footer-hide .has-tabs {
6204+
6205+
.keyboard-open .tabs.hide-on-keyboard-open + .pane .has-tabs, .keyboard-open .bar-footer.hide-on-keyboard-open + .pane .has-footer {
62006206
bottom: 0; }
62016207

62026208
.inline {
@@ -6220,6 +6226,9 @@ a.button {
62206226
-ms-touch-action: none;
62216227
-ms-content-zooming: none; }
62226228

6229+
.no-resize {
6230+
resize: none; }
6231+
62236232
.block {
62246233
display: block;
62256234
clear: both; }
@@ -6359,7 +6368,7 @@ a.button {
63596368
/**
63606369
* Platform
63616370
* --------------------------------------------------
6362-
* Platform specific tweaks when in Cordova.
6371+
* Platform specific tweaks
63636372
*/
63646373
.platform-ios7.platform-cordova:not(.fullscreen) .bar-header:not(.bar-subheader) {
63656374
height: 64px; }
@@ -6379,3 +6388,11 @@ a.button {
63796388
top: 157px; }
63806389
.platform-ios7.platform-cordova.status-bar-hide {
63816390
margin-bottom: 20px; }
6391+
6392+
@media (orientation: landscape) {
6393+
.platform-ios7.platform-browser.platform-ipad {
6394+
position: fixed; } }
6395+
6396+
.platform-android2:not(.enable-transitions) * {
6397+
-webkit-transition: none !important;
6398+
transition: none !important; }

0 commit comments

Comments
 (0)