From cbed88d5e7430c5fd6aa4ddec49de675323305a7 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 10 Sep 2013 11:06:06 -0500
Subject: [PATCH 1/4] Fixed button and header colors

---
 dist/ionic.css                | 72 +++++++++++++++++------------------
 scss/ionic/theme/_bar.scss    | 36 +++++++++---------
 scss/ionic/theme/_button.scss | 12 +++---
 3 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/dist/ionic.css b/dist/ionic.css
index 1e24dc14ef..39f3cb2586 100644
--- a/dist/ionic.css
+++ b/dist/ionic.css
@@ -1639,39 +1639,39 @@ main {
   .bar.bar-primary {
     background-color: #6999e9;
     border-color: #5981c5;
-    color: #999999; }
+    color: white; }
     .bar.bar-primary .tab-item a {
-      color: #999999; }
+      color: white; }
   .bar.bar-info {
     background-color: #60d2e6;
     border-color: #51b3c4;
-    color: #999999; }
+    color: white; }
     .bar.bar-info .tab-item a {
-      color: #999999; }
+      color: white; }
   .bar.bar-success {
     background-color: #89c163;
     border-color: #71a052;
-    color: #999999; }
+    color: white; }
     .bar.bar-success .tab-item a {
-      color: #999999; }
+      color: white; }
   .bar.bar-warning {
     background-color: #f0b840;
     border-color: #cf9a29;
-    color: #999999; }
+    color: white; }
     .bar.bar-warning .tab-item a {
-      color: #999999; }
+      color: white; }
   .bar.bar-danger {
     background-color: #de5645;
     border-color: #bc4435;
-    color: #999999; }
+    color: white; }
     .bar.bar-danger .tab-item a {
-      color: #999999; }
+      color: white; }
   .bar.bar-dark {
     background-color: #444444;
     border-color: #111111;
-    color: #999999; }
+    color: white; }
     .bar.bar-dark .tab-item a {
-      color: #999999; }
+      color: white; }
 
 .bar-default .button {
   color: #333333;
@@ -1698,11 +1698,11 @@ main {
     border-color: #b3b3b3; }
 
 .bar-primary .button {
-  color: #999999;
+  color: white;
   background-color: #6999e9;
   border-color: #5981c5; }
   .bar-primary .button:hover {
-    color: #999999;
+    color: white;
     text-decoration: none; }
   .bar-primary .button.active, .bar-primary .button:active {
     background-color: #4581e4;
@@ -1710,11 +1710,11 @@ main {
     border-color: #3d67ae; }
 
 .bar-info .button {
-  color: #999999;
+  color: white;
   background-color: #60d2e6;
   border-color: #51b3c4; }
   .bar-info .button:hover {
-    color: #999999;
+    color: white;
     text-decoration: none; }
   .bar-info .button.active, .bar-info .button:active {
     background-color: #3dc8e0;
@@ -1722,11 +1722,11 @@ main {
     border-color: #3998a9; }
 
 .bar-success .button {
-  color: #999999;
+  color: white;
   background-color: #89c163;
   border-color: #71a052; }
   .bar-success .button:hover {
-    color: #999999;
+    color: white;
     text-decoration: none; }
   .bar-success .button.active, .bar-success .button:active {
     background-color: #73b447;
@@ -1734,11 +1734,11 @@ main {
     border-color: #597e41; }
 
 .bar-warning .button {
-  color: #999999;
+  color: white;
   background-color: #f0b840;
   border-color: #cf9a29; }
   .bar-warning .button:hover {
-    color: #999999;
+    color: white;
     text-decoration: none; }
   .bar-warning .button.active, .bar-warning .button:active {
     background-color: #edaa1a;
@@ -1746,11 +1746,11 @@ main {
     border-color: #a47a21; }
 
 .bar-danger .button {
-  color: #999999;
+  color: white;
   background-color: #de5645;
   border-color: #bc4435; }
   .bar-danger .button:hover {
-    color: #999999;
+    color: white;
     text-decoration: none; }
   .bar-danger .button.active, .bar-danger .button:active {
     background-color: #d43926;
@@ -1758,11 +1758,11 @@ main {
     border-color: #94362a; }
 
 .bar-dark .button {
-  color: #999999;
+  color: white;
   background-color: #444444;
   border-color: #111111; }
   .bar-dark .button:hover {
-    color: #999999;
+    color: white;
     text-decoration: none; }
   .bar-dark .button.active, .bar-dark .button:active {
     background-color: #303030;
@@ -1803,66 +1803,66 @@ main {
       box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.12);
       border-color: #b3b3b3; }
   .button.button-primary {
-    color: #999999;
+    color: white;
     background-color: #6999e9;
     border-color: #5981c5; }
     .button.button-primary:hover {
-      color: #999999;
+      color: white;
       text-decoration: none; }
     .button.button-primary.active, .button.button-primary:active {
       background-color: #4581e4;
       box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.12);
       border-color: #3d67ae; }
   .button.button-info {
-    color: #999999;
+    color: white;
     background-color: #60d2e6;
     border-color: #51b3c4; }
     .button.button-info:hover {
-      color: #999999;
+      color: white;
       text-decoration: none; }
     .button.button-info.active, .button.button-info:active {
       background-color: #3dc8e0;
       box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.12);
       border-color: #3998a9; }
   .button.button-success {
-    color: #999999;
+    color: white;
     background-color: #89c163;
     border-color: #71a052; }
     .button.button-success:hover {
-      color: #999999;
+      color: white;
       text-decoration: none; }
     .button.button-success.active, .button.button-success:active {
       background-color: #73b447;
       box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.12);
       border-color: #597e41; }
   .button.button-warning {
-    color: #999999;
+    color: white;
     background-color: #f0b840;
     border-color: #cf9a29; }
     .button.button-warning:hover {
-      color: #999999;
+      color: white;
       text-decoration: none; }
     .button.button-warning.active, .button.button-warning:active {
       background-color: #edaa1a;
       box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.12);
       border-color: #a47a21; }
   .button.button-danger {
-    color: #999999;
+    color: white;
     background-color: #de5645;
     border-color: #bc4435; }
     .button.button-danger:hover {
-      color: #999999;
+      color: white;
       text-decoration: none; }
     .button.button-danger.active, .button.button-danger:active {
       background-color: #d43926;
       box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.12);
       border-color: #94362a; }
   .button.button-dark {
-    color: #999999;
+    color: white;
     background-color: #444444;
     border-color: #111111; }
     .button.button-dark:hover {
-      color: #999999;
+      color: white;
       text-decoration: none; }
     .button.button-dark.active, .button.button-dark:active {
       background-color: #303030;
diff --git a/scss/ionic/theme/_bar.scss b/scss/ionic/theme/_bar.scss
index 9efe3e0d8e..1770d76b5c 100644
--- a/scss/ionic/theme/_bar.scss
+++ b/scss/ionic/theme/_bar.scss
@@ -30,51 +30,51 @@
   &.bar-primary {
     background-color: $bar-primary-bg;
     border-color: $bar-primary-border-color;
-    color: $gray-light;
+    color: $white;
     .tab-item a {
-      color: $gray-light;
+      color: $white;
     }
   }
   &.bar-info {
     background-color: $bar-info-bg;
     border-color: $bar-info-border-color;
-    color: $gray-light;
+    color: $white;
     .tab-item a {
-      color: $gray-light;
+      color: $white;
     }
   }
   &.bar-success {
     background-color: $bar-success-bg;
     border-color: $bar-success-border-color;
-    color: $gray-light;
+    color: $white;
     .tab-item a {
-      color: $gray-light;
+      color: $white;
     }
   }
   &.bar-warning {
     background-color: $bar-warning-bg;
     border-color: $bar-warning-border-color;
-    color: $gray-light;
+    color: $white;
     .tab-item a {
-      color: $gray-light;
+      color: $white;
     }
   }
   &.bar-danger {
     background-color: $bar-danger-bg;
     border-color: $bar-danger-border-color;
-    color: $gray-light;
+    color: $white;
 
     .tab-item a {
-      color: $gray-light;
+      color: $white;
     }
   }
   &.bar-dark {
     background-color: $bar-dark-bg;
     border-color: $bar-dark-border-color;
-    color: $gray-light;
+    color: $white;
 
     .tab-item a {
-      color: $gray-light;
+      color: $white;
     }
   }
 
@@ -101,33 +101,33 @@
 
 .bar-primary {
   .button {
-    @include button-style($button-primary-bg, $button-primary-border, $gray-light);
+    @include button-style($button-primary-bg, $button-primary-border, $white);
   }
 }
 .bar-info {
   .button {
-    @include button-style($button-info-bg, $button-info-border, $gray-light);
+    @include button-style($button-info-bg, $button-info-border, $white);
   }
 }
 .bar-success {
   .button {
-    @include button-style($button-success-bg, $button-success-border, $gray-light);
+    @include button-style($button-success-bg, $button-success-border, $white);
   }
 }
 .bar-warning {
   .button {
-    @include button-style($button-warning-bg, $button-warning-border, $gray-light);
+    @include button-style($button-warning-bg, $button-warning-border, $white);
   }
 }
 .bar-danger {
   .button {
-    @include button-style($button-danger-bg, $buttonDangerBorder, $gray-light);
+    @include button-style($button-danger-bg, $buttonDangerBorder, $white);
   }
 }
 .bar-dark {
   // A default style for buttons
   .button {
-    @include button-style($button-dark-bg, $button-dark-border, $gray-light);
+    @include button-style($button-dark-bg, $button-dark-border, $white);
   }
 }
 
diff --git a/scss/ionic/theme/_button.scss b/scss/ionic/theme/_button.scss
index f7f74b8764..47f3fb2129 100644
--- a/scss/ionic/theme/_button.scss
+++ b/scss/ionic/theme/_button.scss
@@ -13,22 +13,22 @@
     @include button-style($button-secondary-bg, $button-secondary-border, $gray-dark);
   }
   &.button-primary {
-    @include button-style($button-primary-bg, $button-primary-border, $gray-light);
+    @include button-style($button-primary-bg, $button-primary-border, $white);
   }
   &.button-info {
-    @include button-style($button-info-bg, $button-info-border, $gray-light);
+    @include button-style($button-info-bg, $button-info-border, $white);
   }
   &.button-success {
-    @include button-style($button-success-bg, $button-success-border, $gray-light);
+    @include button-style($button-success-bg, $button-success-border, $white);
   }
   &.button-warning {
-    @include button-style($button-warning-bg, $button-warning-border, $gray-light);
+    @include button-style($button-warning-bg, $button-warning-border, $white);
   }
   &.button-danger {
-    @include button-style($button-danger-bg, $buttonDangerBorder, $gray-light);
+    @include button-style($button-danger-bg, $buttonDangerBorder, $white);
   }
   &.button-dark {
-    @include button-style($button-dark-bg, $button-dark-border, $gray-light);
+    @include button-style($button-dark-bg, $button-dark-border, $white);
   }
 
   &.button-clear {

From 8faf9064f966f4f2c243a741ab62921c614ea261 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 10 Sep 2013 11:08:22 -0500
Subject: [PATCH 2/4] Fixed #15 - title z-index blocking buttons

---
 dist/ionic.css                 | 3 ++-
 scss/ionic/structure/_bar.scss | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dist/ionic.css b/dist/ionic.css
index 39f3cb2586..93a44d0f67 100644
--- a/dist/ionic.css
+++ b/dist/ionic.css
@@ -470,7 +470,8 @@ a {
     background-color: transparent;
     line-height: 23px;
     font-size: 12px;
-    padding: 4px 12px; }
+    padding: 4px 12px;
+    z-index: 1; }
   .bar .button-bar {
     line-height: 18px; }
   .bar .button-bar + .button, .bar .button + .button-bar {
diff --git a/scss/ionic/structure/_bar.scss b/scss/ionic/structure/_bar.scss
index ddf8bd1a85..4fc3a63f90 100644
--- a/scss/ionic/structure/_bar.scss
+++ b/scss/ionic/structure/_bar.scss
@@ -53,6 +53,9 @@
     line-height: $bar-button-line-height;
     font-size: 12px;
     padding: 4px 12px;
+
+    // Rise the button above the title
+    z-index: 1;
   }
 
   .button-bar {

From ef4a50e0b84ebbd92d9d572e21a90299848a4aac Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 10 Sep 2013 11:38:20 -0500
Subject: [PATCH 3/4] Glow for button icon

---
 dist/ionic.css                |  7 +++++++
 scss/ionic/theme/_button.scss | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/dist/ionic.css b/dist/ionic.css
index 93a44d0f67..d50ae31ee8 100644
--- a/dist/ionic.css
+++ b/dist/ionic.css
@@ -1873,6 +1873,13 @@ main {
     background: none;
     border: none;
     padding: 10px 0px; }
+  .button.button-icon {
+    background: none;
+    border: none; }
+    .button.button-icon:active, .button.button-icon.active {
+      text-shadow: 0px 0px 10px white;
+      box-shadow: none;
+      background: none; }
 
 a.button {
   text-decoration: none; }
diff --git a/scss/ionic/theme/_button.scss b/scss/ionic/theme/_button.scss
index 47f3fb2129..87ffb8eae4 100644
--- a/scss/ionic/theme/_button.scss
+++ b/scss/ionic/theme/_button.scss
@@ -36,6 +36,16 @@
     border: none;
     padding: $button-clear-padding;
   }
+
+  &.button-icon {
+    background: none;
+    border: none;
+    &:active, &.active {
+      text-shadow: 0px 0px 10px #fff;
+      box-shadow: none;
+      background: none;
+    }
+  }
 }
 
 a.button {

From d2b0f7f12adb722abcd167937cce0f10bdab95c7 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 10 Sep 2013 11:38:32 -0500
Subject: [PATCH 4/4] Start of test code for JS plugins

---
 ionic.conf.js     |  3 ++-
 test/views/bar.js | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 test/views/bar.js

diff --git a/ionic.conf.js b/ionic.conf.js
index 7f56257825..8062afc518 100644
--- a/ionic.conf.js
+++ b/ionic.conf.js
@@ -21,7 +21,8 @@ module.exports = function(config) {
       'vendor/angular/1.2.0rc1/*',
       'ext/angular/src/**/*.js',
       'ext/angular/test/**/*.js',
-      'hacking/**/*.js'
+      'hacking/**/*.js',
+      'test/**/*.js'
     ],
 
 
diff --git a/test/views/bar.js b/test/views/bar.js
new file mode 100644
index 0000000000..f5bc239784
--- /dev/null
+++ b/test/views/bar.js
@@ -0,0 +1,10 @@
+describe('Bar view', function() {
+
+  beforeEach(function() {
+
+  });
+  
+  it('Should initialize', function() {
+
+  });
+});
\ No newline at end of file