aboutsummaryrefslogtreecommitdiff
path: root/WordPress
diff options
context:
space:
mode:
authorNick Bradbury <nick.bradbury@gmail.com>2015-03-05 19:05:31 -0500
committerNick Bradbury <nick.bradbury@gmail.com>2015-03-05 19:05:31 -0500
commit42d591ffcca201a0eda90eaf35c7eb9605d2ce6e (patch)
treed07ee76eef1d78b1f1cebd7a2a7cf1e1edff7b97 /WordPress
parentf16712574134f123d5245fec89d7cd9fa6ac9e3e (diff)
downloadgradle-perf-android-medium-42d591ffcca201a0eda90eaf35c7eb9605d2ce6e.tar.gz
Changed `black` back to #000000 in `colors.xml` and changed all `textColor` references to use grey_dark instead of black
Diffstat (limited to 'WordPress')
-rw-r--r--WordPress/src/main/res/layout-sw600dp-port/theme_details_fragment.xml6
-rw-r--r--WordPress/src/main/res/layout-sw600dp/theme_details_fragment.xml6
-rw-r--r--WordPress/src/main/res/layout-sw720dp/theme_details_fragment.xml6
-rw-r--r--WordPress/src/main/res/layout/fragment_edit_post_settings.xml2
-rw-r--r--WordPress/src/main/res/layout/theme_details_fragment.xml6
-rw-r--r--WordPress/src/main/res/values/colors.xml5
6 files changed, 16 insertions, 15 deletions
diff --git a/WordPress/src/main/res/layout-sw600dp-port/theme_details_fragment.xml b/WordPress/src/main/res/layout-sw600dp-port/theme_details_fragment.xml
index dc60f2b3b..4e5faf2b4 100644
--- a/WordPress/src/main/res/layout-sw600dp-port/theme_details_fragment.xml
+++ b/WordPress/src/main/res/layout-sw600dp-port/theme_details_fragment.xml
@@ -154,7 +154,7 @@
android:layout_marginLeft="15dp"
android:layout_marginTop="18dp"
android:text="@string/themes_details_label"
- android:textColor="@color/black"
+ android:textColor="@color/grey_dark"
android:textSize="16sp" />
<TextView
@@ -165,7 +165,7 @@
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:fontFamily="sans-serif-light"
- android:textColor="@color/black"
+ android:textColor="@color/grey_dark"
android:textSize="16sp"
android:textStyle="normal" />
@@ -178,7 +178,7 @@
android:layout_marginLeft="16dp"
android:layout_marginTop="18dp"
android:text="@string/themes_features_label"
- android:textColor="@color/black"
+ android:textColor="@color/grey_dark"
android:textSize="16sp" />
<LinearLayout
diff --git a/WordPress/src/main/res/layout-sw600dp/theme_details_fragment.xml b/WordPress/src/main/res/layout-sw600dp/theme_details_fragment.xml
index ea12251cc..199182b4e 100644
--- a/WordPress/src/main/res/layout-sw600dp/theme_details_fragment.xml
+++ b/WordPress/src/main/res/layout-sw600dp/theme_details_fragment.xml
@@ -150,7 +150,7 @@
android:layout_marginLeft="15dp"
android:layout_marginTop="18dp"
android:text="@string/themes_details_label"
- android:textColor="@color/black"
+ android:textColor="@color/grey_dark"
android:textSize="16sp" />
<TextView
@@ -161,7 +161,7 @@
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:fontFamily="sans-serif-light"
- android:textColor="@color/black"
+ android:textColor="@color/grey_dark"
android:textSize="16sp"
android:textStyle="normal" />
@@ -174,7 +174,7 @@
android:layout_marginLeft="16dp"
android:layout_marginTop="18dp"
android:text="@string/themes_features_label"
- android:textColor="@color/black"
+ android:textColor="@color/grey_dark"
android:textSize="16sp" />
<LinearLayout
diff --git a/WordPress/src/main/res/layout-sw720dp/theme_details_fragment.xml b/WordPress/src/main/res/layout-sw720dp/theme_details_fragment.xml
index 896dbaf8b..0d5867e35 100644
--- a/WordPress/src/main/res/layout-sw720dp/theme_details_fragment.xml
+++ b/WordPress/src/main/res/layout-sw720dp/theme_details_fragment.xml
@@ -151,7 +151,7 @@
android:layout_marginLeft="15dp"
android:layout_marginTop="18dp"
android:text="@string/themes_details_label"
- android:textColor="@color/black"
+ android:textColor="@color/grey_dark"
android:textSize="16sp" />
<TextView
@@ -162,7 +162,7 @@
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:fontFamily="sans-serif-light"
- android:textColor="@color/black"
+ android:textColor="@color/grey_dark"
android:textSize="16sp"
android:textStyle="normal" />
@@ -175,7 +175,7 @@
android:layout_marginLeft="16dp"
android:layout_marginTop="18dp"
android:text="@string/themes_features_label"
- android:textColor="@color/black"
+ android:textColor="@color/grey_dark"
android:textSize="16sp" />
<LinearLayout
diff --git a/WordPress/src/main/res/layout/fragment_edit_post_settings.xml b/WordPress/src/main/res/layout/fragment_edit_post_settings.xml
index 88c39388e..cb7d13e11 100644
--- a/WordPress/src/main/res/layout/fragment_edit_post_settings.xml
+++ b/WordPress/src/main/res/layout/fragment_edit_post_settings.xml
@@ -40,7 +40,7 @@
android:layout_marginRight="@dimen/margin_large"
android:background="@drawable/selectable_background_wordpress"
android:text="@string/immediately"
- android:textColor="@color/black"
+ android:textColor="@color/grey_dark"
android:textSize="@dimen/text_sz_large" />
<TextView
diff --git a/WordPress/src/main/res/layout/theme_details_fragment.xml b/WordPress/src/main/res/layout/theme_details_fragment.xml
index 9d3fb23c6..67fcd018f 100644
--- a/WordPress/src/main/res/layout/theme_details_fragment.xml
+++ b/WordPress/src/main/res/layout/theme_details_fragment.xml
@@ -159,7 +159,7 @@
android:layout_marginLeft="16dp"
android:layout_marginTop="18dp"
android:text="@string/themes_details_label"
- android:textColor="@color/black"
+ android:textColor="@color/grey_dark"
android:textSize="16sp" />
<TextView
@@ -170,7 +170,7 @@
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:fontFamily="sans-serif-light"
- android:textColor="@color/black"
+ android:textColor="@color/grey_dark"
android:textSize="16sp"
android:textStyle="normal" />
@@ -183,7 +183,7 @@
android:layout_marginLeft="16dp"
android:layout_marginTop="18dp"
android:text="@string/themes_features_label"
- android:textColor="@color/black"
+ android:textColor="@color/grey_dark"
android:textSize="16sp" />
<LinearLayout
diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml
index dba20230c..fd2618e0b 100644
--- a/WordPress/src/main/res/values/colors.xml
+++ b/WordPress/src/main/res/values/colors.xml
@@ -23,7 +23,8 @@
<color name="light_gray">@color/grey_lighten_30</color>
<color name="gray">@color/grey_lighten_20</color>
<color name="white">#FFFFFF</color>
- <color name="black">@color/grey_dark</color>
+ <!-- note that black should NOT be used for text - use grey_dark instead -->
+ <color name="black">#000000</color>
<color name="default_background">@color/grey_lighten_30</color>
<!-- ==================================== -->
@@ -87,7 +88,7 @@
<color name="media_gallery_option_default">@color/grey_lighten_30</color>
<!-- Theme Details -->
- <color name="theme_details_name">@color/black</color>
+ <color name="theme_details_name">@color/grey_dark</color>
<color name="theme_details_button">@color/white</color>
<color name="theme_details_premium">@color/orange_jazzy</color>
<color name="theme_feature_text">@color/grey_dark</color>