From 5d165a83104a44bb4ae43859b6e97a651c958bcf Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Wed, 9 Oct 2013 22:32:23 -0500 Subject: [PATCH] Ionicons in toderp --- dist/ionic-ios7.css | 3 ++- dist/ionic.css | 3 ++- example/toderp2/index.html | 4 ++-- js/ext/angular/test/list.html | 19 ++++++++++++------- scss/ionic/_bar.scss | 1 + 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dist/ionic-ios7.css b/dist/ionic-ios7.css index 21b24b2641..3bf8dc2d30 100644 --- a/dist/ionic-ios7.css +++ b/dist/ionic-ios7.css @@ -746,7 +746,8 @@ address { .bar .button-icon { background-color: transparent; - border: 1px solid transparent; } + border: 1px solid transparent; + font-size: 24px; } .bar-header { top: 0; } diff --git a/dist/ionic.css b/dist/ionic.css index c9148934dc..e7cd72a2b5 100644 --- a/dist/ionic.css +++ b/dist/ionic.css @@ -1833,7 +1833,8 @@ address { .bar .button-icon { background-color: transparent; - border: 1px solid transparent; } + border: 1px solid transparent; + font-size: 24px; } .bar-header { top: 0; } diff --git a/example/toderp2/index.html b/example/toderp2/index.html index a10a531786..708f05041d 100644 --- a/example/toderp2/index.html +++ b/example/toderp2/index.html @@ -111,7 +111,7 @@
- +

{{activeProject.title}}

@@ -131,7 +131,7 @@
- +
diff --git a/js/ext/angular/test/list.html b/js/ext/angular/test/list.html index 0f24d2da2b..6586e6d36d 100644 --- a/js/ext/angular/test/list.html +++ b/js/ext/angular/test/list.html @@ -92,6 +92,11 @@ angular.module('navTest', ['ionic.ui.list', 'ngAnimate']) .controller('TestCtrl', function($scope) { + var removeItem = function(item) { + // Remove ourselves + $scope.items.splice($scope.items.indexOf(item), 1); + }; + $scope.items = [ { text: 'Item 1', @@ -102,10 +107,7 @@ buttons: [{ text: 'Kill', type: 'button-danger', - buttonClicked: function(item) { - // Remove ourselves - $scope.items.splice($scope.items.indexOf(item), 1); - } + buttonClicked: removeItem, }] }, { @@ -115,7 +117,8 @@ icon: 'icon-chevron-right', buttons: [{ text: 'Kill', - type: 'button-danger' + type: 'button-danger', + buttonClicked: removeItem, }] }, { @@ -125,7 +128,8 @@ icon: 'icon-chevron-right', buttons: [{ text: 'Kill', - type: 'button-danger' + type: 'button-danger', + buttonClicked: removeItem, }] }, { @@ -135,7 +139,8 @@ icon: 'icon-chevron-right', buttons: [{ text: 'Kill', - type: 'button-danger' + type: 'button-danger', + buttonClicked: removeItem, }] } ]; diff --git a/scss/ionic/_bar.scss b/scss/ionic/_bar.scss index 28a436cd0d..799c7f861e 100644 --- a/scss/ionic/_bar.scss +++ b/scss/ionic/_bar.scss @@ -177,6 +177,7 @@ .bar .button-icon { background-color: transparent; border: 1px solid transparent; + font-size: 24px; } // Header at top