Bug 974124 - Update padding, margins, and color scheme in FxA setup. r=rnewman
authorNick Alexander <nalexander@mozilla.com>
Thu, 13 Mar 2014 22:21:00 -0700
changeset 173543 38b1aed174bc0da0053d8faa9647aadf569a5216
parent 173542 e5ddb81a401c944cd3557542f66f9a58784073a9
child 173544 bd76c1a8fb6893583793d18fc85da5eb07068b78
push idunknown
push userunknown
push dateunknown
reviewersrnewman
bugs974124
milestone30.0a1
Bug 974124 - Update padding, margins, and color scheme in FxA setup. r=rnewman
mobile/android/base/resources/layout/fxaccount_create_account.xml
mobile/android/base/resources/layout/fxaccount_sign_in.xml
mobile/android/base/resources/values/fxaccount_colors.xml
mobile/android/base/resources/values/fxaccount_dimens.xml
mobile/android/base/resources/values/fxaccount_styles.xml
--- a/mobile/android/base/resources/layout/fxaccount_create_account.xml
+++ b/mobile/android/base/resources/layout/fxaccount_create_account.xml
@@ -38,16 +38,18 @@
             android:hint="@string/fxaccount_create_account_year_of_birth"
             android:inputType="none" />
 
         <TextView
             android:id="@+id/policy"
             style="@style/FxAccountLinkifiedItem"
             android:layout_marginBottom="0dp"
             android:layout_marginTop="10dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
             android:text="@string/fxaccount_create_account_policy_text"
             android:textColorLink="@color/fxaccount_linkified_textColorLinkSubdued" />
 
         <TextView
             android:id="@+id/remote_error"
             style="@style/FxAccountErrorItem" />
 
         <RelativeLayout
--- a/mobile/android/base/resources/layout/fxaccount_sign_in.xml
+++ b/mobile/android/base/resources/layout/fxaccount_sign_in.xml
@@ -60,16 +60,18 @@
                 android:gravity="right"
                 android:text="@string/fxaccount_sign_in_create_account_instead" />
         </LinearLayout>
 
         <TextView
             android:id="@+id/policy"
             style="@style/FxAccountLinkifiedItem"
             android:layout_marginTop="10dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
             android:text="@string/fxaccount_create_account_policy_text"
             android:textColorLink="@color/fxaccount_linkified_textColorLinkSubdued" />
 
         <LinearLayout style="@style/FxAccountSpacer" />
 
         <ImageView
             style="@style/FxAccountIcon"
             android:contentDescription="@string/fxaccount_empty_contentDescription" />
--- a/mobile/android/base/resources/values/fxaccount_colors.xml
+++ b/mobile/android/base/resources/values/fxaccount_colors.xml
@@ -1,36 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
   <color name="fxaccount_textColor">#424f59</color>
-  <color name="fxaccount_textColorSubdued">#c0c9d0</color>
+  <color name="fxaccount_textColorSubdued">#8a9ba8</color>
 
-  <color name="fxaccount_linkified_textColor">#c0c9d0</color>
-  <color name="fxaccount_linkified_textColorLink">#0096dd</color>
-  <color name="fxaccount_linkified_textColorLinkSubdued">#c0c9d0</color>
+  <color name="fxaccount_linkified_textColor">#8a9ba8</color>
+  <color name="fxaccount_linkified_textColorLink">#0095dd</color>
+  <color name="fxaccount_linkified_textColorLinkSubdued">#8a9ba8</color>
 
   <color name="fxaccount_error">#d63920</color>
 
   <color name="fxaccount_error_preference_backgroundcolor">#fad4d2</color>
 
   <color name="fxaccount_button_textColor">#ffffff</color>
-  <color name="fxaccount_button_background_active">#e66000</color>
-  <color name="fxaccount_button_background_hit">#fd9500</color>
-  <color name="fxaccount_button_background_loading">#424f59</color>
-  <color name="fxaccount_button_background_inactive">#c0c9d0</color>
+  <color name="fxaccount_button_background_active">#0095dd</color>
+  <color name="fxaccount_button_background_hit">#0088cc</color>
+  <color name="fxaccount_button_background_inactive">#8a9ba8</color>
   <color name="fxaccount_input_textColor">#424f59</color>
   <color name="fxaccount_input_textColor_pressed">#424f59</color>
