diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2013-09-20 10:26:13 +0400 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2013-09-20 10:26:13 +0400 |
| commit | 9bf65bed3c10ab060d985c4619ea3f4b77347c97 (patch) | |
| tree | fb3038bd6a767052808a39cc0014c691b223cf4d /res/values | |
| parent | a77210f6b0f1f39f428048a482c4fffcad6d1316 (diff) | |
| parent | 4f1d361b2730cae094ecc6affa9634219c352599 (diff) | |
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS-for-Honeycomb
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/resources.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 1 | ||||
| -rw-r--r-- | res/values/style.xml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/res/values/resources.xml b/res/values/resources.xml index f32ec5b7..7e1b097e 100644 --- a/res/values/resources.xml +++ b/res/values/resources.xml @@ -10,5 +10,5 @@ <color name="unread_counter_background_dark">#303030</color>
<color name="unread_counter_background_sepia">#C46262</color>
<color name="unread_counter_background_selected_light">#4684ff</color>
- <color name="feeds_dark_gray">#1c1d1e</color>
+ <color name="feeds_dark_gray">#1c1d1e</color>
</resources>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index a05188d8..e4ef4831 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -200,4 +200,5 @@ <string name="author_formatted">by %1$s</string> <string name="n_unread_articles">%1$d unread articles</string> <string name="pref_headline_font_size">Headline text size</string> + <string name="context_confirm_catchup">Mark all articles in %1$s as read?</string> </resources> diff --git a/res/values/style.xml b/res/values/style.xml index fec0dcac..4a8e93ba 100644 --- a/res/values/style.xml +++ b/res/values/style.xml @@ -53,7 +53,7 @@ <item name="articleBackground">@android:color/black</item> <item name="headlineSelectedBackground">@color/ics_cyan</item> <item name="headlineUnreadBackground">#202020</item> - <item name="headlineNormalBackground">#101010</item> + <item name="headlineNormalBackground">#151515</item> <item name="feedsSelectedBackground">@color/ics_cyan</item> <item name="feedlistTextColor">@android:color/primary_text_dark</item> <item name="feedlistSelectedTextColor">@android:color/black</item> |