Replace "Caribbean" color with "Azure" color (#1909)

MozillaReality · Oct 3, 2019 · 50f8198 · 50f8198
1 parent d75ba19
commit 50f8198
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/app/src/main/res/drawable/title_bar_background.xml b/app/src/main/res/drawable/title_bar_background.xml
@@ -5,14 +5,14 @@
             <item>
                 <shape android:shape="rectangle">
                     <corners android:radius="20dp" />
-                    <stroke android:width="@dimen/blur_radius" android:color="@color/caribbean_blur" />
+                    <stroke android:width="@dimen/blur_radius" android:color="@color/azure_blur" />
                 </shape>
             </item>
             <item android:bottom="@dimen/blur_radius_half" android:end="@dimen/blur_radius_half" android:start="@dimen/blur_radius_half" android:top="@dimen/blur_radius_half">
                 <shape android:shape="rectangle">
                     <corners android:radius="20dp" />
                     <solid android:color="@color/void_color" />
-                    <stroke android:width="2dp" android:color="@color/caribbean" />
+                    <stroke android:width="2dp" android:color="@color/azure" />
                 </shape>
             </item>
         </layer-list>
@@ -22,14 +22,14 @@
             <item>
                 <shape android:shape="rectangle">
                     <corners android:radius="20dp" />
-                    <stroke android:width="@dimen/blur_radius" android:color="@color/caribbean_blur" />
+                    <stroke android:width="@dimen/blur_radius" android:color="@color/azure_blur" />
                 </shape>
             </item>
             <item android:bottom="@dimen/blur_radius_half" android:end="@dimen/blur_radius_half" android:start="@dimen/blur_radius_half" android:top="@dimen/blur_radius_half">
                 <shape android:shape="rectangle">
                     <corners android:radius="20dp" />
                     <solid android:color="@color/asphalt" />
-                    <stroke android:width="2dp" android:color="@color/caribbean" />
+                    <stroke android:width="2dp" android:color="@color/azure" />
                 </shape>
             </item>
         </layer-list>

diff --git a/app/src/main/res/drawable/title_bar_background_private.xml b/app/src/main/res/drawable/title_bar_background_private.xml
@@ -5,14 +5,14 @@
             <item>
                 <shape android:shape="rectangle">
                     <corners android:radius="20dp" />
-                    <stroke android:width="@dimen/blur_radius" android:color="@color/caribbean_blur" />
+                    <stroke android:width="@dimen/blur_radius" android:color="@color/azure_blur" />
                 </shape>
             </item>
             <item android:bottom="@dimen/blur_radius_half" android:end="@dimen/blur_radius_half" android:start="@dimen/blur_radius_half" android:top="@dimen/blur_radius_half">
                 <shape android:shape="rectangle">
                     <corners android:radius="20dp" />
                     <solid android:color="@color/blackberry" />
-                    <stroke android:width="2dp" android:color="@color/caribbean" />
+                    <stroke android:width="2dp" android:color="@color/azure" />
                 </shape>
             </item>
         </layer-list>
@@ -22,14 +22,14 @@
             <item>
                 <shape android:shape="rectangle">
                     <corners android:radius="20dp" />
-                    <stroke android:width="@dimen/blur_radius" android:color="@color/caribbean_blur" />
+                    <stroke android:width="@dimen/blur_radius" android:color="@color/azure_blur" />
                 </shape>
             </item>
             <item android:bottom="@dimen/blur_radius_half" android:end="@dimen/blur_radius_half" android:start="@dimen/blur_radius_half" android:top="@dimen/blur_radius_half">
                 <shape android:shape="rectangle">
                     <corners android:radius="20dp" />
                     <solid android:color="@color/eggplant" />
-                    <stroke android:width="2dp" android:color="@color/caribbean" />
+                    <stroke android:width="2dp" android:color="@color/azure" />
                 </shape>
             </item>
         </layer-list>

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -8,8 +8,6 @@
     <color name="dusk">#556f8e</color>
     <color name="azure">#518fe1</color>
     <color name="azure_blur">#80518fe1</color>
-    <color name="caribbean">#1ac1dd</color>
-    <color name="caribbean_blur">#1ac1dd3d</color>
     <color name="concrete">#9ea3ab</color>
     <color name="sky">#75eff9</color>
     <color name="silver">#e3e4e5</color>
@@ -40,7 +38,7 @@
     <color name="text_shadow">#8F000000</color>
     <color name="text_shadow_light">#7FFFFFFF</color>
     <color name="smoke">#f5f6fa</color>
-    <color name="window_border_hover">#1ac1dd</color>
+    <color name="window_border_hover">@color/azure</color>
     <color name="window_border_click">#2bd2ee</color>
     <color name="window_blank_clear_color">#5d5d5d</color>
     <color name="window_private_clear_color">#331a50</color>