diff --git a/dist/css/fonts/ionicons.eot b/dist/css/fonts/ionicons.eot
old mode 100644
new mode 100755
diff --git a/dist/css/fonts/ionicons.svg b/dist/css/fonts/ionicons.svg
old mode 100644
new mode 100755
index 8feff2497a..ee963d4878
--- a/dist/css/fonts/ionicons.svg
+++ b/dist/css/fonts/ionicons.svg
@@ -11,8 +11,8 @@
"license": "MIT",
"licenseURL": "http://opensource.org/licenses/MIT",
"version": "Version 1.2.3",
- "fontId": "Ionicons",
- "psName": "Ionicons",
+ "fontId": "ionicons",
+ "psName": "ionicons",
"subFamily": "Regular",
"fullName": "Ionicons",
"description": "Generated by IcoMoon"
diff --git a/dist/css/fonts/ionicons.ttf b/dist/css/fonts/ionicons.ttf
old mode 100644
new mode 100755
diff --git a/dist/css/fonts/ionicons.woff b/dist/css/fonts/ionicons.woff
old mode 100644
new mode 100755
diff --git a/dist/css/ionic-ios7.css b/dist/css/ionic-ios7.css
index 017e5965d8..c23d5a3348 100644
--- a/dist/css/ionic-ios7.css
+++ b/dist/css/ionic-ios7.css
@@ -16,7 +16,7 @@ h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
+b, u, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
@@ -182,7 +182,7 @@ sub {
fieldset {
margin: 0 2px;
padding: 0.35em 0.625em 0.75em;
- border: 1px solid silver; }
+ border: 1px solid #c0c0c0; }
/**
* 1. Correct `color` not being inherited in IE 8/9.
@@ -646,9 +646,12 @@ a.subdued {
.bar .title a {
color: inherit; }
.bar > .button {
- box-flex: 1;
-webkit-box-flex: 0;
+ -webkit-flex: 0;
-moz-box-flex: 0;
+ -moz-flex: 0;
+ -ms-flex: 0;
+ flex: 0;
z-index: 1;
margin: 0;
padding: 2px 8px 0 8px;
@@ -835,9 +838,17 @@ a.subdued {
* A navigation bar with any number of tab items supported.
*/
.tabs {
- box-orient: horizontal;
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: -moz-flex;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-direction: normal;
-webkit-box-orient: horizontal;
- -moz-box-orient: horizontal;
+ -webkit-flex-direction: horizontal;
+ -moz-flex-direction: horizontal;
+ -ms-flex-direction: horizontal;
+ flex-direction: horizontal;
background-color: white;
background-image: linear-gradient(0deg, #dddddd, #dddddd 50%, transparent 50%);
border-color: #dddddd;
@@ -845,8 +856,6 @@ a.subdued {
position: fixed;
bottom: 0;
z-index: 5;
- display: -webkit-box;
- display: box;
width: 100%;
height: 49px;
border-style: solid;
@@ -906,13 +915,16 @@ a.subdued {
top: 44px; }
.tab-item {
- box-flex: 1;
-webkit-box-flex: 1;
+ -webkit-flex: 1;
-moz-box-flex: 1;
- display: block;
+ -moz-flex: 1;
+ -ms-flex: 1;
+ flex: 1;
+ display: inline-block;
overflow: hidden;
box-sizing: border-box;
- width: 0;
+ margin: auto;
height: 100%;
color: inherit;
text-align: center;
@@ -970,6 +982,16 @@ a.subdued {
.tab-item.active.tab-item-dark, .tab-item:active.tab-item-dark {
color: #444444; }
+.item.tabs {
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: -moz-flex;
+ display: -ms-flexbox;
+ display: flex;
+ padding: 0; }
+ .item.tabs i, .item.tabs .icon {
+ position: relative; }
+
.menu {
position: absolute;
top: 0;
@@ -1273,23 +1295,23 @@ button.item-icon-right:after {
border-radius: 4px; }
.item-thumbnail-left {
- padding-left: 95px;
- min-height: 80px; }
+ padding-left: 105px;
+ min-height: 100px; }
.item-thumbnail-left img:first-child, .item-thumbnail-left .item-image {
position: absolute;
- top: 0;
- left: 0;
+ top: 10px;
+ left: 10px;
max-width: 80px;
max-height: 80px;
width: 100%; }
.item-thumbnail-right {
- padding-right: 95px;
- min-height: 80px; }
+ padding-right: 105px;
+ min-height: 100px; }
.item-thumbnail-right img:first-child, .item-thumbnail-right .item-image {
position: absolute;
- top: 0;
- right: 0;
+ top: 10px;
+ right: 10px;
max-width: 80px;
max-height: 80px;
width: 100%; }
@@ -1663,7 +1685,7 @@ input[type="file"] {
line-height: 34px; }
select {
- border: 1px solid #cccccc;
+ border: 1px solid #ccc;
background-color: white; }
select[multiple],
@@ -1735,7 +1757,7 @@ input[type="checkbox"][readonly] {
right: 20px;
transition: 0.2s ease;
transition-property: left, right;
- transition-delay: 0s, 0.05s; }
+ transition-delay: 0s, .05s; }
.toggle :checked + .track {
/* When the toggle is "on" */
@@ -1750,7 +1772,7 @@ input[type="checkbox"][readonly] {
right: 0;
left: 20px;
-webkit-transform: none;
- transition-delay: 0.05s, 0s; }
+ transition-delay: .05s, 0s; }
.item-radio {
padding: 0; }
@@ -2034,7 +2056,7 @@ input[type="range"] {
.button.button-icon:active, .button.button-icon.active {
background: none;
box-shadow: none;
- text-shadow: 0px 0px 10px white; }
+ text-shadow: 0px 0px 10px #fff; }
.button.block, .button.button-full {
margin-top: 10px;
margin-bottom: 10px; }
@@ -2076,29 +2098,41 @@ a.button {
text-decoration: none; }
.button-bar {
- box-flex: 1;
- -webkit-box-flex: 1;
- -moz-box-flex: 1;
- box-orient: horizontal;
- -webkit-box-orient: horizontal;
- -moz-box-orient: horizontal;
display: -webkit-box;
- display: box; }
+ display: -webkit-flex;
+ display: -moz-flex;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-flex: 1;
+ -webkit-flex: 1;
+ -moz-box-flex: 1;
+ -moz-flex: 1;
+ -ms-flex: 1;
+ flex: 1;
+ -webkit-box-direction: normal;
+ -webkit-box-orient: horizontal;
+ -webkit-flex-direction: horizontal;
+ -moz-flex-direction: horizontal;
+ -ms-flex-direction: horizontal;
+ flex-direction: horizontal; }
.button-bar > .button {
- box-flex: 1;
-webkit-box-flex: 1;
+ -webkit-flex: 1;
-moz-box-flex: 1;
+ -moz-flex: 1;
+ -ms-flex: 1;
+ flex: 1;
display: block;
overflow: hidden;
- padding: 8px 16px;
+ padding: 0 16px;
width: 0;
border-width: 1px 0px 1px 1px;
border-radius: 0;
text-align: center;
text-overflow: ellipsis;
white-space: nowrap;
- line-height: 15px; }
+ line-height: 13px; }
.button-bar > .button:first-child {
border-radius: 2px 0px 0px 2px; }
.button-bar > .button:last-child {
@@ -2106,14 +2140,23 @@ a.button {
border-radius: 0px 2px 2px 0px; }
.buttons {
- box-flex: 1;
- -webkit-box-flex: 1;
- -moz-box-flex: 1;
- box-orient: horizontal;
- -webkit-box-orient: horizontal;
- -moz-box-orient: horizontal;
display: -webkit-box;
- display: box; }
+ display: -webkit-flex;
+ display: -moz-flex;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-flex: 1;
+ -webkit-flex: 1;
+ -moz-box-flex: 1;
+ -moz-flex: 1;
+ -ms-flex: 1;
+ flex: 1;
+ -webkit-box-direction: normal;
+ -webkit-box-orient: horizontal;
+ -webkit-flex-direction: horizontal;
+ -moz-flex-direction: horizontal;
+ -ms-flex-direction: horizontal;
+ flex-direction: horizontal; }
.badge {
display: inline-block;
@@ -2392,9 +2435,9 @@ a.button {
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
- -webkit-animation: spin 0.75s linear infinite;
- -moz-animation: spin 0.75s linear infinite;
- animation: spin 0.75s linear infinite; }
+ -webkit-animation: spin .75s linear infinite;
+ -moz-animation: spin .75s linear infinite;
+ animation: spin .75s linear infinite; }
.icon-loading:before {
content: "\e144"; }
@@ -2407,9 +2450,9 @@ a.button {
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
- -webkit-animation: spin 0.75s linear infinite;
- -moz-animation: spin 0.75s linear infinite;
- animation: spin 0.75s linear infinite; }
+ -webkit-animation: spin .75s linear infinite;
+ -moz-animation: spin .75s linear infinite;
+ animation: spin .75s linear infinite; }
.icon-refreshing:before {
content: "\e144"; }
diff --git a/dist/css/ionic-scoped.css b/dist/css/ionic-scoped.css
index be39f0d02b..2859d4ba24 100644
--- a/dist/css/ionic-scoped.css
+++ b/dist/css/ionic-scoped.css
@@ -213,12 +213,12 @@
transform: rotate(360deg); } }
}
.ionic i, .ionic .icon {
- font-family: 'ionicons';
- speak: none;
- font-style: normal;
- font-weight: normal;
- font-variant: normal;
- text-transform: none;
+ font-family: 'ionicons' !important;
+ speak: none !important;
+ font-style: normal !important;
+ font-weight: normal !important;
+ font-variant: normal !important;
+ text-transform: none !important;
line-height: 1;
/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
@@ -1108,7 +1108,7 @@
.ionic a, .ionic abbr, .ionic acronym, .ionic address, .ionic big, .ionic cite, .ionic code,
.ionic del, .ionic dfn, .ionic em, .ionic img, .ionic ins, .ionic kbd, .ionic q, .ionic s, .ionic samp,
.ionic small, .ionic strike, .ionic strong, .ionic sub, .ionic sup, .ionic tt, .ionic var,
- .ionic b, .ionic u, .ionic i, .ionic center,
+ .ionic b, .ionic u, .ionic center,
.ionic dl, .ionic dt, .ionic dd, .ionic ol, .ionic ul, .ionic li,
.ionic fieldset, .ionic form, .ionic label, .ionic legend,
.ionic table, .ionic caption, .ionic tbody, .ionic tfoot, .ionic thead, .ionic tr, .ionic th, .ionic td,
@@ -1195,7 +1195,7 @@
.ionic fieldset {
margin: 0 2px;
padding: 0.35em 0.625em 0.75em;
- border: 1px solid silver; }
+ border: 1px solid #c0c0c0; }
.ionic legend {
padding: 0;
/* 2 */
@@ -1579,9 +1579,12 @@
.ionic .bar .title a {
color: inherit; }
.ionic .bar > .button {
- box-flex: 1;
-webkit-box-flex: 0;
+ -webkit-flex: 0;
-moz-box-flex: 0;
+ -moz-flex: 0;
+ -ms-flex: 0;
+ flex: 0;
z-index: 1;
margin: 0;
padding: 2px 8px 0 8px;
@@ -1749,9 +1752,17 @@
bottom: 44px;
display: block; }
.ionic .tabs {
- box-orient: horizontal;
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: -moz-flex;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-direction: normal;
-webkit-box-orient: horizontal;
- -moz-box-orient: horizontal;
+ -webkit-flex-direction: horizontal;
+ -moz-flex-direction: horizontal;
+ -ms-flex-direction: horizontal;
+ flex-direction: horizontal;
background-color: white;
background-image: linear-gradient(0deg, #dddddd, #dddddd 50%, transparent 50%);
border-color: #dddddd;
@@ -1759,8 +1770,6 @@
position: fixed;
bottom: 0;
z-index: 5;
- display: -webkit-box;
- display: box;
width: 100%;
height: 49px;
border-style: solid;
@@ -1818,13 +1827,16 @@
.ionic .tabs-top {
top: 44px; }
.ionic .tab-item {
- box-flex: 1;
-webkit-box-flex: 1;
+ -webkit-flex: 1;
-moz-box-flex: 1;
- display: block;
+ -moz-flex: 1;
+ -ms-flex: 1;
+ flex: 1;
+ display: inline-block;
overflow: hidden;
box-sizing: border-box;
- width: 0;
+ margin: auto;
height: 100%;
color: inherit;
text-align: center;
@@ -1874,6 +1886,15 @@
color: #f0b840; }
.ionic .tab-item.active.tab-item-dark, .ionic .tab-item:active.tab-item-dark {
color: #444444; }
+ .ionic .item.tabs {
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: -moz-flex;
+ display: -ms-flexbox;
+ display: flex;
+ padding: 0; }
+ .ionic .item.tabs i, .ionic .item.tabs .icon {
+ position: relative; }
.ionic .menu {
position: absolute;
top: 0;
@@ -2151,22 +2172,22 @@
width: 100%;
border-radius: 4px; }
.ionic .item-thumbnail-left {
- padding-left: 95px;
- min-height: 80px; }
+ padding-left: 105px;
+ min-height: 100px; }
.ionic .item-thumbnail-left img:first-child, .ionic .item-thumbnail-left .item-image {
position: absolute;
- top: 0;
- left: 0;
+ top: 10px;
+ left: 10px;
max-width: 80px;
max-height: 80px;
width: 100%; }
.ionic .item-thumbnail-right {
- padding-right: 95px;
- min-height: 80px; }
+ padding-right: 105px;
+ min-height: 100px; }
.ionic .item-thumbnail-right img:first-child, .ionic .item-thumbnail-right .item-image {
position: absolute;
- top: 0;
- right: 0;
+ top: 10px;
+ right: 10px;
max-width: 80px;
max-height: 80px;
width: 100%; }
@@ -2487,7 +2508,7 @@
.ionic input[type="file"] {
line-height: 34px; }
.ionic select {
- border: 1px solid #cccccc;
+ border: 1px solid #ccc;
background-color: white; }
.ionic select[multiple],
.ionic select[size] {
@@ -2536,7 +2557,7 @@
border-radius: 50%;
background: white;
content: ' ';
- transition: background-color 0.1s ease-in-out; }
+ transition: background-color .1s ease-in-out; }
.ionic .checkbox input:after {
position: absolute;
top: 34%;
@@ -2549,7 +2570,7 @@
border-right: 0;
content: ' ';
opacity: 0;
- transition: opacity 0.05s ease-in-out;
+ transition: opacity .05s ease-in-out;
-webkit-transform: rotate(-45deg);
transform: rotate(-45deg); }
.ionic .checkbox input:checked:before {
@@ -2900,7 +2921,7 @@
.ionic .button.button-icon:active, .ionic .button.button-icon.active {
background: none;
box-shadow: none;
- text-shadow: 0px 0px 10px white; }
+ text-shadow: 0px 0px 10px #fff; }
.ionic .button.block, .ionic .button.button-full {
margin-top: 10px;
margin-bottom: 10px; }
@@ -2935,42 +2956,63 @@
.ionic a.button {
text-decoration: none; }
.ionic .button-bar {
- box-flex: 1;
- -webkit-box-flex: 1;
- -moz-box-flex: 1;
- box-orient: horizontal;
- -webkit-box-orient: horizontal;
- -moz-box-orient: horizontal;
display: -webkit-box;
- display: box; }
- .ionic .button-bar > .button {
- box-flex: 1;
+ display: -webkit-flex;
+ display: -moz-flex;
+ display: -ms-flexbox;
+ display: flex;
-webkit-box-flex: 1;
+ -webkit-flex: 1;
-moz-box-flex: 1;
+ -moz-flex: 1;
+ -ms-flex: 1;
+ flex: 1;
+ -webkit-box-direction: normal;
+ -webkit-box-orient: horizontal;
+ -webkit-flex-direction: horizontal;
+ -moz-flex-direction: horizontal;
+ -ms-flex-direction: horizontal;
+ flex-direction: horizontal; }
+ .ionic .button-bar > .button {
+ -webkit-box-flex: 1;
+ -webkit-flex: 1;
+ -moz-box-flex: 1;
+ -moz-flex: 1;
+ -ms-flex: 1;
+ flex: 1;
display: block;
overflow: hidden;
- padding: 8px 16px;
+ padding: 0 16px;
width: 0;
border-width: 1px 0px 1px 1px;
border-radius: 0;
text-align: center;
text-overflow: ellipsis;
white-space: nowrap;
- line-height: 15px; }
+ line-height: 13px; }
.ionic .button-bar > .button:first-child {
border-radius: 2px 0px 0px 2px; }
.ionic .button-bar > .button:last-child {
border-right-width: 1px;
border-radius: 0px 2px 2px 0px; }
.ionic .buttons {
- box-flex: 1;
- -webkit-box-flex: 1;
- -moz-box-flex: 1;
- box-orient: horizontal;
- -webkit-box-orient: horizontal;
- -moz-box-orient: horizontal;
display: -webkit-box;
- display: box; }
+ display: -webkit-flex;
+ display: -moz-flex;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-flex: 1;
+ -webkit-flex: 1;
+ -moz-box-flex: 1;
+ -moz-flex: 1;
+ -ms-flex: 1;
+ flex: 1;
+ -webkit-box-direction: normal;
+ -webkit-box-orient: horizontal;
+ -webkit-flex-direction: horizontal;
+ -moz-flex-direction: horizontal;
+ -ms-flex-direction: horizontal;
+ flex-direction: horizontal; }
.ionic .badge {
display: inline-block;
min-width: 10px;
@@ -3166,9 +3208,9 @@
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
- -webkit-animation: spin 0.75s linear infinite;
- -moz-animation: spin 0.75s linear infinite;
- animation: spin 0.75s linear infinite; }
+ -webkit-animation: spin .75s linear infinite;
+ -moz-animation: spin .75s linear infinite;
+ animation: spin .75s linear infinite; }
.ionic .icon-loading:before {
content: "\e144"; }
.ionic .icon-refreshing {
@@ -3180,9 +3222,9 @@
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
- -webkit-animation: spin 0.75s linear infinite;
- -moz-animation: spin 0.75s linear infinite;
- animation: spin 0.75s linear infinite; }
+ -webkit-animation: spin .75s linear infinite;
+ -moz-animation: spin .75s linear infinite;
+ animation: spin .75s linear infinite; }
.ionic .icon-refreshing:before {
content: "\e144"; }
.ionic .hidden,
diff --git a/dist/css/ionic.css b/dist/css/ionic.css
index a37fa3e426..277fa062c7 100644
--- a/dist/css/ionic.css
+++ b/dist/css/ionic.css
@@ -7,12 +7,12 @@
font-style: normal; }
i, .icon {
- font-family: 'ionicons';
- speak: none;
- font-style: normal;
- font-weight: normal;
- font-variant: normal;
- text-transform: none;
+ font-family: 'ionicons' !important;
+ speak: none !important;
+ font-style: normal !important;
+ font-weight: normal !important;
+ font-variant: normal !important;
+ text-transform: none !important;
line-height: 1;
/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
@@ -1355,7 +1355,7 @@ h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
+b, u, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
@@ -1521,7 +1521,7 @@ sub {
fieldset {
margin: 0 2px;
padding: 0.35em 0.625em 0.75em;
- border: 1px solid silver; }
+ border: 1px solid #c0c0c0; }
/**
* 1. Correct `color` not being inherited in IE 8/9.
@@ -2015,9 +2015,12 @@ a.subdued {
.bar .title a {
color: inherit; }
.bar > .button {
- box-flex: 1;
-webkit-box-flex: 0;
+ -webkit-flex: 0;
-moz-box-flex: 0;
+ -moz-flex: 0;
+ -ms-flex: 0;
+ flex: 0;
z-index: 1;
margin: 0;
padding: 2px 8px 0 8px;
@@ -2204,9 +2207,17 @@ a.subdued {
* A navigation bar with any number of tab items supported.
*/
.tabs {
- box-orient: horizontal;
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: -moz-flex;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-direction: normal;
-webkit-box-orient: horizontal;
- -moz-box-orient: horizontal;
+ -webkit-flex-direction: horizontal;
+ -moz-flex-direction: horizontal;
+ -ms-flex-direction: horizontal;
+ flex-direction: horizontal;
background-color: white;
background-image: linear-gradient(0deg, #dddddd, #dddddd 50%, transparent 50%);
border-color: #dddddd;
@@ -2214,8 +2225,6 @@ a.subdued {
position: fixed;
bottom: 0;
z-index: 5;
- display: -webkit-box;
- display: box;
width: 100%;
height: 49px;
border-style: solid;
@@ -2275,13 +2284,16 @@ a.subdued {
top: 44px; }
.tab-item {
- box-flex: 1;
-webkit-box-flex: 1;
+ -webkit-flex: 1;
-moz-box-flex: 1;
- display: block;
+ -moz-flex: 1;
+ -ms-flex: 1;
+ flex: 1;
+ display: inline-block;
overflow: hidden;
box-sizing: border-box;
- width: 0;
+ margin: auto;
height: 100%;
color: inherit;
text-align: center;
@@ -2339,6 +2351,16 @@ a.subdued {
.tab-item.active.tab-item-dark, .tab-item:active.tab-item-dark {
color: #444444; }
+.item.tabs {
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: -moz-flex;
+ display: -ms-flexbox;
+ display: flex;
+ padding: 0; }
+ .item.tabs i, .item.tabs .icon {
+ position: relative; }
+
.menu {
position: absolute;
top: 0;
@@ -2676,23 +2698,23 @@ button.item-icon-right:after {
border-radius: 4px; }
.item-thumbnail-left {
- padding-left: 95px;
- min-height: 80px; }
+ padding-left: 105px;
+ min-height: 100px; }
.item-thumbnail-left img:first-child, .item-thumbnail-left .item-image {
position: absolute;
- top: 0;
- left: 0;
+ top: 10px;
+ left: 10px;
max-width: 80px;
max-height: 80px;
width: 100%; }
.item-thumbnail-right {
- padding-right: 95px;
- min-height: 80px; }
+ padding-right: 105px;
+ min-height: 100px; }
.item-thumbnail-right img:first-child, .item-thumbnail-right .item-image {
position: absolute;
- top: 0;
- right: 0;
+ top: 10px;
+ right: 10px;
max-width: 80px;
max-height: 80px;
width: 100%; }
@@ -3066,7 +3088,7 @@ input[type="file"] {
line-height: 34px; }
select {
- border: 1px solid #cccccc;
+ border: 1px solid #ccc;
background-color: white; }
select[multiple],
@@ -3121,7 +3143,7 @@ input[type="checkbox"][readonly] {
border-radius: 50%;
background: white;
content: ' ';
- transition: background-color 0.1s ease-in-out; }
+ transition: background-color .1s ease-in-out; }
/* the checkmark within the box */
.checkbox input:after {
@@ -3136,7 +3158,7 @@ input[type="checkbox"][readonly] {
border-right: 0;
content: ' ';
opacity: 0;
- transition: opacity 0.05s ease-in-out;
+ transition: opacity .05s ease-in-out;
-webkit-transform: rotate(-45deg);
transform: rotate(-45deg); }
@@ -3515,7 +3537,7 @@ input[type="range"] {
.button.button-icon:active, .button.button-icon.active {
background: none;
box-shadow: none;
- text-shadow: 0px 0px 10px white; }
+ text-shadow: 0px 0px 10px #fff; }
.button.block, .button.button-full {
margin-top: 10px;
margin-bottom: 10px; }
@@ -3557,29 +3579,41 @@ a.button {
text-decoration: none; }
.button-bar {
- box-flex: 1;
- -webkit-box-flex: 1;
- -moz-box-flex: 1;
- box-orient: horizontal;
- -webkit-box-orient: horizontal;
- -moz-box-orient: horizontal;
display: -webkit-box;
- display: box; }
+ display: -webkit-flex;
+ display: -moz-flex;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-flex: 1;
+ -webkit-flex: 1;
+ -moz-box-flex: 1;
+ -moz-flex: 1;
+ -ms-flex: 1;
+ flex: 1;
+ -webkit-box-direction: normal;
+ -webkit-box-orient: horizontal;
+ -webkit-flex-direction: horizontal;
+ -moz-flex-direction: horizontal;
+ -ms-flex-direction: horizontal;
+ flex-direction: horizontal; }
.button-bar > .button {
- box-flex: 1;
-webkit-box-flex: 1;
+ -webkit-flex: 1;
-moz-box-flex: 1;
+ -moz-flex: 1;
+ -ms-flex: 1;
+ flex: 1;
display: block;
overflow: hidden;
- padding: 8px 16px;
+ padding: 0 16px;
width: 0;
border-width: 1px 0px 1px 1px;
border-radius: 0;
text-align: center;
text-overflow: ellipsis;
white-space: nowrap;
- line-height: 15px; }
+ line-height: 13px; }
.button-bar > .button:first-child {
border-radius: 2px 0px 0px 2px; }
.button-bar > .button:last-child {
@@ -3587,14 +3621,23 @@ a.button {
border-radius: 0px 2px 2px 0px; }
.buttons {
- box-flex: 1;
- -webkit-box-flex: 1;
- -moz-box-flex: 1;
- box-orient: horizontal;
- -webkit-box-orient: horizontal;
- -moz-box-orient: horizontal;
display: -webkit-box;
- display: box; }
+ display: -webkit-flex;
+ display: -moz-flex;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-flex: 1;
+ -webkit-flex: 1;
+ -moz-box-flex: 1;
+ -moz-flex: 1;
+ -ms-flex: 1;
+ flex: 1;
+ -webkit-box-direction: normal;
+ -webkit-box-orient: horizontal;
+ -webkit-flex-direction: horizontal;
+ -moz-flex-direction: horizontal;
+ -ms-flex-direction: horizontal;
+ flex-direction: horizontal; }
.badge {
display: inline-block;
@@ -3978,9 +4021,9 @@ a.button {
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
- -webkit-animation: spin 0.75s linear infinite;
- -moz-animation: spin 0.75s linear infinite;
- animation: spin 0.75s linear infinite; }
+ -webkit-animation: spin .75s linear infinite;
+ -moz-animation: spin .75s linear infinite;
+ animation: spin .75s linear infinite; }
.icon-loading:before {
content: "\e144"; }
@@ -3993,9 +4036,9 @@ a.button {
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
- -webkit-animation: spin 0.75s linear infinite;
- -moz-animation: spin 0.75s linear infinite;
- animation: spin 0.75s linear infinite; }
+ -webkit-animation: spin .75s linear infinite;
+ -moz-animation: spin .75s linear infinite;
+ animation: spin .75s linear infinite; }
.icon-refreshing:before {
content: "\e144"; }
diff --git a/ionicons/style.scss b/ionicons/style.scss
index 157a59ce35..a170414751 100644
--- a/ionicons/style.scss
+++ b/ionicons/style.scss
@@ -10,12 +10,12 @@
}
i, .icon {
- font-family: 'ionicons';
- speak: none;
- font-style: normal;
- font-weight: normal;
- font-variant: normal;
- text-transform: none;
+ font-family: 'ionicons' !important;
+ speak: none !important;
+ font-style: normal !important;
+ font-weight: normal !important;
+ font-variant: normal !important;
+ text-transform: none !important;
line-height: 1;
/* Better Font Rendering =========== */
diff --git a/scss/ionic/_bar.scss b/scss/ionic/_bar.scss
index 1856b32664..06e4a7f912 100644
--- a/scss/ionic/_bar.scss
+++ b/scss/ionic/_bar.scss
@@ -102,7 +102,7 @@
}
> .button {
- @include box-flex(0);
+ @include flex(0);
z-index: 1;
margin: 0;
padding: 2px 8px 0 8px;
diff --git a/scss/ionic/_button-bar.scss b/scss/ionic/_button-bar.scss
index c91647065a..1b4be3691d 100644
--- a/scss/ionic/_button-bar.scss
+++ b/scss/ionic/_button-bar.scss
@@ -1,17 +1,16 @@
.button-bar {
- @include box-flex(1);
- @include box-orient(horizontal);
- display: -webkit-box;
- display: box;
+ @include display-flex();
+ @include flex(1);
+ @include flex-direction(horizontal);
}
.button-bar > .button {
- @include box-flex(1);
+ @include flex(1);
display: block;
overflow: hidden;
- padding: 8px 16px;
+ padding: 0 16px;
// Fix for unequal widths of buttons
width: 0;
@@ -23,7 +22,7 @@
white-space: nowrap;
// Fix for box-flex width issue
- line-height: $button-bar-button-line-height;
+ line-height: $button-bar-button-line-height - 2;
&:first-child {
border-radius: 2px 0px 0px 2px;
@@ -38,8 +37,7 @@
// to pull a set of buttons to the right side of a header
// bar, for example.
.buttons {
- @include box-flex(1);
- @include box-orient(horizontal);
- display: -webkit-box;
- display: box;
+ @include display-flex();
+ @include flex(1);
+ @include flex-direction(horizontal);
}
diff --git a/scss/ionic/_items.scss b/scss/ionic/_items.scss
index 06400caa6a..c17607d90e 100644
--- a/scss/ionic/_items.scss
+++ b/scss/ionic/_items.scss
@@ -275,13 +275,13 @@ button.item-icon-right:after {
// -------------------------------
.item-thumbnail-left {
- padding-left: $item-thumbnail-width + $item-padding;
- min-height: $item-thumbnail-height;
+ padding-left: $item-thumbnail-width + $item-thumbnail-margin + $item-padding;
+ min-height: $item-thumbnail-height + ($item-thumbnail-margin * 2);
img:first-child, .item-image {
position: absolute;
- top: 0;
- left: 0;
+ top: $item-thumbnail-margin;
+ left: $item-thumbnail-margin;
max-width: $item-thumbnail-width;
max-height: $item-thumbnail-height;
width: 100%;
@@ -289,13 +289,13 @@ button.item-icon-right:after {
}
.item-thumbnail-right {
- padding-right: $item-thumbnail-width + $item-padding;
- min-height: $item-thumbnail-height;
+ padding-right: $item-thumbnail-width + $item-thumbnail-margin + $item-padding;
+ min-height: $item-thumbnail-height + ($item-thumbnail-margin * 2);
img:first-child, .item-image {
position: absolute;
- top: 0;
- right: 0;
+ top: $item-thumbnail-margin;
+ right: $item-thumbnail-margin;
max-width: $item-thumbnail-width;
max-height: $item-thumbnail-height;
width: 100%;
diff --git a/scss/ionic/_mixins.scss b/scss/ionic/_mixins.scss
index 67ee58ddac..5649a0617d 100644
--- a/scss/ionic/_mixins.scss
+++ b/scss/ionic/_mixins.scss
@@ -350,18 +350,6 @@
hyphens: $mode;
}
-@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;
-}
-
@mixin display-flex {
display: -webkit-box;
display: -webkit-flex;
diff --git a/scss/ionic/_reset.scss b/scss/ionic/_reset.scss
index 1ac8e2de8c..1554dab1ae 100755
--- a/scss/ionic/_reset.scss
+++ b/scss/ionic/_reset.scss
@@ -16,7 +16,7 @@ h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
+b, u, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
diff --git a/scss/ionic/_tabs.scss b/scss/ionic/_tabs.scss
index 4796921fcd..83884eac7a 100644
--- a/scss/ionic/_tabs.scss
+++ b/scss/ionic/_tabs.scss
@@ -5,15 +5,13 @@
*/
.tabs {
-
- @include box-orient(horizontal);
+ @include display-flex();
+ @include flex-direction(horizontal);
@include tab-style($tabs-default-bg, $tabs-default-border-color, $gray-dark);
position: fixed;
bottom: 0;
z-index: 5;
- display: -webkit-box;
- display: box;
width: 100%;
height: $tabs-height;
border-style: solid;
@@ -66,13 +64,12 @@
}
.tab-item {
- @include box-flex(1);
- display: block;
+ @include flex(1);
+ display: inline-block;
overflow: hidden;
box-sizing: border-box;
+ margin: auto;
- // Required to force box elements to be the same size;
- width: 0;
height: 100%;
color: inherit;
@@ -149,3 +146,12 @@
}
}
+.item.tabs {
+ @include display-flex();
+ padding: 0;
+
+ i, .icon {
+ position: relative;
+ }
+}
+
diff --git a/scss/ionic/_variables.scss b/scss/ionic/_variables.scss
index 7536ea7ee4..be282691d2 100644
--- a/scss/ionic/_variables.scss
+++ b/scss/ionic/_variables.scss
@@ -411,6 +411,7 @@ $item-avitar-height: 40px !default;
$item-thumbnail-width: 80px !default;
$item-thumbnail-height: 80px !default;
+$item-thumbnail-margin: 10px !default;
// Icons
diff --git a/test/cards.html b/test/cards.html
index 2891b3ab0f..881f0edc8b 100644
--- a/test/cards.html
+++ b/test/cards.html
@@ -95,6 +95,18 @@
November 05, 1955
+
+
+
Marty McFly
+
November 05, 1955
+
+
+
Marty McFly
+
November 05, 1955
+
@@ -108,8 +120,19 @@
-