reorder HeaderBar after NavBar in grunt

Gruntfile.js

@@ -16,7 +16,10 @@ module.exports = function(grunt) {
           'js/gestures.js',
           'js/animate.js',
           'js/viewController.js',
-          'js/views/**/*.js',
+          'js/views/navBar.js',
+          'js/views/headerBar.js',
+          'js/views/tabBar.js',
+          'js/views/sideMenu.js',
           'js/controllers/**/*.js',
           'js/tapPolyfill.js'
         ],

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.
@@ -1770,7 +1771,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; }
 
@@ -1857,7 +1858,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" */
@@ -1872,7 +1873,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-"],
@@ -2048,7 +2049,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; }
 
@@ -2237,8 +2238,8 @@ a.button {
 }
 */
 .slide-in-up.enter {
-  -webkit-transition: -webkit-transform .4s, opacity .4s;
+  -webkit-transition: -webkit-transform 0.4s, opacity 0.4s;
-  transition: transform .4s, opacity .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); }
@@ -2246,8 +2247,8 @@ a.button {
   -webkit-transform: translate3d(0, 0, 0);
   transform: translate3d(0, 0, 0); }
 .slide-in-up.leave {
-  -webkit-transition: -webkit-transform .25s, opacity .25s;
+  -webkit-transition: -webkit-transform 0.25s, opacity 0.25s;
-  transition: transform .25s, opacity .25s; }
+  transition: transform 0.25s, opacity 0.25s; }
 .slide-in-up.leave-active {
   -webkit-transform: translate3d(0, 100%, 0);
   transform: translate3d(0, 100%, 0); }

dist/ionic-simple.js

