diff options
| author | fupduck <fupduck@riseup.net> | 2018-02-08 06:05:56 -0800 |
|---|---|---|
| committer | fupduck <fupduck@riseup.net> | 2018-02-08 06:05:56 -0800 |
| commit | ae938c20a11b6195936f97eebd32abd35335bceb (patch) | |
| tree | d7dfd33f349bab895cfbbf12744c88b72cd50759 /app/src/main/res/values | |
| parent | c3d157c91ecc3a177efc4e089904684511e7710d (diff) | |
| parent | 966b74e46c6723093dfb93cce64528d79441e70e (diff) | |
Merge branch '8823_cw_tablet_layout' into '0.9.8'
8823 cw tablet layout
See merge request leap/bitmask_android!36
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/dimens.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/values/styles.xml | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index a6afc8bc..87d8e266 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -29,4 +29,7 @@ <dimen name="navigation_drawer_width">300dp</dimen> <dimen name="loading_screen_icon_vertical_margin">16dp</dimen> + + <dimen name="bitmask_logo">56dp</dimen> + <dimen name="bitmask_logo_tablet">72dp</dimen> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 867fa54f..4e845384 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -65,7 +65,6 @@ </style> <style name="BitmaskActivity"> - <item name="android:padding">@dimen/activity_margin</item> </style> <style name="BitmaskButtonBlack" parent="android:Widget.Button"> |