Merge remote-tracking branch 'origin/cosmote' into cosmote
Showing
7 changed files
with
17 additions
and
1 deletions
19.4 KB
| 1 | +<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | +<shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
| 3 | + android:shape="rectangle"> | ||
| 4 | + <gradient | ||
| 5 | + android:startColor="@color/cos_green3" | ||
| 6 | + android:centerColor="@color/cos_cyan" | ||
| 7 | + android:type="linear"/> | ||
| 8 | +<!-- <corners--> | ||
| 9 | +<!-- android:radius="9dp"/>--> | ||
| 10 | + | ||
| 11 | +<!-- <stroke android:width="2dp"--> | ||
| 12 | +<!-- android:color="@color/white_tr"/>--> | ||
| 13 | +</shape> | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| ... | @@ -3,7 +3,7 @@ | ... | @@ -3,7 +3,7 @@ |
| 3 | xmlns:app="http://schemas.android.com/apk/res-auto" | 3 | xmlns:app="http://schemas.android.com/apk/res-auto" |
| 4 | xmlns:tools="http://schemas.android.com/tools" | 4 | xmlns:tools="http://schemas.android.com/tools" |
| 5 | android:layout_width="@dimen/width_full" | 5 | android:layout_width="@dimen/width_full" |
| 6 | - android:layout_height="240dp" | 6 | + android:layout_height="@dimen/height_carousel" |
| 7 | android:layout_marginLeft="10dp" | 7 | android:layout_marginLeft="10dp" |
| 8 | android:background="@drawable/bottom_border"> | 8 | android:background="@drawable/bottom_border"> |
| 9 | 9 | ... | ... |
This diff is collapsed. Click to expand it.
| ... | @@ -13,6 +13,7 @@ | ... | @@ -13,6 +13,7 @@ |
| 13 | <color name="cos_cyan">#A3F2DA</color> | 13 | <color name="cos_cyan">#A3F2DA</color> |
| 14 | <color name="grey_light">#f1f1f2</color> | 14 | <color name="grey_light">#f1f1f2</color> |
| 15 | <color name="cos_green2">#52DF5A</color> | 15 | <color name="cos_green2">#52DF5A</color> |
| 16 | + <color name="cos_green3">#68BB7E</color> | ||
| 16 | <color name="green_dark">#1DA87A</color> | 17 | <color name="green_dark">#1DA87A</color> |
| 17 | <color name="cos_blue2">#0478BE</color> | 18 | <color name="cos_blue2">#0478BE</color> |
| 18 | <color name="white_tr2">#77FFFFFF</color> | 19 | <color name="white_tr2">#77FFFFFF</color> | ... | ... |
-
Please register or login to post a comment