Merge branch '477-private-messaging-text-bubble-and-header-overlap' into 'master'

Bring back the toolbar shadow

![device-2016-11-21-180111](/uploads/7cd5e6a1e7a4b79b6d7cf81377b148a0/device-2016-11-21-180111.png)

Closes #477

See merge request !431
This commit is contained in:
Ernir Erlingsson
2016-11-27 21:55:24 +00:00
7 changed files with 60 additions and 57 deletions

View File

@@ -18,10 +18,6 @@
<item name="android:textColor">@color/briar_text_primary_inverse</item>
</style>
<style name="BriarActionBar" parent="Base.Widget.AppCompat.Light.ActionBar.Solid">
<item name="elevation">1dp</item>
</style>
<style name="BriarButton.Default">
<item name="android:textAllCaps">true</item>
</style>

View File

@@ -2,7 +2,6 @@
<resources>
<style name="BriarBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="actionBarStyle">@style/BriarActionBar</item>
<item name="colorPrimary">@color/briar_primary</item>
<item name="colorPrimaryDark">@color/briar_primary_dark</item>
<item name="colorAccent">@color/briar_accent</item>