@@ -1,10 +1,10 @@
 
 (function(window, document, ionic) {
 
-  ionic.simple = {
+  ionic.Components = {};
-
-    
 
+  ionic.registerComponent = function(name, className) {
+    this.Components[name] = className;
   };
 
   function initalize() {
@@ -30,13 +30,7 @@
 (function(window, document, ionic) {
 
   function initalize() {
-    
+     ionic.registerComponent("toggle", "toggle");
-    ionic.on("swipe", swipe, document.body)
-    
-  }
-
-  function swipe(e) {
-    alert(e.target.tagName)
   }
 
   ionic.on("domready", initalize);

dist/ionic.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.
@@ -1770,7 +1771,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; }
 
@@ -2035,7 +2036,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; }
 
@@ -2224,8 +2225,8 @@ a.button {
 }
 */
 .slide-in-up.enter {
-  -webkit-transition: -webkit-transform .4s, opacity .4s;
+  -webkit-transition: -webkit-transform 0.4s, opacity 0.4s;
-  transition: transform .4s, opacity .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); }
@@ -2233,8 +2234,8 @@ a.button {
   -webkit-transform: translate3d(0, 0, 0);
   transform: translate3d(0, 0, 0); }
 .slide-in-up.leave {
-  -webkit-transition: -webkit-transform .25s, opacity .25s;
+  -webkit-transition: -webkit-transform 0.25s, opacity 0.25s;
-  transition: transform .25s, opacity .25s; }
+  transition: transform 0.25s, opacity 0.25s; }
 .slide-in-up.leave-active {
   -webkit-transform: translate3d(0, 100%, 0);
   transform: translate3d(0, 100%, 0); }

dist/ionic.js

@@ -1668,34 +1668,6 @@ window.ionic = {
 })(window.ionic);
 ;(function(ionic) {
 
-ionic.views.HeaderBar = function(opts) {
-  this.el = opts.el;
-
-  this._titleEl = this.el.querySelector('.title');
-};
-
-ionic.views.NavBar.prototype = {
-  resizeTitle: function() {
-    var e;
-    var j;
-    var children = this.el.children;
-
-    var title;
-    var titleWidth;
-
-    for(var i = 0; j = children.length; i < j; i++) {
-      e = children[i];
-      if(/h\d/.test(e.nodeName.toLowerCase())) {
-        title = e;
-      }
-    }
-
-    titleWidth = title.offsetWidth;
-  }
-};
-})(window.ionic);
-;(function(ionic) {
-
 ionic.views.NavBar = function(opts) {
   this.el = opts.el;
 
@@ -1738,29 +1710,34 @@ ionic.views.NavBar.prototype = {
 })(window.ionic);
 ;(function(ionic) {
 
-ionic.views = ionic.views || {};
+  ionic.views.HeaderBar = function(opts) {
+    this.el = opts.el;
 
-ionic.views.SideMenu = function(opts) {
+    this._titleEl = this.el.querySelector('.title');
-  this.el = opts.el;
+  };
-  this.width = opts.width;
-  this.isEnabled = opts.isEnabled || true;
-};
 
-ionic.views.SideMenu.prototype = {
+  ionic.views.NavBar.prototype = {
-  getFullWidth: function() {
+    resizeTitle: function() {
-    return this.width;
+      var 
-  },
+      e,
-  setIsEnabled: function(isEnabled) {
+      j,
-    this.isEnabled = isEnabled;
+      i,
-  },
+      title,
-  bringUp: function() {
+      titleWidth,
-    this.el.style.zIndex = 0;
+      children = this.el.children;
-  },
+
-  pushDown: function() {
+      for(i = 0, j = children.length; i < j; i++) {
-    this.el.style.zIndex = -1;
+        e = children[i];
-  }
+        if(/h\d/.test(e.nodeName.toLowerCase())) {
-};
+          title = e;
-})(window.ionic);
+        }
+      }
+
+      titleWidth = title.offsetWidth;
+    }
+  };
+
+})(ionic);
 ;(function(ionic) {
 
 ionic.views.TabBarItem = function(el) {
@@ -1964,6 +1941,31 @@ ionic.views.TabBar.prototype = {
 })(window.ionic);
 ;(function(ionic) {
 
+ionic.views = ionic.views || {};
+
+ionic.views.SideMenu = function(opts) {
+  this.el = opts.el;
+  this.width = opts.width;
+  this.isEnabled = opts.isEnabled || true;
+};
+
+ionic.views.SideMenu.prototype = {
+  getFullWidth: function() {
+    return this.width;
+  },
+  setIsEnabled: function(isEnabled) {
+    this.isEnabled = isEnabled;
+  },
+  bringUp: function() {
+    this.el.style.zIndex = 0;
+  },
+  pushDown: function() {
+    this.el.style.zIndex = -1;
+  }
+};
+})(window.ionic);
+;(function(ionic) {
+
 ionic.controllers.NavController = function(opts) {
   var _this = this;
 

dist/ionicIcons.css

@@ -68,7 +68,8 @@ 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.
 * 
@@ -251,7 +252,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.
@@ -1840,7 +1841,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; }
 
@@ -2105,7 +2106,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; }
 
@@ -2294,8 +2295,8 @@ a.button {
 }
 */
 .slide-in-up.enter {
-  -webkit-transition: -webkit-transform .4s, opacity .4s;
+  -webkit-transition: -webkit-transform 0.4s, opacity 0.4s;
-  transition: transform .4s, opacity .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); }
@@ -2303,8 +2304,8 @@ a.button {
   -webkit-transform: translate3d(0, 0, 0);
   transform: translate3d(0, 0, 0); }
 .slide-in-up.leave {
-  -webkit-transition: -webkit-transform .25s, opacity .25s;
+  -webkit-transition: -webkit-transform 0.25s, opacity 0.25s;
-  transition: transform .25s, opacity .25s; }
+  transition: transform 0.25s, opacity 0.25s; }
 .slide-in-up.leave-active {
   -webkit-transform: translate3d(0, 100%, 0);
   transform: translate3d(0, 100%, 0); }

js/views/headerBar.js

@@ -1,28 +1,30 @@
 (function(ionic) {
 
-ionic.views.HeaderBar = function(opts) {
+  ionic.views.HeaderBar = function(opts) {
-  this.el = opts.el;
+    this.el = opts.el;
 
-  this._titleEl = this.el.querySelector('.title');
+    this._titleEl = this.el.querySelector('.title');
-};
+  };
 
-ionic.views.NavBar.prototype = {
+  ionic.views.NavBar.prototype = {
-  resizeTitle: function() {
+    resizeTitle: function() {
-    var e;
+      var 
-    var j;
+      e,
-    var children = this.el.children;
+      j,
+      i,
+      title,
+      titleWidth,
+      children = this.el.children;
 
-    var title;
+      for(i = 0, j = children.length; i < j; i++) {
-    var titleWidth;
+        e = children[i];
-
+        if(/h\d/.test(e.nodeName.toLowerCase())) {
-    for(var i = 0; j = children.length; i < j; i++) {
+          title = e;
-      e = children[i];
+        }
-      if(/h\d/.test(e.nodeName.toLowerCase())) {
-        title = e;
       }
-    }
 
-    titleWidth = title.offsetWidth;
+      titleWidth = title.offsetWidth;
-  }
+    }
-};
+  };
-})(window.ionic);
+
+})(ionic);