Skip to content

Commit

Permalink
Merge branch 'feature/1.0.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
Denvar committed Feb 23, 2016
2 parents 91fc85d + 4ac7b9b commit 601662d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
defaultConfig {
minSdkVersion 16
targetSdkVersion 23
versionCode 4
versionName "1.0.3"
versionCode 5
versionName "1.0.4"
setProperty("archivesBaseName", "android-material-chips-$versionName")
}
buildTypes {
Expand Down
1 change: 1 addition & 0 deletions library/src/main/res/layout/chips_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:background="@color/white"
android:layout_height="32dp"
android:paddingRight="12dp">

Expand Down
1 change: 1 addition & 0 deletions library/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
<color name="base30">#c1c1c1</color>

<color name="dark_gray">#555555</color>
<color name="white">#FFFFFF</color>

</resources>

0 comments on commit 601662d

Please sign in to comment.