Merge pull request #4920 from nextcloud/theming_server_input

Fix theming: server url input
This commit is contained in:
Tobias Kaminsky 2019-12-06 10:04:23 +01:00 committed by GitHub
commit 3ed9ce2e2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 13 deletions

View file

@ -109,8 +109,7 @@
android:paddingEnd="@dimen/alternate_padding_right"
android:paddingRight="@dimen/alternate_padding_right"
android:textColor="@color/login_text_color"
android:textColorHint="@color/login_text_hint_color"
android:theme="@style/Nextcloud.EditText.Login">
android:textColorHint="@color/login_text_hint_color">
<requestFocus />

View file

@ -109,8 +109,7 @@
android:paddingEnd="@dimen/alternate_padding_right"
android:paddingRight="@dimen/alternate_padding_right"
android:textColor="@color/login_text_color"
android:textColorHint="@color/login_text_color"
android:theme="@style/Nextcloud.EditText.Login">
android:textColorHint="@color/login_text_color">
<requestFocus />

View file

@ -73,9 +73,4 @@
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:colorBackground">@color/bg_default</item>
</style>
<style name="Nextcloud.EditText.Login" parent="ThemeOverlay.MaterialComponents.TextInputEditText">
<item name="colorControlNormal">@color/login_text_color</item>
<item name="colorControlActivated">@color/login_text_color</item>
</style>
</resources>

View file

@ -277,10 +277,6 @@
<style name="TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
</style>
<style name="Nextcloud.EditText.Login" parent="ThemeOverlay.MaterialComponents.TextInputEditText">
<item name="colorControlNormal">@color/login_text_color</item>
<item name="colorControlActivated">@color/login_text_color</item>
</style>
<style name="AppTabTextAppearance" parent="@style/TextAppearance.Design.Tab">
<item name="android:textSize">16sp</item>