[go: nahoru, domu]

Skip to content

Commit

Permalink
Relabeled legacy editor color assets
Browse files Browse the repository at this point in the history
  • Loading branch information
aforcier committed Apr 16, 2015
1 parent 14c3938 commit 315bb50
Show file tree
Hide file tree
Showing 12 changed files with 17 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/format_bar_button_selected"/>
<solid android:color="@color/legacy_format_bar_button_selected"/>
</shape>
</item>
<item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/format_bar_button_selected"/>
<solid android:color="@color/legacy_format_bar_button_selected"/>
</shape>
</item>
<item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/format_bar_button_selected"/>
<solid android:color="@color/legacy_format_bar_button_selected"/>
</shape>
</item>
<item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/format_bar_button_selected"/>
<solid android:color="@color/legacy_format_bar_button_selected"/>
</shape>
</item>
<item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/format_bar_button_selected"/>
<solid android:color="@color/legacy_format_bar_button_selected"/>
</shape>
</item>
<item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/format_bar_button_selected"/>
<solid android:color="@color/legacy_format_bar_button_selected"/>
</shape>
</item>
<item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/format_bar_button_selected"/>
<solid android:color="@color/legacy_format_bar_button_selected"/>
</shape>
</item>
<item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/format_bar_button_selected"/>
<solid android:color="@color/legacy_format_bar_button_selected"/>
</shape>
</item>
<item>
Expand Down
2 changes: 1 addition & 1 deletion WordPressEditor/src/main/res/drawable/list_divider.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
android:insetRight="@dimen/margin_extra_large">
<shape android:shape="rectangle">

<solid android:color="@color/format_bar_background" />
<solid android:color="@color/legacy_format_bar_background" />

</shape>
</inset>
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
-->

<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@color/pressed_wordpress" />
<solid android:color="@color/legacy_pressed_wordpress" />
</shape>
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
android:textSize="18sp"
android:inputType="textMultiLine|textCapSentences|textAutoCorrect"
android:imeOptions="flagNoExtractUi"
android:textColorLink="@color/placeholder_content_text" />
android:textColorLink="@color/legacy_placeholder_content_text" />
</LinearLayout>
</ScrollView>

Expand Down Expand Up @@ -81,7 +81,7 @@
android:layout_width="fill_parent"
android:layout_height="@dimen/format_bar_height"
android:layout_gravity="bottom"
android:background="@color/format_bar_background"
android:background="@color/legacy_format_bar_background"
android:orientation="horizontal"
android:visibility="gone">

Expand Down
9 changes: 5 additions & 4 deletions WordPressEditor/src/main/res/values/colors.xml
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="format_bar_button_selected">#00aadc</color>
<color name="placeholder_content_text">#21759B</color>
<color name="format_bar_background">#eeeeee</color>
<color name="legacy_format_bar_button_selected">#00aadc</color>
<color name="legacy_placeholder_content_text">#21759B</color>
<color name="legacy_format_bar_background">#eeeeee</color>
<color name="legacy_pressed_wordpress">#CC78C8E6</color>

<color name="image_options_label">#cccccc</color>
<color name="pressed_wordpress">#CC78C8E6</color>

<color name="format_bar_button_normal_color">@color/wp_gray</color>
<color name="format_bar_button_highlighted_color">@color/wp_blue</color>
Expand Down

0 comments on commit 315bb50

Please sign in to comment.