From 8fd688ca96005152be754eeba1be72c7c0aab9ad Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Tue, 11 Aug 2015 17:35:53 +0200
Subject: Merge tag '1.5.2' into trz/rebase

---
 src/main/res/values-v21/themes.xml | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

(limited to 'src/main/res/values-v21/themes.xml')

diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
index 75539533..d1679f92 100644
--- a/src/main/res/values-v21/themes.xml
+++ b/src/main/res/values-v21/themes.xml
@@ -2,33 +2,31 @@
 <resources>
 
     <style name="ConversationsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
-        <item name="android:colorPrimary">@color/primary</item>
-        <item name="android:colorPrimaryDark">@color/primarydark</item>
+        <item name="android:colorPrimary">@color/green500</item>
+        <item name="android:colorPrimaryDark">@color/green700</item>
         <item name="android:colorAccent">@color/accent</item>
 
         <item name="TextSizeInfo">12sp</item>
         <item name="TextSizeBody">14sp</item>
         <item name="TextSizeHeadline">20sp</item>
 
-        <item name="attr/icon_add_group">@drawable/ic_group_add_white_48dp</item>
-        <item name="attr/icon_add_person">@drawable/ic_person_add_white_48dp</item>
+        <item name="attr/icon_add_group">@drawable/ic_group_add_white_24dp</item>
+        <item name="attr/icon_add_person">@drawable/ic_person_add_white_24dp</item>
         <item name="attr/icon_cancel">@drawable/ic_cancel_white_24dp</item>
-        <item name="attr/icon_chat">@drawable/ic_chat_white_48dp</item>
-        <item name="attr/icon_copy">@drawable/ic_content_copy_grey600_36dp</item>
-        <item name="attr/icon_discard">@drawable/ic_delete_white_48dp</item>
+        <item name="attr/icon_copy">@drawable/ic_content_copy_grey600_24dp</item>
+        <item name="attr/icon_discard">@drawable/ic_delete_white_24dp</item>
         <item name="attr/icon_download">@drawable/ic_file_download_white_24dp</item>
-        <item name="attr/icon_edit">@drawable/ic_edit_white_48dp</item>
-        <item name="attr/icon_edit_dark">@drawable/ic_edit_grey600_36dp</item>
-        <item name="attr/icon_group">@drawable/ic_group_white_48dp</item>
-        <item name="attr/icon_new">@drawable/ic_add_white_48dp</item>
-        <item name="attr/icon_new_attachment">@drawable/ic_attach_file_white_48dp</item>
-        <item name="attr/icon_not_secure">@drawable/ic_lock_open_white_48dp</item>
-        <item name="attr/icon_refresh">@drawable/ic_refresh_white_48dp</item>
-        <item name="attr/icon_remove">@drawable/ic_remove_grey600_36dp</item>
-        <item name="attr/icon_search">@drawable/ic_search_white_48dp</item>
-        <item name="attr/icon_secure">@drawable/ic_lock_outline_white_48dp</item>
-        <item name="attr/icon_settings">@drawable/ic_settings_grey600_36dp</item>
-        <item name="attr/icon_import_export">@drawable/ic_import_export_white_48dp</item>
+        <item name="attr/icon_edit">@drawable/ic_edit_white_24dp</item>
+        <item name="attr/icon_edit_dark">@drawable/ic_edit_grey600_24dp</item>
+        <item name="attr/icon_group">@drawable/ic_group_white_24dp</item>
+        <item name="attr/icon_new">@drawable/ic_add_white_24dp</item>
+        <item name="attr/icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
+        <item name="attr/icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
+        <item name="attr/icon_remove">@drawable/ic_delete_grey600_24dp</item>
+        <item name="attr/icon_search">@drawable/ic_search_white_24dp</item>
+        <item name="attr/icon_secure">@drawable/ic_lock_open_white_24dp</item>
+        <item name="attr/icon_settings">@drawable/ic_settings_grey600_24dp</item>
+        <item name="attr/icon_import_export">@drawable/ic_import_export_white_24dp</item>
 
     </style>
 
-- 
cgit v1.2.3