diff --git a/dist/css/ionic.css b/dist/css/ionic.css index b2ae4e0de0..750b41a726 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -2246,8 +2246,10 @@ body, .ionic-body { .scroll-content { width: 100%; top: 0; + right: 0; + bottom: 0; left: 0; - position: relative; + position: absolute; overflow: hidden; margin-top: -1px; width: auto; } @@ -2356,7 +2358,12 @@ body, .ionic-body { bottom: 49px; } .pane { - position: fixed; + position: fixed; } + +.view { + position: absolute; } + +.pane, .view { top: 0; right: 0; bottom: 0; diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js index 6301c4e462..8d68a2969f 100644 --- a/dist/js/ionic-angular.js +++ b/dist/js/ionic-angular.js @@ -1959,7 +1959,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture']) replace: true, transclude: true, scope: true, - template: '
', + template: '
', compile: function(element, attr, transclude) { return function($scope, $element, $attr, sideMenuCtrl) { $scope.side = $attr.side; @@ -2122,7 +2122,7 @@ angular.module('ionic.ui.tabs', ['ngAnimate']) transclude: true, controller: 'TabsCtrl', //templateUrl: 'ext/angular/tmpl/ionicTabBar.tmpl.html', - template: '
', + template: '
', compile: function(element, attr, transclude, tabsCtrl) { return function($scope, $element, $attr) { var tabs = $element[0].querySelector('.tabs'); diff --git a/dist/js/ionic.js b/dist/js/ionic.js index af3dac6bfc..539f1c036b 100644 --- a/dist/js/ionic.js +++ b/dist/js/ionic.js @@ -3424,7 +3424,7 @@ var Scroller; Math.min(this.__container.clientWidth, this.__container.parentElement.clientWidth), Math.min(this.__container.clientHeight, this.__container.parentElement.clientHeight), this.__content.offsetWidth, - this.__content.offsetHeight+80); + this.__content.offsetHeight-20); }, /* --------------------------------------------------------------------------- diff --git a/js/ext/angular/src/directive/ionicSideMenu.js b/js/ext/angular/src/directive/ionicSideMenu.js index 90226e9b01..e344f8ad84 100644 --- a/js/ext/angular/src/directive/ionicSideMenu.js +++ b/js/ext/angular/src/directive/ionicSideMenu.js @@ -138,7 +138,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture']) replace: true, transclude: true, scope: true, - template: '
', + template: '
', compile: function(element, attr, transclude) { return function($scope, $element, $attr, sideMenuCtrl) { $scope.side = $attr.side; diff --git a/js/ext/angular/src/directive/ionicTabBar.js b/js/ext/angular/src/directive/ionicTabBar.js index 8f4e3573dc..5c5ecb6ef6 100644 --- a/js/ext/angular/src/directive/ionicTabBar.js +++ b/js/ext/angular/src/directive/ionicTabBar.js @@ -51,7 +51,7 @@ angular.module('ionic.ui.tabs', ['ngAnimate']) transclude: true, controller: 'TabsCtrl', //templateUrl: 'ext/angular/tmpl/ionicTabBar.tmpl.html', - template: '
', + template: '
', compile: function(element, attr, transclude, tabsCtrl) { return function($scope, $element, $attr) { var tabs = $element[0].querySelector('.tabs'); diff --git a/js/ext/angular/test/nav.html b/js/ext/angular/test/nav.html deleted file mode 100644 index a7422503f1..0000000000 --- a/js/ext/angular/test/nav.html +++ /dev/null @@ -1,98 +0,0 @@ - - - - Nav Bars - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/js/ext/angular/test/navPush.html b/js/ext/angular/test/navPush.html deleted file mode 100644 index 132ac7addb..0000000000 --- a/js/ext/angular/test/navPush.html +++ /dev/null @@ -1,87 +0,0 @@ - - - - Nav Bars - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/js/ext/angular/test/navRouter.html b/js/ext/angular/test/navRouter.html index bc54780200..2f277ac609 100644 --- a/js/ext/angular/test/navRouter.html +++ b/js/ext/angular/test/navRouter.html @@ -22,23 +22,29 @@ - - - - - - - - - - - - - -
- - -
- - - - - - - - diff --git a/js/ext/angular/test/subControllers.html b/js/ext/angular/test/subControllers.html index 7368173897..593d5d687f 100644 --- a/js/ext/angular/test/subControllers.html +++ b/js/ext/angular/test/subControllers.html @@ -16,7 +16,7 @@ - +
@@ -26,17 +26,17 @@

Slide me side to side!

- +

Left

- - + + - +

Tab Bars

@@ -50,7 +50,7 @@ - +

About

@@ -68,8 +68,8 @@ - - + + - - - - - - - - - - - - - - - - - diff --git a/js/ext/angular/test/zyng.html b/js/ext/angular/test/zyng.html deleted file mode 100644 index 567d736b6e..0000000000 --- a/js/ext/angular/test/zyng.html +++ /dev/null @@ -1,141 +0,0 @@ - - - - Content - - - - - - - - - - - - - - - -
-
-
-
-
- - - - - diff --git a/js/views/scrollZyng.js b/js/views/scrollZyng.js index 1e8e57be0b..d0b76649a0 100644 --- a/js/views/scrollZyng.js +++ b/js/views/scrollZyng.js @@ -590,7 +590,7 @@ var Scroller; Math.min(this.__container.clientWidth, this.__container.parentElement.clientWidth), Math.min(this.__container.clientHeight, this.__container.parentElement.clientHeight), this.__content.offsetWidth, - this.__content.offsetHeight+80); + this.__content.offsetHeight-20); }, /* --------------------------------------------------------------------------- diff --git a/scss/_scaffolding.scss b/scss/_scaffolding.scss index a665e49996..cec476afd8 100644 --- a/scss/_scaffolding.scss +++ b/scss/_scaffolding.scss @@ -61,9 +61,11 @@ body, .ionic-body { .scroll-content { width: 100%; top: 0; + right: 0; + bottom: 0; left: 0; - position: relative; + position: absolute; overflow: hidden; // Hide the top border if any @@ -192,6 +194,11 @@ body, .ionic-body { // A full screen section with a solid background .pane { position: fixed; +} +.view { + position: absolute; +} +.pane, .view { top: 0; right: 0; bottom: 0;