Merge branch 'develop' into feature/modularize-editor

wordpress-mobile · Mar 5, 2015 · 1b3b384 · 1b3b384
1 parent f6ef4ce
commit 1b3b384
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_bold_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_bold_selected_state.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_new_kid"/>
+            <solid android:color="@color/blue_medium"/>
         </shape>
     </item>
     <item>

diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_italic_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_italic_selected_state.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_new_kid"/>
+            <solid android:color="@color/blue_medium"/>
         </shape>
     </item>
     <item>

diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_link_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_link_selected_state.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_new_kid"/>
+            <solid android:color="@color/blue_medium"/>
         </shape>
     </item>
     <item>

diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_media_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_media_selected_state.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_new_kid"/>
+            <solid android:color="@color/blue_medium"/>
         </shape>
     </item>
     <item>

diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_more_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_more_selected_state.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_new_kid"/>
+            <solid android:color="@color/blue_medium"/>
         </shape>
     </item>
     <item>

diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_quote_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_quote_selected_state.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_new_kid"/>
+            <solid android:color="@color/blue_medium"/>
         </shape>
     </item>
     <item>

diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_strike_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_strike_selected_state.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_new_kid"/>
+            <solid android:color="@color/blue_medium"/>
         </shape>
     </item>
     <item>

diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_underline_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_underline_selected_state.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_new_kid"/>
+            <solid android:color="@color/blue_medium"/>
         </shape>
     </item>
     <item>