Merge branch 'master' of https://github.com/driftyco/ionic

Conflicts:
	dist/css/ionic.css

Author: Adam Bradley

dist/css/themes/ionic-ios7.css

@@ -1,3 +1,4 @@
+@charset "UTF-8";
 /** 
  * Nav controllers and header bar animations
  */

dist/js/ionic-angular.js

@@ -24592,8 +24592,10 @@ angular.module('ionic.ui.content', [])
       return function($scope, $element, $attr) {
         var c = $element.eq(0);
 
-        if(attr.padding) {
-          c.addClass('padding');
+        var scroll = $element[0].querySelector('.scroll');
+
+        if(scroll && attr.padding) {
+          scroll.classList.add('padding');
         }
 
         if(attr.hasHeader == "true") {

js/ext/angular/src/directive/ionicContent.js

@@ -34,8 +34,10 @@ angular.module('ionic.ui.content', [])
       return function($scope, $element, $attr) {
         var c = $element.eq(0);
 
-        if(attr.padding) {
-          c.addClass('padding');
+        var scroll = $element[0].querySelector('.scroll');
+
+        if(scroll && attr.padding) {
+          scroll.classList.add('padding');
         }
 
         if(attr.hasHeader == "true") {