4 files changed, 9 insertions, 6 deletions
diff --git a/current/support/design/libs/android-support-design.jar b/current/support/design/libs/android-support-design.jar
index 6f32ca9..8f58962 100644
--- a/current/support/design/libs/android-support-design.jar
+++ b/current/support/design/libs/android-support-design.jar
diff --git a/current/support/design/res/layout/design_navigation_item.xml b/current/support/design/res/layout/design_navigation_item.xml
index 6f86719..59ee05c 100644
--- a/current/support/design/res/layout/design_navigation_item.xml
+++ b/current/support/design/res/layout/design_navigation_item.xml
@@ -23,4 +23,4 @@
         android:drawablePadding="@dimen/navigation_icon_padding"
         android:gravity="center_vertical|start"
         android:maxLines="1"
-        android:textAppearance="?attr/textAppearanceListItem"/>
+        android:textAppearance="@style/TextAppearance.AppCompat.Body2"/>
diff --git a/current/support/design/res/layout/design_navigation_item_subheader.xml b/current/support/design/res/layout/design_navigation_item_subheader.xml
index 9a1a810..707ec6a 100644
--- a/current/support/design/res/layout/design_navigation_item_subheader.xml
+++ b/current/support/design/res/layout/design_navigation_item_subheader.xml
@@ -21,5 +21,5 @@
           android:maxLines="1"
           android:paddingLeft="?attr/listPreferredItemPaddingLeft"
           android:paddingRight="?attr/listPreferredItemPaddingRight"
-          android:textAppearance="?attr/textAppearanceListItem"
+          android:textAppearance="@style/TextAppearance.AppCompat.Body2"
           android:textColor="?android:textColorSecondary"/>
diff --git a/current/support/design/res/values/styles.xml b/current/support/design/res/values/styles.xml
index 23e324f..4e03029 100644
--- a/current/support/design/res/values/styles.xml
+++ b/current/support/design/res/values/styles.xml
@@ -23,7 +23,7 @@
         <item name="elevation">@dimen/fab_elevation</item>
         <item name="pressedTranslationZ">@dimen/fab_translation_z_pressed</item>
         <item name="rippleColor">?attr/colorControlHighlight</item>
-        <item name="borderWidth">@dimen/fab_border_width</item>
+        <item name="borderWidth">0dp</item>
     </style>
 
     <style name="Widget.Design.ScrimInsetsFrameLayout" parent="">
@@ -93,9 +93,8 @@
     </style>
 
     <style name="Widget.Design.CollapsingToolbar" parent="android:Widget">
-        <item name="expandedTitleMargin">16dp</item>
-        <item name="expandedTitleMarginBottom">20dp</item>
-        <item name="expandedTitleTextAppearance">@style/TextAppearance.AppCompat.Headline</item>
+        <item name="expandedTitleMargin">32dp</item>
+        <item name="expandedTitleTextAppearance">@style/TextAppearance.Design.CollapsingToolbar.Expanded</item>
         <item name="collapsedTitleTextAppearance">@style/TextAppearance.AppCompat.Widget.ActionBar.Title</item>
         <item name="statusBarScrim">?attr/colorPrimaryDark</item>
     </style>
@@ -109,5 +108,9 @@
         <item name="statusBarBackground">?attr/colorPrimaryDark</item>
     </style>
 
+    <style name="TextAppearance.Design.CollapsingToolbar.Expanded" parent="TextAppearance.AppCompat.Display1">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
+
 </resources>