From c02effede2ccfbc102b35871864f2cacf1c26e19 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Mon, 9 Sep 2013 15:44:41 -0500 Subject: [PATCH] Headers and some segmented stuff --- dist/ionic.css | 6 ------ example/headers.html | 21 +++++++++++++++++++++ js/views/ionic-segmented.js | 3 +++ scss/ionic/structure/_animations.css | 7 +++++++ scss/ionic/structure/_base.scss | 7 ------- 5 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 js/views/ionic-segmented.js create mode 100644 scss/ionic/structure/_animations.css diff --git a/dist/ionic.css b/dist/ionic.css index d3f5c72dba..b3aefb9a86 100644 --- a/dist/ionic.css +++ b/dist/ionic.css @@ -1,12 +1,6 @@ @charset "UTF-8"; -*, *:before, *:after { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; } - html { -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; -webkit-touch-callout: none; -webkit-user-select: none; -moz-user-select: -moz-none; diff --git a/example/headers.html b/example/headers.html index e8c93b9bdf..1d1703ecfc 100644 --- a/example/headers.html +++ b/example/headers.html @@ -7,6 +7,12 @@ + @@ -30,6 +36,21 @@ Danger +
+
+ Back + This +
+
+ Success + Warning + Danger +
+
+ Back + This +
+

Content element must have "has-header" as a classname.

diff --git a/js/views/ionic-segmented.js b/js/views/ionic-segmented.js new file mode 100644 index 0000000000..fe9e8810bf --- /dev/null +++ b/js/views/ionic-segmented.js @@ -0,0 +1,3 @@ +(function(window, document, ion) { + +}); diff --git a/scss/ionic/structure/_animations.css b/scss/ionic/structure/_animations.css new file mode 100644 index 0000000000..4ec1ff5626 --- /dev/null +++ b/scss/ionic/structure/_animations.css @@ -0,0 +1,7 @@ +.slide-in-up.enter { + -webkit-transform: translate3d(0, 100%, 0); + transform: translate3d(0, 100%, 0); + + -webkit-transition: -webkit-transform .25s ease-in-out, opacity 1ms .25s; + transition: transform .25s ease-in-out, opacity 1ms .25s; +} diff --git a/scss/ionic/structure/_base.scss b/scss/ionic/structure/_base.scss index b18fd5e08c..865cb0efea 100644 --- a/scss/ionic/structure/_base.scss +++ b/scss/ionic/structure/_base.scss @@ -1,15 +1,8 @@ // TODO: This might be inefficient? -*, *:before, *:after { - -moz-box-sizing: border-box; - -webkit-box-sizing: - border-box; - box-sizing: border-box; - } // Make sure iOS Safari doesn't scale fonts on orientation changes html { -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; @include disable-user-select(); }