-  <color name="fxaccount_input_textColor_inactive">#c0c9d0</color>
-  <color name="fxaccount_input_textColorHint">#c0c9d0</color>
-  <color name="fxaccount_link_textColor">#0096dd</color>
-  <color name="fxaccount_link_textColor_pressed">#00767d</color>
-  <color name="fxaccount_link_textColor_inactive">#c0c9d0</color>
-  <color name="fxaccount_input_borderActive">#6a7b86</color>
-  <color name="fxaccount_input_borderInactive">#c0c9d0</color>
-  <color name="fxaccount_password_show_textcolor">#c0c9d0</color>
+  <color name="fxaccount_input_textColor_inactive">#8a9ba8</color>
+  <color name="fxaccount_input_textColorHint">#8a9ba8</color>
+  <color name="fxaccount_link_textColor">#0095dd</color>
+  <color name="fxaccount_link_textColor_pressed">#0088cc</color>
+  <color name="fxaccount_link_textColor_inactive">#8a9ba8</color>
+  <color name="fxaccount_input_borderActive">#0095dd</color>
+  <color name="fxaccount_input_borderInactive">#8a9ba8</color>
+  <color name="fxaccount_password_show_textcolor">#8a9ba8</color>
   <color name="fxaccount_password_show_backgroundcolor">#ffffff</color>
   <color name="fxaccount_password_hide_textcolor">#ffffff</color>
-  <color name="fxaccount_password_hide_backgroundcolor">#424f59</color>
+  <color name="fxaccount_password_hide_backgroundcolor">#8a9ba8</color>
 </resources>
--- a/mobile/android/base/resources/values/fxaccount_dimens.xml
+++ b/mobile/android/base/resources/values/fxaccount_dimens.xml
@@ -1,17 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <resources>
   <dimen name="fxaccount_stroke_width">1dp</dimen>
   <dimen name="fxaccount_corner_radius">5dp</dimen>
-  <dimen name="fxaccount_input_padding">10dp</dimen>
+
+  <!-- The amount of horizontal padding that appears inside the email,
+       password, etc input fields. -->
+  <dimen name="fxaccount_input_padding_horizontal">20dp</dimen>
+  <!-- And the amount of vertical padding that appears inside input
+       fields. -->
+  <dimen name="fxaccount_input_padding_vertical">10dp</dimen>
 
   <!-- Preference fragment padding, bottom -->
   <dimen name="preference_fragment_padding_bottom">0dp</dimen>
   <!-- Preference fragment padding, sides -->
   <dimen name="preference_fragment_padding_side">16dp</dimen>
 
   <integer name="preference_fragment_scrollbarStyle">0x02000000</integer> <!-- outsideOverlay -->
 </resources>
--- a/mobile/android/base/resources/values/fxaccount_styles.xml
+++ b/mobile/android/base/resources/values/fxaccount_styles.xml
@@ -59,17 +59,20 @@
         <item name="android:padding">20dp</item>
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginBottom">10dp</item>
     </style>
 
     <style name="FxAccountEditItem" parent="@android:style/Widget.EditText">
         <item name="android:textSize">20sp</item>
-        <item name="android:padding">@dimen/fxaccount_input_padding</item>
+        <item name="android:paddingLeft">@dimen/fxaccount_input_padding_horizontal</item>
+        <item name="android:paddingRight">@dimen/fxaccount_input_padding_horizontal</item>
+        <item name="android:paddingTop">@dimen/fxaccount_input_padding_vertical</item>
+        <item name="android:paddingBottom">@dimen/fxaccount_input_padding_vertical</item>
         <item name="android:background">@drawable/fxaccount_textfield_background</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:singleLine">true</item>
         <item name="android:textColor">@color/fxaccount_input_textColor</item>
         <item name="android:textColorHint">@color/fxaccount_input_textColorHint</item>
     </style>