diff --git a/dist/css/ionic.css b/dist/css/ionic.css index 72727f7df2..18eaa35b7b 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -49,14 +49,26 @@ .white { color: white; } +/* + Ionicons, v1.3.3 + Created by Ben Sperry for the Ionic Framework, http://ionicons.com/ + https://twitter.com/helloimben https://twitter.com/ionicframework + MIT License: https://github.com/driftyco/ionicons +*/ @font-face { font-family: "Ionicons"; - src: url("../fonts/ionicons.eot?v=1.3.0"); - src: url("../fonts/ionicons.eot?v=1.3.0#iefix") format("embedded-opentype"), url("../fonts/ionicons.ttf?v=1.3.0") format("truetype"), url("../fonts/ionicons.woff?v=1.3.0") format("woff"), url("../fonts/ionicons.svg?v=1.3.0#Ionicons") format("svg"); + src: url("../fonts/ionicons.eot?v=1.3.3"); + src: url("../fonts/ionicons.eot?v=1.3.3#iefix") format("embedded-opentype"), url("../fonts/ionicons.ttf?v=1.3.3") format("truetype"), url("../fonts/ionicons.woff?v=1.3.3") format("woff"), url("../fonts/ionicons.svg?v=1.3.3#Ionicons") format("svg"); font-weight: normal; font-style: normal; } -.ion, .ionicons, +.ion, .ion-loading-a, +.ion-loading-b, +.ion-loading-c, +.ion-loading-d, +.ion-looping, +.ion-refreshing, +.ion-ios7-reloading, .ionicons, .ion-alert, .ion-alert-circled, .ion-archive, @@ -212,6 +224,8 @@ .ion-ios7-circle-outline, .ion-ios7-clock, .ion-ios7-clock-outline, +.ion-ios7-close, +.ion-ios7-close-outline, .ion-ios7-cloud, .ion-ios7-cloud-download, .ion-ios7-cloud-download-outline, @@ -500,6 +514,7 @@ .ion-wineglass, .ion-woman, .ion-wrench { + display: inline-block; font-family: "Ionicons"; speak: none; font-style: normal; @@ -510,11 +525,17 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } -.ion-spin { - -webkit-animation: spin 2s infinite linear; - -moz-animation: spin 2s infinite linear; - -o-animation: spin 2s infinite linear; - animation: spin 2s infinite linear; } +.ion-spin, .ion-loading-a, +.ion-loading-b, +.ion-loading-c, +.ion-loading-d, +.ion-looping, +.ion-refreshing, +.ion-ios7-reloading { + -webkit-animation: spin 1s infinite linear; + -moz-animation: spin 1s infinite linear; + -o-animation: spin 1s infinite linear; + animation: spin 1s infinite linear; } @-moz-keyframes spin { 0% { @@ -1016,6 +1037,12 @@ .ion-ios7-clock-outline:before { content: "\f171"; } +.ion-ios7-close:before { + content: "\f2bc"; } + +.ion-ios7-close-outline:before { + content: "\f2bb"; } + .ion-ios7-cloud:before { content: "\f178"; } @@ -1340,7 +1367,7 @@ .ion-ios7-refresh-outline:before { content: "\f1d5"; } -.ion-ios7-reload:before { +.ion-ios7-reload:before, .ion-ios7-reloading:before { content: "\f28e"; } .ion-ios7-rewind:before { @@ -1496,16 +1523,16 @@ .ion-link:before { content: "\f1fe"; } -.ion-load-a:before { +.ion-load-a:before, .ion-loading-a:before { content: "\f29a"; } -.ion-load-b:before { +.ion-load-b:before, .ion-loading-b:before { content: "\f29b"; } -.ion-load-c:before { +.ion-load-c:before, .ion-loading-c:before { content: "\f29c"; } -.ion-load-d:before { +.ion-load-d:before, .ion-loading-d:before { content: "\f29d"; } .ion-location:before { @@ -1520,7 +1547,7 @@ .ion-log-out:before { content: "\f29f"; } -.ion-loop:before { +.ion-loop:before, .ion-looping:before { content: "\f201"; } .ion-magnet:before { @@ -1640,7 +1667,7 @@ .ion-record:before { content: "\f21b"; } -.ion-refresh:before { +.ion-refresh:before, .ion-refreshing:before { content: "\f21c"; } .ion-reply:before { @@ -2296,17 +2323,8 @@ body, .ionic-body { .scroll-refresher-content { height: 100%; - text-align: center; - display: -webkit-box; - display: -webkit-flex; - display: -moz-flex; - display: -ms-flexbox; - display: flex; - -webkit-box-align: center; - -ms-flex-align: center; - -webkit-align-items: center; - -moz-align-items: center; - align-items: center; } + width: 100%; + text-align: center; } .scroll-refreshing { -webkit-transition: height 0.1s ease-in-out; } diff --git a/dist/fonts/ionicons.eot b/dist/fonts/ionicons.eot index 29fd9428bc..010f2a9110 100644 Binary files a/dist/fonts/ionicons.eot and b/dist/fonts/ionicons.eot differ diff --git a/dist/fonts/ionicons.svg b/dist/fonts/ionicons.svg index c7c61b2aa7..fefe740c45 100644 --- a/dist/fonts/ionicons.svg +++ b/dist/fonts/ionicons.svg @@ -1,11 +1,11 @@ -Created by FontForge 20120731 at Tue Nov 5 19:31:34 2013 +Created by FontForge 20120731 at Thu Nov 7 21:22:16 2013 By Adam Bradley Created by Adam Bradley with FontForge 2.0 (http://fontforge.sf.net) @@ -22,7 +22,7 @@ Created by Adam Bradley with FontForge 2.0 (http://fontforge.sf.net) bbox="-0.00673067 -48 512.006 432" underline-thickness="25.6" underline-position="-51.2" - unicode-range="U+F100-F2BA" + unicode-range="U+F100-F2BC" /> + + d="M384 288l64 -64l-64 -64v48h-152c-4.40039 0 -8 3.59961 -8 8v16c0 4.40039 3.59961 8 8 8h152v48zM352 272h-32v80h-176l48 -32v-224h128v80h32v-104c0 -4.40039 -3.59961 -8 -8 -8h-152v-64l-118.8 59.4004c-9.2002 4.59961 -9.2002 6.09961 -9.2002 14.5996v302 c0 4.40039 3.59961 8 8 8h272c4.40039 0 8 -3.59961 8 -8v-104z" /> +d="M273.4 147.5l-0.300781 -58c48.9004 8.2002 86.3008 51 86.3008 102.5c0 15.9004 -3.60059 31 -10 44.5c-2.80078 5.7998 -6 11.2998 -9.80078 16.5l47.1006 43.5c1.09961 -1.2998 2.09961 -2.7002 3.09961 -4c20.9004 -28 33.2002 -62.7998 33.2002 -100.5v-3.7002 +c-1.5 -71.5 -47.5996 -132 -111.4 -154.6c-12.2998 -4.2998 -25.1992 -7.2998 -38.5 -8.7002l-0.0996094 -57l-76.2002 67l-26.2002 23l44.4004 38.7002zM89 195.7c1.59961 72.0996 48.2998 133 112.9 155.2c11.6992 4 24 6.7998 36.7998 8.09961l0.0996094 57 +l76.1006 -66.9004l26.1992 -23.0996l-44.2998 -38.5996l-58.3994 -50.9004l0.199219 57.9004c-48.7998 -8.30078 -86 -51.1006 -86 -102.4c0 -16 3.60059 -31.0996 10.1006 -44.7002c2.7002 -5.7998 6 -11.2002 9.7002 -16.2998l-47 -43.5996 +c-1.30078 1.59961 -2.60059 3.2998 -3.80078 5c-20.5 27.8994 -32.5996 62.2998 -32.5996 99.5996v3.7002z" /> +d="M476.9 334c7.09961 -33.2998 1.59961 -65.7998 -12.4004 -96.5996c-14.0996 -31.3008 -31 -59.3008 -51.4004 -87c-26.3994 -35.8008 -52.3994 -71 -85.5 -101.2c-19.3994 -17.7002 -40.5996 -34.7998 -66 -43.9004 +c-9.7998 -3.59961 -18.5996 -5.39941 -26.5996 -5.39941c-17.4004 0 -31.0996 8.59961 -44.2998 26.7998c-14.1006 19.3994 -21.7002 40.7998 -28 63.5996c-12.2998 44.6006 -24.6006 89 -37.7998 133.3c-3.5 11.5 -9 22.7002 -14.7002 33.4004 +c-2.7002 5.09961 -7.7998 10.2002 -12.2998 14.0996c-2.30078 2.10059 -5.10059 3 -8 3c-3.10059 0 -6.30078 -1 -9.2002 -2.7998c-9.60059 -5.7998 -27.5 -18.2998 -27.5 -18.2998l-21.2002 27c25.7998 24.5 81.7998 71.4004 81.7998 71.4004 +c10.9004 8.89941 33.1006 24.5996 47.7998 26.3994c3 0.299805 5.80078 0.5 8.60059 0.5c17.5 0 31.5 -7.2002 41.5 -22.5996c11 -17.1006 14.7002 -37.4004 18 -56.9004c7 -40.7002 11.3994 -81.8994 23.7998 -121.6c3.2002 -10.2002 6.7998 -19.7998 12.2002 -29.1006 +c3.89941 -6.69922 8.59961 -10.1992 13.7998 -10.1992c3.59961 0 7.5 1.59961 11.5996 5c3.60059 3 7.10059 6.2998 10 9.89941c19.9004 24.2998 36.8008 52.1006 47.6006 80.7998c3.39941 9 3.89941 17.9004 3.59961 27.7002 +c-0.399414 13.2998 -9.89941 24.5 -24.8994 25.2998c-2.5 0.100586 -4.90039 0.200195 -7.10059 0.200195c-11.0996 0 -19.7002 -1.7998 -31.8994 -7.09961c6.19922 24.0996 23.8994 62 53.7998 83.7998c19.7998 14.5 45.5 20.5 67.2002 20.5 +c10.1992 0 19.5 -1.2998 26.8994 -3.7002c23.1006 -7.5 35.6006 -22.8994 40.6006 -46.2998zM450 244.1c13.4004 29.7002 17.2002 58.8008 11.2002 86.7002c-3.90039 18.6006 -12.9004 28.9004 -29.9004 34.4004c-5.7998 1.89941 -13.5996 2.89941 -21.8994 2.89941 +c-21.2002 0 -42.8008 -6.59961 -57.8008 -17.5c-16 -11.5996 -28.8994 -29.7998 -37.6992 -47.8994c2 0.0996094 4.09961 0.200195 6.2998 0.200195c2.5 0 5.09961 0 8 -0.200195c22.5996 -1.2998 39.3994 -18.5 40 -40.9004 +c0.299805 -10.5 -0.100586 -21.7998 -4.60059 -33.7998c-10.8994 -29 -28.2998 -58.5 -50.1992 -85.2998c-3.60059 -4.40039 -7.7002 -8.5 -12.3008 -12.2002c-7 -5.7002 -14.2998 -8.59961 -21.6992 -8.59961c-7.7002 0 -18.8008 3.09961 -27.6006 18.0996 +c-6.59961 11.2998 -10.5996 22.7998 -13.5996 32.5c-9.7998 31.2998 -14.7998 63.5 -19.6006 94.5996c-1.5 9.5 -3.09961 19.4004 -4.69922 29.1006c-2.90039 17 -6.2002 36.2002 -15.7002 50.8994c-6.7998 10.4004 -15.7002 15.3008 -28.1006 15.3008 +c-2.09961 0 -4.2998 -0.100586 -6.59961 -0.400391c-7.7002 -1 -24.7002 -10.7998 -39.5 -22.9004c-2 -1.69922 -43.4004 -36.3994 -70.2998 -60.7998l2.7998 -3.59961c5.40039 3.59961 11.4004 7.59961 15.9004 10.2998c5.5 3.2998 11.5996 5.09961 17.5 5.09961 +c7 0 13.3994 -2.39941 18.5996 -6.89941c7.5 -6.60059 12.7002 -12.7002 15.9004 -18.6006c5.69922 -10.5996 12 -23.1992 15.8994 -36.3994c13.2998 -44.4004 25.5 -88.5 37.9004 -133.601c5.2998 -19.3994 12.0996 -40 25.5 -58.3994 +c13 -17.7998 23.2002 -20.2002 31.3994 -20.2002c6 0 12.9004 1.40039 21.2002 4.40039c23.1006 8.2998 42.7998 24.3994 60.6006 40.6992c31.7998 29 56.6992 62.8008 83.0996 98.5l0.299805 0.400391c20.6006 27.9004 36.4004 54.7002 49.7002 84.0996z" /> +d="M476.9 334c7.09961 -33.2998 1.59961 -65.7998 -12.3008 -96.7998c-14.0996 -31.2998 -31 -59.2998 -51.3994 -87c-26.4004 -35.7998 -52.4004 -71 -85.5 -101.2c-19.4004 -17.7002 -40.6006 -34.7998 -66 -43.9004c-31.2998 -11.1992 -51.6006 -5.09961 -70.9004 21.5 +c-14.0996 19.4004 -21.7002 40.8008 -28 63.6006c-12.2998 44.5996 -24.5996 89 -37.7998 133.3c-3.5 11.5 -9 22.7002 -14.7002 33.4004c-2.7002 5.09961 -7.7998 10.1992 -12.2998 14.0996c-4.7998 4.2998 -11.5 3.59961 -17.2002 0.200195 +c-9.59961 -5.7998 -27.5 -18.2998 -27.5 -18.2998l-21.2002 27c25.8008 24.5 81.8008 71.3994 81.8008 71.3994c10.8994 8.90039 33.0996 24.6006 47.7998 26.4004c21.3994 2.59961 38.3994 -4.2002 50 -22c11 -17.1006 14.7002 -37.4004 18 -56.9004 +c7 -40.7002 11.3994 -81.8994 23.7998 -121.6c3.2002 -10.2002 6.7998 -19.7998 12.2002 -29.1006c6.59961 -11.2998 15.2002 -13.5 25.3994 -5.19922c3.60059 3 7.10059 6.2998 10 9.89941c19.9004 24.2998 36.8008 52.1006 47.6006 80.7998 +c3.39941 9 3.89941 17.9004 3.59961 27.7002c-0.399414 13.2998 -9.89941 24.5 -24.8994 25.2998c-15 0.800781 -24.3008 -0.599609 -39 -6.89941c6.19922 24.0996 23.8994 62 53.7998 83.7998c29.2002 21.2998 71 24.2998 94.0996 16.7998 +c23.1006 -7.5 35.6006 -22.8994 40.6006 -46.2998z" />
' } }) diff --git a/ionicons/fonts/ionicons.eot b/ionicons/fonts/ionicons.eot index 29fd9428bc..010f2a9110 100644 Binary files a/ionicons/fonts/ionicons.eot and b/ionicons/fonts/ionicons.eot differ diff --git a/ionicons/fonts/ionicons.svg b/ionicons/fonts/ionicons.svg index c7c61b2aa7..fefe740c45 100644 --- a/ionicons/fonts/ionicons.svg +++ b/ionicons/fonts/ionicons.svg @@ -1,11 +1,11 @@ -Created by FontForge 20120731 at Tue Nov 5 19:31:34 2013 +Created by FontForge 20120731 at Thu Nov 7 21:22:16 2013 By Adam Bradley Created by Adam Bradley with FontForge 2.0 (http://fontforge.sf.net) @@ -22,7 +22,7 @@ Created by Adam Bradley with FontForge 2.0 (http://fontforge.sf.net) bbox="-0.00673067 -48 512.006 432" underline-thickness="25.6" underline-position="-51.2" - unicode-range="U+F100-F2BA" + unicode-range="U+F100-F2BC" /> + + d="M384 288l64 -64l-64 -64v48h-152c-4.40039 0 -8 3.59961 -8 8v16c0 4.40039 3.59961 8 8 8h152v48zM352 272h-32v80h-176l48 -32v-224h128v80h32v-104c0 -4.40039 -3.59961 -8 -8 -8h-152v-64l-118.8 59.4004c-9.2002 4.59961 -9.2002 6.09961 -9.2002 14.5996v302 c0 4.40039 3.59961 8 8 8h272c4.40039 0 8 -3.59961 8 -8v-104z" /> +d="M273.4 147.5l-0.300781 -58c48.9004 8.2002 86.3008 51 86.3008 102.5c0 15.9004 -3.60059 31 -10 44.5c-2.80078 5.7998 -6 11.2998 -9.80078 16.5l47.1006 43.5c1.09961 -1.2998 2.09961 -2.7002 3.09961 -4c20.9004 -28 33.2002 -62.7998 33.2002 -100.5v-3.7002 +c-1.5 -71.5 -47.5996 -132 -111.4 -154.6c-12.2998 -4.2998 -25.1992 -7.2998 -38.5 -8.7002l-0.0996094 -57l-76.2002 67l-26.2002 23l44.4004 38.7002zM89 195.7c1.59961 72.0996 48.2998 133 112.9 155.2c11.6992 4 24 6.7998 36.7998 8.09961l0.0996094 57 +l76.1006 -66.9004l26.1992 -23.0996l-44.2998 -38.5996l-58.3994 -50.9004l0.199219 57.9004c-48.7998 -8.30078 -86 -51.1006 -86 -102.4c0 -16 3.60059 -31.0996 10.1006 -44.7002c2.7002 -5.7998 6 -11.2002 9.7002 -16.2998l-47 -43.5996 +c-1.30078 1.59961 -2.60059 3.2998 -3.80078 5c-20.5 27.8994 -32.5996 62.2998 -32.5996 99.5996v3.7002z" /> +d="M476.9 334c7.09961 -33.2998 1.59961 -65.7998 -12.4004 -96.5996c-14.0996 -31.3008 -31 -59.3008 -51.4004 -87c-26.3994 -35.8008 -52.3994 -71 -85.5 -101.2c-19.3994 -17.7002 -40.5996 -34.7998 -66 -43.9004 +c-9.7998 -3.59961 -18.5996 -5.39941 -26.5996 -5.39941c-17.4004 0 -31.0996 8.59961 -44.2998 26.7998c-14.1006 19.3994 -21.7002 40.7998 -28 63.5996c-12.2998 44.6006 -24.6006 89 -37.7998 133.3c-3.5 11.5 -9 22.7002 -14.7002 33.4004 +c-2.7002 5.09961 -7.7998 10.2002 -12.2998 14.0996c-2.30078 2.10059 -5.10059 3 -8 3c-3.10059 0 -6.30078 -1 -9.2002 -2.7998c-9.60059 -5.7998 -27.5 -18.2998 -27.5 -18.2998l-21.2002 27c25.7998 24.5 81.7998 71.4004 81.7998 71.4004 +c10.9004 8.89941 33.1006 24.5996 47.7998 26.3994c3 0.299805 5.80078 0.5 8.60059 0.5c17.5 0 31.5 -7.2002 41.5 -22.5996c11 -17.1006 14.7002 -37.4004 18 -56.9004c7 -40.7002 11.3994 -81.8994 23.7998 -121.6c3.2002 -10.2002 6.7998 -19.7998 12.2002 -29.1006 +c3.89941 -6.69922 8.59961 -10.1992 13.7998 -10.1992c3.59961 0 7.5 1.59961 11.5996 5c3.60059 3 7.10059 6.2998 10 9.89941c19.9004 24.2998 36.8008 52.1006 47.6006 80.7998c3.39941 9 3.89941 17.9004 3.59961 27.7002 +c-0.399414 13.2998 -9.89941 24.5 -24.8994 25.2998c-2.5 0.100586 -4.90039 0.200195 -7.10059 0.200195c-11.0996 0 -19.7002 -1.7998 -31.8994 -7.09961c6.19922 24.0996 23.8994 62 53.7998 83.7998c19.7998 14.5 45.5 20.5 67.2002 20.5 +c10.1992 0 19.5 -1.2998 26.8994 -3.7002c23.1006 -7.5 35.6006 -22.8994 40.6006 -46.2998zM450 244.1c13.4004 29.7002 17.2002 58.8008 11.2002 86.7002c-3.90039 18.6006 -12.9004 28.9004 -29.9004 34.4004c-5.7998 1.89941 -13.5996 2.89941 -21.8994 2.89941 +c-21.2002 0 -42.8008 -6.59961 -57.8008 -17.5c-16 -11.5996 -28.8994 -29.7998 -37.6992 -47.8994c2 0.0996094 4.09961 0.200195 6.2998 0.200195c2.5 0 5.09961 0 8 -0.200195c22.5996 -1.2998 39.3994 -18.5 40 -40.9004 +c0.299805 -10.5 -0.100586 -21.7998 -4.60059 -33.7998c-10.8994 -29 -28.2998 -58.5 -50.1992 -85.2998c-3.60059 -4.40039 -7.7002 -8.5 -12.3008 -12.2002c-7 -5.7002 -14.2998 -8.59961 -21.6992 -8.59961c-7.7002 0 -18.8008 3.09961 -27.6006 18.0996 +c-6.59961 11.2998 -10.5996 22.7998 -13.5996 32.5c-9.7998 31.2998 -14.7998 63.5 -19.6006 94.5996c-1.5 9.5 -3.09961 19.4004 -4.69922 29.1006c-2.90039 17 -6.2002 36.2002 -15.7002 50.8994c-6.7998 10.4004 -15.7002 15.3008 -28.1006 15.3008 +c-2.09961 0 -4.2998 -0.100586 -6.59961 -0.400391c-7.7002 -1 -24.7002 -10.7998 -39.5 -22.9004c-2 -1.69922 -43.4004 -36.3994 -70.2998 -60.7998l2.7998 -3.59961c5.40039 3.59961 11.4004 7.59961 15.9004 10.2998c5.5 3.2998 11.5996 5.09961 17.5 5.09961 +c7 0 13.3994 -2.39941 18.5996 -6.89941c7.5 -6.60059 12.7002 -12.7002 15.9004 -18.6006c5.69922 -10.5996 12 -23.1992 15.8994 -36.3994c13.2998 -44.4004 25.5 -88.5 37.9004 -133.601c5.2998 -19.3994 12.0996 -40 25.5 -58.3994 +c13 -17.7998 23.2002 -20.2002 31.3994 -20.2002c6 0 12.9004 1.40039 21.2002 4.40039c23.1006 8.2998 42.7998 24.3994 60.6006 40.6992c31.7998 29 56.6992 62.8008 83.0996 98.5l0.299805 0.400391c20.6006 27.9004 36.4004 54.7002 49.7002 84.0996z" /> +d="M476.9 334c7.09961 -33.2998 1.59961 -65.7998 -12.3008 -96.7998c-14.0996 -31.2998 -31 -59.2998 -51.3994 -87c-26.4004 -35.7998 -52.4004 -71 -85.5 -101.2c-19.4004 -17.7002 -40.6006 -34.7998 -66 -43.9004c-31.2998 -11.1992 -51.6006 -5.09961 -70.9004 21.5 +c-14.0996 19.4004 -21.7002 40.8008 -28 63.6006c-12.2998 44.5996 -24.5996 89 -37.7998 133.3c-3.5 11.5 -9 22.7002 -14.7002 33.4004c-2.7002 5.09961 -7.7998 10.1992 -12.2998 14.0996c-4.7998 4.2998 -11.5 3.59961 -17.2002 0.200195 +c-9.59961 -5.7998 -27.5 -18.2998 -27.5 -18.2998l-21.2002 27c25.8008 24.5 81.8008 71.3994 81.8008 71.3994c10.8994 8.90039 33.0996 24.6006 47.7998 26.4004c21.3994 2.59961 38.3994 -4.2002 50 -22c11 -17.1006 14.7002 -37.4004 18 -56.9004 +c7 -40.7002 11.3994 -81.8994 23.7998 -121.6c3.2002 -10.2002 6.7998 -19.7998 12.2002 -29.1006c6.59961 -11.2998 15.2002 -13.5 25.3994 -5.19922c3.60059 3 7.10059 6.2998 10 9.89941c19.9004 24.2998 36.8008 52.1006 47.6006 80.7998 +c3.39941 9 3.89941 17.9004 3.59961 27.7002c-0.399414 13.2998 -9.89941 24.5 -24.8994 25.2998c-15 0.800781 -24.3008 -0.599609 -39 -6.89941c6.19922 24.0996 23.8994 62 53.7998 83.7998c29.2002 21.2998 71 24.2998 94.0996 16.7998 +c23.1006 -7.5 35.6006 -22.8994 40.6006 -46.2998z" />
' } }) diff --git a/js/ext/angular/test/content.html b/js/ext/angular/test/content.html index 008f63314e..b5b3477f99 100644 --- a/js/ext/angular/test/content.html +++ b/js/ext/angular/test/content.html @@ -50,6 +50,7 @@
+
diff --git a/scss/_scaffolding.scss b/scss/_scaffolding.scss index 1305ee98a1..103b930e99 100644 --- a/scss/_scaffolding.scss +++ b/scss/_scaffolding.scss @@ -116,9 +116,10 @@ body, .ionic-body { } .scroll-refresher-content { height: 100%; + width: 100%; text-align: center; - @include display-flex(); - @include align-items(center); + //@include display-flex(); + //@include align-items(center); } .scroll-refreshing { -webkit-transition: height 0.1s ease-in-out; diff --git a/scss/ionic.scss b/scss/ionic.scss index c08824dc33..56e77b837b 100644 --- a/scss/ionic.scss +++ b/scss/ionic.scss @@ -7,10 +7,7 @@ "colors", // Ionicons - "../ionicons/scss/ionicons-variables", - "../ionicons/scss/ionicons-font", - "../ionicons/scss/ionicons-animation", - "../ionicons/scss/ionicons-icons", + "../ionicons/ionicons.scss", // Base "reset",