Merge pull request #532 from twbs/active-states

Active states on table-views shouldn't have blue text
twbs · Apr 1, 2014 · 2f79274 · 2f79274
2 parents 06bf8f5 + 809a69b
commit 2f79274
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 5 deletions.
diff --git a/dist/css/ratchet-theme-android.css b/dist/css/ratchet-theme-android.css
@@ -317,6 +317,7 @@ a:active {
   background-image: none;
 }
 .table-view .table-view-cell > a:not(.btn):active {
+  color: inherit;
   background-color: #e0e0e0;
 }
 .table-view .table-view-cell > a:not(.btn):active .icon {

diff --git a/dist/css/ratchet-theme-android.min.css b/dist/css/ratchet-theme-android.min.css
diff --git a/dist/css/ratchet-theme-ios.css b/dist/css/ratchet-theme-ios.css
@@ -210,6 +210,9 @@ p {
 .table-view .table-view-cell:last-child {
   background-image: none;
 }
+.table-view .table-view-cell > a:not(.btn):active {
+  color: inherit;
+}
 .table-view .table-view-divider {
   background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='100%' height='1'><rect fill='#c8c7cc' x='0' y='0' width='100%' height='0.5'/></svg>"), url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='100%' height='1'><rect fill='#c8c7cc' x='0' y='0' width='100%' height='0.5'/></svg>");
   background-repeat: no-repeat;

diff --git a/dist/css/ratchet-theme-ios.min.css b/dist/css/ratchet-theme-ios.min.css
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
@@ -1154,6 +1154,9 @@ hr {
 .platform-ios .table-view .table-view-cell:last-child {
   background-image: none;
 }
+.platform-ios .table-view .table-view-cell > a:not(.btn):active {
+  color: inherit;
+}
 .platform-ios .table-view .table-view-divider {
   background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='100%' height='1'><rect fill='#c8c7cc' x='0' y='0' width='100%' height='0.5'/></svg>"), url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='100%' height='1'><rect fill='#c8c7cc' x='0' y='0' width='100%' height='0.5'/></svg>");
   background-repeat: no-repeat;
@@ -1677,6 +1680,7 @@ hr {
   background-image: none;
 }
 .platform-android .table-view .table-view-cell > a:not(.btn):active {
+  color: inherit;
   background-color: #e0e0e0;
 }
 .platform-android .table-view .table-view-cell > a:not(.btn):active .icon {

diff --git a/docs/assets/css/docs.min.css b/docs/assets/css/docs.min.css
diff --git a/docs/dist/css/ratchet-theme-android.css b/docs/dist/css/ratchet-theme-android.css
@@ -317,6 +317,7 @@ a:active {
   background-image: none;
 }
 .table-view .table-view-cell > a:not(.btn):active {
+  color: inherit;
   background-color: #e0e0e0;
 }
 .table-view .table-view-cell > a:not(.btn):active .icon {

diff --git a/docs/dist/css/ratchet-theme-android.min.css b/docs/dist/css/ratchet-theme-android.min.css
diff --git a/docs/dist/css/ratchet-theme-ios.css b/docs/dist/css/ratchet-theme-ios.css
@@ -210,6 +210,9 @@ p {
 .table-view .table-view-cell:last-child {
   background-image: none;
 }
+.table-view .table-view-cell > a:not(.btn):active {
+  color: inherit;
+}
 .table-view .table-view-divider {
   background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='100%' height='1'><rect fill='#c8c7cc' x='0' y='0' width='100%' height='0.5'/></svg>"), url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='100%' height='1'><rect fill='#c8c7cc' x='0' y='0' width='100%' height='0.5'/></svg>");
   background-repeat: no-repeat;

diff --git a/docs/dist/css/ratchet-theme-ios.min.css b/docs/dist/css/ratchet-theme-ios.min.css
diff --git a/sass/theme-android.scss b/sass/theme-android.scss
@@ -435,6 +435,7 @@ a {
       background-image: none;
     }
     > a:not(.btn):active {
+      color: inherit;
       background-color: #e0e0e0;
 
       .icon {

diff --git a/sass/theme-ios.scss b/sass/theme-ios.scss
@@ -309,6 +309,9 @@ p {
     &:last-child {
       background-image: none;
     }
+    > a:not(.btn):active {
+      color: inherit;
+    }
   }
 
   // Table view dividers