From 2c71e760f771f69914d2629738cbe31ecfd5d8f4 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Sat, 7 Dec 2013 20:05:18 -0600 Subject: [PATCH] Fixed #291 - custom refresher content --- dist/css/ionic.css | 11 +++++++---- dist/js/ionic-angular.js | 4 ++-- js/ext/angular/src/directive/ionicContent.js | 4 ++-- js/ext/angular/test/content.html | 4 +++- scss/_scaffolding.scss | 8 ++++++-- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dist/css/ionic.css b/dist/css/ionic.css index 9bacd31b1d..44f22024c4 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -2,7 +2,7 @@ * Copyright 2013 Drifty Co. * http://drifty.com/ * - * Ionic, v0.9.14 + * Ionic, v{{ VERSION }} * A powerful HTML5 mobile app framework. * http://ionicframework.com/ * @@ -2613,10 +2613,13 @@ body, .ionic-body { animation-duration: 1.5s; } .scroll-refresher-content { - position: relative; + position: absolute; + left: 0; + bottom: 15px; width: 100%; - height: 100%; - text-align: center; } + text-align: center; + font-size: 30px; + color: #666666; } .ionic-refresher-content { position: absolute; diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js index aeb751ac41..e078ce8bf7 100644 --- a/dist/js/ionic-angular.js +++ b/dist/js/ionic-angular.js @@ -775,12 +775,12 @@ angular.module('ionic.ui.content', []) }; }) -.directive('scroll-refresher', function() { +.directive('scrollRefresher', function() { return { restrict: 'E', replace: true, transclude: true, - template: '
' + template: '
' }; }); diff --git a/js/ext/angular/src/directive/ionicContent.js b/js/ext/angular/src/directive/ionicContent.js index 2d51189d43..537eb8abcc 100644 --- a/js/ext/angular/src/directive/ionicContent.js +++ b/js/ext/angular/src/directive/ionicContent.js @@ -151,12 +151,12 @@ angular.module('ionic.ui.content', []) }; }) -.directive('scroll-refresher', function() { +.directive('scrollRefresher', function() { return { restrict: 'E', replace: true, transclude: true, - template: '
' + template: '
' }; }); diff --git a/js/ext/angular/test/content.html b/js/ext/angular/test/content.html index 923f62537e..dceedb0b38 100644 --- a/js/ext/angular/test/content.html +++ b/js/ext/angular/test/content.html @@ -66,7 +66,9 @@ has-tabs="true" has-header="true" > - + + + diff --git a/scss/_scaffolding.scss b/scss/_scaffolding.scss index d49fe1570f..15d28b4fba 100644 --- a/scss/_scaffolding.scss +++ b/scss/_scaffolding.scss @@ -117,10 +117,14 @@ body, .ionic-body { } .scroll-refresher-content { - position: relative; + position: absolute; + left: 0; + bottom: 15px; width: 100%; - height: 100%; text-align: center; + + font-size: 30px; + color: $scroll-refresh-icon-color; } .ionic-refresher-content {