diff --git a/dist/ionic-ios7.css b/dist/ionic-ios7.css index ff71efcce2..c406e2f928 100644 --- a/dist/ionic-ios7.css +++ b/dist/ionic-ios7.css @@ -1,3 +1,4 @@ +@charset "UTF-8"; /** * Adapted from normalize.css and some reset.css. We don't care even one * bit about old IE, so we don't need any hacks for that in here. @@ -181,7 +182,7 @@ sub { fieldset { margin: 0 2px; padding: 0.35em 0.625em 0.75em; - border: 1px solid #c0c0c0; } + border: 1px solid silver; } /** * 1. Correct `color` not being inherited in IE 8/9. @@ -1773,7 +1774,7 @@ select:focus, input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { - outline: thin dotted #333; + outline: thin dotted #333333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -1860,7 +1861,7 @@ input[type="checkbox"][readonly] { right: 20px; transition: 0.2s ease; transition-property: left, right; - transition-delay: 0s, .05s; } + transition-delay: 0s, 0.05s; } .toggle :checked + .track { /* When the toggle is "on" */ @@ -1875,7 +1876,7 @@ input[type="checkbox"][readonly] { right: 0; left: 20px; -webkit-transform: none; - transition-delay: .05s, 0s; } + transition-delay: 0.05s, 0s; } /* hide a radio button's icon by default */ .radio-item [class^="icon-"], @@ -2052,7 +2053,7 @@ input[type="checkbox"][readonly] { border: none; background: none; } .button.button-icon:active, .button.button-icon.active { - text-shadow: 0px 0px 10px #fff; + text-shadow: 0px 0px 10px white; box-shadow: none; background: none; } @@ -2235,7 +2236,7 @@ a.button { width: 100%; background-color: white; border-radius: 2px; - border: 1px solid #ddd; } + border: 1px solid #dddddd; } .card-header { padding: 10px; @@ -2271,8 +2272,8 @@ a.button { } */ .slide-in-up.enter { - -webkit-transition: -webkit-transform .4s, opacity .4s; - transition: transform .4s, opacity .4s; + -webkit-transition: -webkit-transform 0.4s, opacity 0.4s; + transition: transform 0.4s, opacity 0.4s; -webkit-transform: translate3d(0, 100%, 0); transform: translate3d(0, 100%, 0); -webkit-transition-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1); } @@ -2280,8 +2281,28 @@ a.button { -webkit-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); } .slide-in-up.leave { - -webkit-transition: -webkit-transform .25s, opacity .25s; - transition: transform .25s, opacity .25s; } + -webkit-transition: -webkit-transform 0.25s, opacity 0.25s; + transition: transform 0.25s, opacity 0.25s; } .slide-in-up.leave-active { -webkit-transform: translate3d(0, 100%, 0); transform: translate3d(0, 100%, 0); } + +@keyframes fadein { + from { + opacity: 0; } + + to { + opacity: 1; } } + +@-webkit-keyframes fadein { + /* Safari and Chrome */ + from { + opacity: 0; } + + to { + opacity: 1; } } + +.fade-in { + opacity: 0; + animation: fadein 0.5s; + -webkit-animation: fadein 0.5s; } diff --git a/dist/ionic.css b/dist/ionic.css index 09c5b624d5..6fc43c4e7b 100644 --- a/dist/ionic.css +++ b/dist/ionic.css @@ -1,3 +1,4 @@ +@charset "UTF-8"; @font-face { font-family: 'ionicon-test'; src: url("fonts/ionicon-test.eot"); @@ -246,7 +247,7 @@ sub { fieldset { margin: 0 2px; padding: 0.35em 0.625em 0.75em; - border: 1px solid #c0c0c0; } + border: 1px solid silver; } /** * 1. Correct `color` not being inherited in IE 8/9. @@ -1831,7 +1832,7 @@ select:focus, input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { - outline: thin dotted #333; + outline: thin dotted #333333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -2104,7 +2105,7 @@ input[type="checkbox"][readonly] { border: none; background: none; } .button.button-icon:active, .button.button-icon.active { - text-shadow: 0px 0px 10px #fff; + text-shadow: 0px 0px 10px white; box-shadow: none; background: none; } @@ -2287,7 +2288,7 @@ a.button { width: 100%; background-color: white; border-radius: 2px; - border: 1px solid #ddd; } + border: 1px solid #dddddd; } .card-header { padding: 10px; @@ -2323,8 +2324,8 @@ a.button { } */ .slide-in-up.enter { - -webkit-transition: -webkit-transform .4s, opacity .4s; - transition: transform .4s, opacity .4s; + -webkit-transition: -webkit-transform 0.4s, opacity 0.4s; + transition: transform 0.4s, opacity 0.4s; -webkit-transform: translate3d(0, 100%, 0); transform: translate3d(0, 100%, 0); -webkit-transition-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1); } @@ -2332,12 +2333,32 @@ a.button { -webkit-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); } .slide-in-up.leave { - -webkit-transition: -webkit-transform .25s, opacity .25s; - transition: transform .25s, opacity .25s; } + -webkit-transition: -webkit-transform 0.25s, opacity 0.25s; + transition: transform 0.25s, opacity 0.25s; } .slide-in-up.leave-active { -webkit-transform: translate3d(0, 100%, 0); transform: translate3d(0, 100%, 0); } +@keyframes fadein { + from { + opacity: 0; } + + to { + opacity: 1; } } + +@-webkit-keyframes fadein { + /* Safari and Chrome */ + from { + opacity: 0; } + + to { + opacity: 1; } } + +.fade-in { + opacity: 0; + animation: fadein 0.5s; + -webkit-animation: fadein 0.5s; } + .platform-ios7 .bar-header { height: 64px; } .platform-ios7 .bar-header > * { diff --git a/example/toderp2/css/app.css b/example/toderp2/css/app.css new file mode 100644 index 0000000000..c11eeeda06 --- /dev/null +++ b/example/toderp2/css/app.css @@ -0,0 +1,20 @@ +.view { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; +} +.ionic-logo { + position: absolute; + top: 50%; + left: 50%; + margin-top: -128px; + margin-left: -128px; + width: 256px; +} +#splash-view { + opacity: 1; +} +#splash-view .ionic-logo { +} diff --git a/example/toderp2/img/ionic.png b/example/toderp2/img/ionic.png new file mode 100644 index 0000000000..f2e3a149c3 Binary files /dev/null and b/example/toderp2/img/ionic.png differ diff --git a/example/toderp2/index.html b/example/toderp2/index.html index 77498bdab3..dc9dfc13e7 100644 --- a/example/toderp2/index.html +++ b/example/toderp2/index.html @@ -7,7 +7,7 @@ - + @@ -36,26 +36,26 @@