diff options
| author | Christian S <christian@pix-art.de> | 2015-07-14 09:13:08 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-07-14 09:13:08 +0200 |
| commit | 169b4ba97f576cb2cbd8477ea0d3d6ed40276658 (patch) | |
| tree | 74a60f38a1b170962a04fdceaa7e3726b766c291 /src/main/res/layout/activity_muc_details.xml | |
| parent | c0016b6fa7b778700c21e15baff58b03b1b1f8d6 (diff) | |
| parent | ffffca10f0c3e399fbbcde200ea4758acc5ba03f (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into siacs-development
Diffstat (limited to 'src/main/res/layout/activity_muc_details.xml')
| -rw-r--r-- | src/main/res/layout/activity_muc_details.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index 7860d89cf..671215eaa 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -2,7 +2,7 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:background="@color/secondarybackground"> + android:background="@color/grey200"> <LinearLayout android:layout_width="fill_parent" @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/account_settings_example_jabber_id" - android:textColor="@color/primarytext" + android:textColor="@color/black87" android:textSize="?attr/TextSizeHeadline" android:textStyle="bold"/> @@ -59,7 +59,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:textColor="@color/primarytext" + android:textColor="@color/black87" android:textSize="?attr/TextSizeHeadline"/> <TextView @@ -67,7 +67,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:textColor="@color/primarytext" + android:textColor="@color/black87" android:textSize="?attr/TextSizeBody"/> </LinearLayout> @@ -91,7 +91,7 @@ android:layout_height="wrap_content" android:text="@string/private_conference" android:layout_centerVertical="true" - android:textColor="@color/primarytext" + android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:layout_alignParentLeft="true" android:layout_toLeftOf="@+id/change_conference_button" @@ -116,7 +116,7 @@ android:layout_gravity="right" android:layout_marginTop="32dp" android:text="@string/using_account" - android:textColor="@color/secondarytext" + android:textColor="@color/black54" android:textSize="?attr/TextSizeInfo"/> </LinearLayout> |