Skip to content

Commit 37a7b94

Browse files
committed
Updated seed to new ionic
1 parent 89d0312 commit 37a7b94

39 files changed

+59490
-24008
lines changed

www/css/ionic.css

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@charset "UTF-8";
12
/**
23
* Copyright 2013 Drifty Co.
34
* http://drifty.com/
@@ -12,15 +13,15 @@
1213
*
1314
*/
1415
/*!
15-
Ionicons, v1.3.5
16+
Ionicons, v1.3.6
1617
Created by Ben Sperry for the Ionic Framework, http://ionicons.com/
1718
https://twitter.com/helloimben https://twitter.com/ionicframework
1819
MIT License: https://github.com/driftyco/ionicons
1920
*/
2021
@font-face {
2122
font-family: "Ionicons";
22-
src: url("../fonts/ionicons.eot?v=1.3.5");
23-
src: url("../fonts/ionicons.eot?v=1.3.5#iefix") format("embedded-opentype"), url("../fonts/ionicons.ttf?v=1.3.5") format("truetype"), url("../fonts/ionicons.woff?v=1.3.5") format("woff"), url("../fonts/ionicons.svg?v=1.3.5#Ionicons") format("svg");
23+
src: url("../fonts/ionicons.eot?v=1.3.6");
24+
src: url("../fonts/ionicons.eot?v=1.3.6#iefix") format("embedded-opentype"), url("../fonts/ionicons.ttf?v=1.3.6") format("truetype"), url("../fonts/ionicons.woff?v=1.3.6") format("woff"), url("../fonts/ionicons.svg?v=1.3.6#Ionicons") format("svg");
2425
font-weight: normal;
2526
font-style: normal; }
2627

@@ -484,6 +485,7 @@
484485
font-weight: normal;
485486
font-variant: normal;
486487
text-transform: none;
488+
text-rendering: auto;
487489
line-height: 1;
488490
-webkit-font-smoothing: antialiased;
489491
-moz-osx-font-smoothing: grayscale; }
@@ -535,6 +537,11 @@
535537
100% {
536538
transform: rotate(359deg); } }
537539

540+
.ion-loading-a {
541+
-webkit-animation-timing-function: steps(8, start);
542+
-moz-animation-timing-function: steps(8, start);
543+
animation-timing-function: steps(8, start); }
544+
538545
.ion-alert:before {
539546
content: "\f101"; }
540547

@@ -2096,7 +2103,7 @@ textarea {
20962103
/* 5 */ }
20972104

20982105
/**
2099-
* Address Firefox 4+ setting `line-height` on `input` using `!important` in
2106+
* Address Firefox 4+ setting `line-height` on `input` using `importnt` in
21002107
* the UA stylesheet.
21012108
*/
21022109
button,
@@ -2326,8 +2333,12 @@ body, .ionic-body {
23262333
-webkit-transform: scale(2, 2); } }
23272334

23282335
.overflow-scroll {
2329-
overflow: auto;
2336+
overflow-x: hidden;
2337+
overflow-y: scroll;
23302338
-webkit-overflow-scrolling: touch; }
2339+
.overflow-scroll .scroll {
2340+
position: static;
2341+
height: 100%; }
23312342

23322343
.has-header {
23332344
top: 44px; }
@@ -2552,11 +2563,12 @@ a.subdued {
25522563
.action-sheet-backdrop.active {
25532564
-webkit-animation: fadeInHalf 0.3s;
25542565
animation: fadeInHalf 0.3s;
2555-
-webkit-animation-fill-mode: forwards; }
2566+
-webkit-animation-fill-mode: both; }
25562567
.action-sheet-backdrop.active-remove {
2568+
background-color: rgba(0, 0, 0, 0.5);
25572569
-webkit-animation: fadeOutHalf 0.3s;
25582570
animation: fadeOutHalf 0.3s;
2559-
-webkit-animation-fill-mode: forwards; }
2571+
-webkit-animation-fill-mode: both; }
25602572

