From a3af041be6fc7d63f7791ef996132bbd06e21292 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Wed, 13 Nov 2013 15:04:06 -0600 Subject: [PATCH 1/3] Color inherit --- dist/css/ionic.css | 2 +- scss/_items.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/css/ionic.css b/dist/css/ionic.css index d5c25cf239..bbeb4b78eb 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -3190,7 +3190,7 @@ a.subdued‎ { border-color: #dddddd; background-color: white; font-size: 16px; - color: #666666; + color: inherit; -webkit-transition: margin-left 0.2s ease-in-out, margin-right 0.2s ease-in-out, left 0.2s ease-in-out; } .item h2 { margin: 0 0 4px 0; diff --git a/scss/_items.scss b/scss/_items.scss index 2715b13388..f3744c4523 100644 --- a/scss/_items.scss +++ b/scss/_items.scss @@ -19,7 +19,7 @@ background-color: $list-bg; font-size: $list-font-size; - color: $light-color; + color: inherit; -webkit-transition: margin-left 0.2s ease-in-out, margin-right 0.2s ease-in-out, left 0.2s ease-in-out; From c49f0225471a94dafe4c971538ef98ded435c263 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Wed, 13 Nov 2013 15:05:45 -0600 Subject: [PATCH 2/3] Removed light color --- scss/_variables.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index faf984b9af..84b32eeb99 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -36,7 +36,6 @@ $headings-line-height: 1.1 !default; $base-background-color: #fff; $base-color: #000; -$light-color: #666666; $link-color: $positive !default; $link-hover-color: darken($link-color, 15%) !default; From 2946a4d8fdddfc6f4b87a128662337266fea85d7 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Wed, 13 Nov 2013 15:18:48 -0600 Subject: [PATCH 3/3] Moda tweak --- dist/js/ionic-angular.js | 2 +- js/ext/angular/src/service/ionicModal.js | 2 +- js/ext/angular/test/modal.html | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js index 066d602385..3c0023f9e3 100644 --- a/dist/js/ionic-angular.js +++ b/dist/js/ionic-angular.js @@ -170,7 +170,7 @@ angular.module('ionic.service.loading', ['ionic.ui.loading']) }; }]); ; -angular.module('ionic.service.modal', ['ionic.service.templateLoad']) +angular.module('ionic.service.modal', ['ionic.service.templateLoad', 'ngAnimate']) .factory('Modal', ['$rootScope', '$document', '$compile', '$animate', 'TemplateLoader', function($rootScope, $document, $compile, $animate, TemplateLoader) { diff --git a/js/ext/angular/src/service/ionicModal.js b/js/ext/angular/src/service/ionicModal.js index 2390fcdd46..2725aeec28 100644 --- a/js/ext/angular/src/service/ionicModal.js +++ b/js/ext/angular/src/service/ionicModal.js @@ -1,4 +1,4 @@ -angular.module('ionic.service.modal', ['ionic.service.templateLoad']) +angular.module('ionic.service.modal', ['ionic.service.templateLoad', 'ngAnimate']) .factory('Modal', ['$rootScope', '$document', '$compile', '$animate', 'TemplateLoader', function($rootScope, $document, $compile, $animate, TemplateLoader) { diff --git a/js/ext/angular/test/modal.html b/js/ext/angular/test/modal.html index fa4c249b4c..ac2c82a1d5 100644 --- a/js/ext/angular/test/modal.html +++ b/js/ext/angular/test/modal.html @@ -56,13 +56,13 @@