diff options
| author | Andrew Dolgov <[email protected]> | 2014-10-15 15:49:45 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2014-10-15 15:49:45 +0400 |
| commit | 293454dc14153ef5f3a9b30fbffc8c0cd95b9410 (patch) | |
| tree | 15aa19db78534a03b2299b3002949d61d537df22 /res/values/styles.xml | |
| parent | a2e8246a4e087e6394eb20860aa10dec77b071ab (diff) | |
| parent | 179296966f8d7db0a31e32254ff0effd0a51bbea (diff) | |
Merge branch 'master' of github.com:gothfox/Tiny-Comics-Reader
Conflicts:
res/values/styles.xml
Diffstat (limited to 'res/values/styles.xml')
| -rw-r--r-- | res/values/styles.xml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index e1f02d6..836c246 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -1,6 +1,9 @@ <resources>
-
- <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar" />
- <style name="DarkTheme" parent="Theme.AppCompat" />
-
-</resources>
\ No newline at end of file + <style name="AppTheme" parent="Theme.Sherlock.Light.DarkActionBar">
+ <item name="viewComicsBackground">@android:color/transparent</item>
+ </style>
+
+ <style name="DarkTheme" parent="Theme.Sherlock">
+ <item name="viewComicsBackground">@android:color/black</item>
+ </style>
+</resources> |