25612573
@-webkit-keyframes actionSheetUp {
25622574
0% {
@@ -2656,11 +2668,12 @@ a.subdued {
26562668
border-top: 1px solid transparent;
26572669
border-bottom: 1px solid #dddddd;
26582670
background-color: white;
2671+
/* border-width: 1px will actually create 2 device pixels on retina */
2672+
/* this nifty trick sets an actual 1px border on hi-res displays */
26592673
background-size: 0; }
26602674
@media (min--moz-device-pixel-ratio: 1.5), (-webkit-min-device-pixel-ratio: 1.5), (min-device-pixel-ratio: 1.5), (min-resolution: 144dpi), (min-resolution: 1.5dppx) {
26612675
.bar {
2662-
border-top: none !important;
2663-
border-bottom: none !important;
2676+
border: none;
26642677
background-image: linear-gradient(0deg, #dddddd, #dddddd 50%, transparent 50%);
26652678
background-position: bottom;
26662679
background-size: 100% 1px;
@@ -2794,7 +2807,7 @@ a.subdued {
27942807
box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
27952808
border-color: #cccccc; }
27962809
.bar-light .button.button-clear {
2797-
color: white;
2810+
color: #444444;
27982811
background: none;
27992812
border-color: transparent;
28002813
box-shadow: none;
@@ -2815,7 +2828,7 @@ a.subdued {
28152828
box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
28162829
border-color: #a2a2a2; }
28172830
.bar-stable .button.button-clear {
2818-
color: white;
2831+
color: #444444;
28192832
background: none;
28202833
border-color: transparent;
28212834
box-shadow: none;
@@ -3625,7 +3638,7 @@ button.item-button-right:after {
36253638
.item-thumbnail-left {
36263639
padding-left: 105px;
36273640
min-height: 100px; }
3628-
.item-thumbnail-left img:first-child, .item-thumbnail-left .item-image {
3641+
.item-thumbnail-left > img:first-child, .item-thumbnail-left > .item-image {
36293642
position: absolute;
36303643
top: 10px;
36313644
left: 10px;
@@ -3636,7 +3649,7 @@ button.item-button-right:after {
36363649
.item-thumbnail-right {
36373650
padding-right: 105px;
36383651
min-height: 100px; }
3639-
.item-thumbnail-right img:first-child, .item-thumbnail-right .item-image {
3652+
.item-thumbnail-right > img:first-child, .item-thumbnail-right > .item-image {
36403653
position: absolute;
36413654
top: 10px;
36423655
right: 10px;
@@ -4115,7 +4128,6 @@ textarea {
41154128
-webkit-border-radius: 2px;
41164129
-moz-border-radius: 2px;
41174130
border-radius: 2px;
4118-
display: block !important;
41194131
overflow: hidden;
41204132
padding: 4px 8px 3px;
41214133
border: none;
@@ -4428,7 +4440,7 @@ input[type="range"] {
44284440
background-position: center;
44294441
background-size: 96% 4px;
44304442
background-repeat: no-repeat;
4431-
-webkit-appearance: none !important; }
4443+
-webkit-appearance: none; }
44324444
input[type="range"]::-webkit-slider-thumb {
44334445
position: relative;
44344446
width: 20px;
@@ -4437,7 +4449,7 @@ input[type="range"] {
44374449
background-color: white;
44384450
box-shadow: 0 0 2px rgba(0, 0, 0, 0.5), 1px 3px 5px rgba(0, 0, 0, 0.25);
44394451
cursor: pointer;
4440-
-webkit-appearance: none !important; }
4452+
-webkit-appearance: none; }
44414453
input[type="range"]::-webkit-slider-thumb:before {
44424454
/* what creates the colorful line on the left side of the slider */
44434455
position: absolute;
@@ -5463,28 +5475,16 @@ a.button {
54635475
flex: 0 0 90%;
54645476
max-width: 90%; }
54655477

5466-
/**
5467-
* Icons
5468-
* --------------------------------------------------
5469-
*/
5470-
.fill-icon {
5471-
color: white !important; }
5472-
.fill-icon:before {
5473-
background: black;
5474-
position: relative;
5475-
border-radius: 6px;
5476-
padding: 1px; }
5477-
54785478
/**
54795479
* Utility Classes
54805480
* --------------------------------------------------
54815481
*/
54825482
.hidden,
54835483
.hide {
5484-
display: none !important; }
5484+
display: none; }
54855485

54865486
.show {
5487-
display: block !important; }
5487+
display: block; }
54885488

54895489
.inline {
54905490
display: inline-block; }
@@ -5630,3 +5630,7 @@ a.button {
56305630
margin-top: 20px; }
56315631
.platform-ios7 .has-header {
56325632
top: 64px; }
5633+
.platform-ios7 .bar-subheader {
5634+
top: 64px; }
5635+
.platform-ios7 .has-subheader {
5636+
top: 108px; }

www/css/themes/ionic-ios7.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@charset "UTF-8";
12
/**
23
* Nav controllers and header bar animations
34
*/

www/fonts/ionicons.eot

100755100644
File mode changed.

www/fonts/ionicons.svg

100755100644
File mode changed.

www/fonts/ionicons.ttf

100755100644
File mode changed.

www/fonts/ionicons.woff

100755100644
File mode changed.

www/index.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
<link rel="stylesheet" href="css/app.css">
1212

1313
<script src="js/ionic.js"></script>
14+
<script src="js/angular/angular.js"></script>
15+
<script src="js/angular/angular-animate.js"></script>
16+
<script src="js/angular/angular-route.js"></script>
17+
<script src="js/angular/angular-touch.js"></script>
18+
<script src="js/angular/angular-sanitize.js"></script>
1419
<script src="js/ionic-angular.js"></script>
1520

1621
<!-- Cordova include -->

0 commit comments

Comments
 (0)