diff --git a/dist/ionic-ios7.css b/dist/ionic-ios7.css index cc1b82e322..f756c53d1b 100644 --- a/dist/ionic-ios7.css +++ b/dist/ionic-ios7.css @@ -1,4 +1,3 @@ -@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. @@ -182,7 +181,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. @@ -336,6 +335,7 @@ body { .content { position: fixed; + top: 0; right: 0; bottom: 0; left: 0; @@ -1770,7 +1770,7 @@ select:focus, input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { - outline: thin dotted #333333; + outline: thin dotted #333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -1857,7 +1857,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" */ @@ -1872,7 +1872,7 @@ input[type="checkbox"][readonly] { right: 0; left: 20px; -webkit-transform: none; - transition-delay: 0.05s, 0s; } + transition-delay: .05s, 0s; } /* hide a radio button's icon by default */ .radio-item [class^="icon-"], @@ -2048,7 +2048,7 @@ input[type="checkbox"][readonly] { border: none; background: none; } .button.button-icon:active, .button.button-icon.active { - text-shadow: 0px 0px 10px white; + text-shadow: 0px 0px 10px #fff; box-shadow: none; background: none; } @@ -2237,8 +2237,8 @@ a.button { } */ .slide-in-up.enter { - -webkit-transition: -webkit-transform 0.4s, opacity 0.4s; - transition: transform 0.4s, opacity 0.4s; + -webkit-transition: -webkit-transform .4s, opacity .4s; + transition: transform .4s, opacity .4s; -webkit-transform: translate3d(0, 100%, 0); transform: translate3d(0, 100%, 0); -webkit-transition-timing-function: cubic-bezier(0.1, 0.6, 0.1, 1); } @@ -2246,8 +2246,8 @@ a.button { -webkit-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); } .slide-in-up.leave { - -webkit-transition: -webkit-transform 0.25s, opacity 0.25s; - transition: transform 0.25s, opacity 0.25s; } + -webkit-transition: -webkit-transform .25s, opacity .25s; + transition: transform .25s, opacity .25s; } .slide-in-up.leave-active { -webkit-transform: translate3d(0, 100%, 0); transform: translate3d(0, 100%, 0); } diff --git a/dist/ionic.css b/dist/ionic.css index bb5dbd050c..aee55a4027 100644 --- a/dist/ionic.css +++ b/dist/ionic.css @@ -1,4 +1,3 @@ -@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. @@ -182,7 +181,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. @@ -336,6 +335,7 @@ body { .content { position: fixed; + top: 0; right: 0; bottom: 0; left: 0; @@ -1770,7 +1770,7 @@ select:focus, input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { - outline: thin dotted #333333; + outline: thin dotted #333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -2035,7 +2035,7 @@ input[type="checkbox"][readonly] { border: none; background: none; } .button.button-icon:active, .button.button-icon.active { - text-shadow: 0px 0px 10px white; + text-shadow: 0px 0px 10px #fff; box-shadow: none; background: none; } @@ -2224,8 +2224,8 @@ a.button { } */ .slide-in-up.enter { - -webkit-transition: -webkit-transform 0.4s, opacity 0.4s; - transition: transform 0.4s, opacity 0.4s; + -webkit-transition: -webkit-transform .4s, opacity .4s; + transition: transform .4s, opacity .4s; -webkit-transform: translate3d(0, 100%, 0); transform: translate3d(0, 100%, 0); -webkit-transition-timing-function: cubic-bezier(0.1, 0.6, 0.1, 1); } @@ -2233,8 +2233,8 @@ a.button { -webkit-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); } .slide-in-up.leave { - -webkit-transition: -webkit-transform 0.25s, opacity 0.25s; - transition: transform 0.25s, opacity 0.25s; } + -webkit-transition: -webkit-transform .25s, opacity .25s; + transition: transform .25s, opacity .25s; } .slide-in-up.leave-active { -webkit-transform: translate3d(0, 100%, 0); transform: translate3d(0, 100%, 0); } diff --git a/dist/ionic.js b/dist/ionic.js index be6162c17a..41481e7a7a 100644 --- a/dist/ionic.js +++ b/dist/ionic.js @@ -1692,7 +1692,7 @@ if ( document.readyState === "complete" ) { } }; })(window.ionic); -;(function(ionic) { +;;(function(ionic) { ionic.views.NavBar = function(opts) { this.el = opts.el; diff --git a/dist/ionicIcons.css b/dist/ionicIcons.css index 0c68a11963..f4a71f0184 100644 --- a/dist/ionicIcons.css +++ b/dist/ionicIcons.css @@ -68,8 +68,7 @@ you can use the generic selector below, but it's slower: .icon-contact-filled:before { content: "\e009"; } -;@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. * @@ -252,7 +251,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. @@ -406,6 +405,7 @@ body { .content { position: fixed; + top: 0; right: 0; bottom: 0; left: 0; @@ -1840,7 +1840,7 @@ select:focus, input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { - outline: thin dotted #333333; + outline: thin dotted #333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -2105,7 +2105,7 @@ input[type="checkbox"][readonly] { border: none; background: none; } .button.button-icon:active, .button.button-icon.active { - text-shadow: 0px 0px 10px white; + text-shadow: 0px 0px 10px #fff; box-shadow: none; background: none; } @@ -2294,8 +2294,8 @@ a.button { } */ .slide-in-up.enter { - -webkit-transition: -webkit-transform 0.4s, opacity 0.4s; - transition: transform 0.4s, opacity 0.4s; + -webkit-transition: -webkit-transform .4s, opacity .4s; + transition: transform .4s, opacity .4s; -webkit-transform: translate3d(0, 100%, 0); transform: translate3d(0, 100%, 0); -webkit-transition-timing-function: cubic-bezier(0.1, 0.6, 0.1, 1); } @@ -2303,8 +2303,8 @@ a.button { -webkit-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); } .slide-in-up.leave { - -webkit-transition: -webkit-transform 0.25s, opacity 0.25s; - transition: transform 0.25s, opacity 0.25s; } + -webkit-transition: -webkit-transform .25s, opacity .25s; + transition: transform .25s, opacity .25s; } .slide-in-up.leave-active { -webkit-transform: translate3d(0, 100%, 0); transform: translate3d(0, 100%, 0); } diff --git a/js/views/headerBar.js b/js/views/headerBar.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/scss/ionic/_scaffolding.scss b/scss/ionic/_scaffolding.scss index 469501fcc6..13f84e6842 100644 --- a/scss/ionic/_scaffolding.scss +++ b/scss/ionic/_scaffolding.scss @@ -36,6 +36,7 @@ body { .content { position: fixed; + top: 0; right: 0; bottom: 0; left: 0; diff --git a/test/scroll.html b/test/scroll.html new file mode 100644 index 0000000000..995164d5a9 --- /dev/null +++ b/test/scroll.html @@ -0,0 +1,42 @@ + + + + iOS 7 + + + + + + + + +
+
+
+ Edit +

World Clock

+ Delete +
+
+
+
+
+
+
+ Edit +

World Clock

+ Delete +
+
+
+
+
+
+ + +