From 088779b6e9151e4c97287c0c19b53d9c5877c825 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Thu, 28 Nov 2013 12:12:00 -0600
Subject: [PATCH] Removed more fixed stuff for tabs, etc.

---
 dist/css/ionic.css                           |  5 ----
 dist/js/ionic-angular.js                     | 21 +++-------------
 js/ext/angular/src/directive/ionicContent.js | 21 +++-------------
 js/ext/angular/test/content.html             | 25 ++++++++++++++++++--
 scss/_tabs.scss                              |  6 -----
 5 files changed, 29 insertions(+), 49 deletions(-)

diff --git a/dist/css/ionic.css b/dist/css/ionic.css
index 4a5fbaf4a1..48acc5fd5b 100644
--- a/dist/css/ionic.css
+++ b/dist/css/ionic.css
@@ -3051,8 +3051,6 @@ a.subdued {
   background-image: linear-gradient(0deg, #b2b2b2, #b2b2b2 50%, transparent 50%);
   border-color: #b2b2b2;
   color: #444444;
-  position: absolute;
-  bottom: 0;
   z-index: 5;
   width: 100%;
   height: 49px;
@@ -3114,9 +3112,6 @@ a.subdued {
       background-size: 100% 1px;
       background-repeat: no-repeat; } }
 
-.tabs-top {
-  top: 44px; }
-
 .tab-item {
   -webkit-box-flex: 1;
   -webkit-flex: 1;
diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js
index 8bd9ae37e2..4bd47d427d 100644
--- a/dist/js/ionic-angular.js
+++ b/dist/js/ionic-angular.js
@@ -656,25 +656,10 @@ angular.module('ionic.ui.content', [])
     },
     compile: function(element, attr, transclude) {
       return function($scope, $element, $attr) {
-        var 
-        c = $element.eq(0),
-        clone,
-        sc, 
-        sv,
-        addedPadding = false;
+        var clone, sc, sv;
 
-        if(attr.hasHeader == "true") {
-          c.addClass('has-header');
-        }
-        if(attr.hasSubheader == "true") {
-          c.addClass('has-subheader');
-        }
-        if(attr.hasFooter == "true") {
-          c.addClass('has-footer');
-        }
-        if(attr.hasTabs == "true") {
-          c.addClass('has-tabs');
-        }
+        var addedPadding = false;
+        var c = $element.eq(0);
 
         if(attr.refreshComplete) {
           $scope.refreshComplete = function() {
diff --git a/js/ext/angular/src/directive/ionicContent.js b/js/ext/angular/src/directive/ionicContent.js
index e9f9a8fa39..fb0db2b440 100644
--- a/js/ext/angular/src/directive/ionicContent.js
+++ b/js/ext/angular/src/directive/ionicContent.js
@@ -32,25 +32,10 @@ angular.module('ionic.ui.content', [])
     },
     compile: function(element, attr, transclude) {
       return function($scope, $element, $attr) {
-        var 
-        c = $element.eq(0),
-        clone,
-        sc, 
-        sv,
-        addedPadding = false;
+        var clone, sc, sv;
 
-        if(attr.hasHeader == "true") {
-          c.addClass('has-header');
-        }
-        if(attr.hasSubheader == "true") {
-          c.addClass('has-subheader');
-        }
-        if(attr.hasFooter == "true") {
-          c.addClass('has-footer');
-        }
-        if(attr.hasTabs == "true") {
-          c.addClass('has-tabs');
-        }
+        var addedPadding = false;
+        var c = $element.eq(0);
 
         if(attr.refreshComplete) {
           $scope.refreshComplete = function() {
diff --git a/js/ext/angular/test/content.html b/js/ext/angular/test/content.html
index 46c16838be..b2012ff948 100644
--- a/js/ext/angular/test/content.html
+++ b/js/ext/angular/test/content.html
@@ -69,8 +69,6 @@
         on-refresh="onRefresh()"
         on-refresh-opening="onRefreshOpening(amount)"
         refresh-complete="refreshComplete"
-        has-header="true"
-        has-footer="true"
         >
         <refresher></refresher>
         <ul class="list" ng-controller="AppCtrl">
@@ -81,6 +79,29 @@
       <footer-bar type="bar-assertive">
         <h1 class="title">Footer</h1>
       </footer-bar>
+      <nav id="tab-bar" class="tabs tabs-icon-top">
+        <a class="tab-item" href="#">
+          <i class="icon ion-game-controller-a"></i>
+          Fun
+        </a>
+        <a class="tab-item">
+          <i class="icon ion-locked"></i>
+          Security
+        </a>
+        <a class="tab-item">
+          <i class="icon ion-heart"></i>
+          Simple
+        </a>
+        <a class="tab-item">
+          <i class="icon ion-leaf"></i>
+          Light
+        </a>
+        <a class="tab-item">
+          <i class="icon ion-waterdrop"></i>
+          Clean
+        </a>
+      </nav>
+      
     </pane>
 
     <script>
diff --git a/scss/_tabs.scss b/scss/_tabs.scss
index 3b92281149..3f1a3560e0 100644
--- a/scss/_tabs.scss
+++ b/scss/_tabs.scss
@@ -11,8 +11,6 @@
   @include justify-content(center);
 
   @include tab-style($tabs-default-bg, $tabs-default-border, $tabs-default-text);
-  position: absolute;
-  bottom: 0;
   z-index: 5;
 
   width: 100%;
@@ -65,10 +63,6 @@
   }
 }
 
-.tabs-top {
-  top: $bar-height;
-}
-
 .tab-item {
   @include flex(1);
   display: block;