diff options
| author | cyBerta <cyberta@riseup.net> | 2018-02-08 15:37:15 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-02-08 15:37:15 +0100 |
| commit | 6770f041300fa592dfb93fb4296c55218c05cc45 (patch) | |
| tree | 17dd25e0b17e50358cef4e464fa4bc2503cc2859 /app/src/main/res/values | |
| parent | ef805faec61a4cb3155dd336f5db08cd2c40aece (diff) | |
| parent | ae938c20a11b6195936f97eebd32abd35335bceb (diff) | |
Merge branch 'mirror_0xacab_0.9.8' into #8830_onBoot_alwaysOn
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"> |