diff --git a/app/src/main/res/layout/fragment_tab_tray.xml b/app/src/main/res/layout/fragment_tab_tray.xml index 22e6ef7a3..6e748eb0d 100644 --- a/app/src/main/res/layout/fragment_tab_tray.xml +++ b/app/src/main/res/layout/fragment_tab_tray.xml @@ -33,7 +33,9 @@ mozac:tabsTrayItemBackgroundColor="?tabTrayItemBackground" mozac:tabsTrayItemTextColor="?tabTrayItemText" mozac:tabsTraySelectedItemBackgroundColor="?tabTrayItemSelectedBackground" - mozac:tabsTraySelectedItemTextColor="?tabTrayItemSelectedText" /> + mozac:tabsTraySelectedItemTextColor="?tabTrayItemText" + mozac:tabsTrayItemUrlTextColor="?tabTrayItemUrl" + mozac:tabsTraySelectedItemUrlTextColor="?tabTrayItemUrl"/> @color/tab_tray_item_text_dark_theme - @color/tab_tray_item_selected_text_dark_theme + @color/tab_tray_item_url_dark_theme @color/tab_tray_item_background_dark_theme @color/tab_tray_item_selected_background_dark_theme diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 26e85da9c..8708c2def 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -46,7 +46,7 @@ - + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 758dd3b6d..45121799f 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -3,6 +3,21 @@ - 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/. --> + + #5B5B66 + #52525E + #32313C + #1C1B22 + #291D4F + #20123A + #1D1133 + #FBFBFE + #F9F9FB + #E0E0E6 + #AFAFBB + #529059FF + #1F592ACB + #20123A @color/photonGrey50 @@ -39,10 +54,10 @@ #E0E0E6 - @color/primary_text_light_theme - @color/foundation_light_theme - @color/foundation_light_theme - @color/accent_bright_light_theme + @color/ink_80 + @color/dark_grey_05 + @color/light_grey_10 + @color/violet_70_12a #FBFBFE @@ -78,10 +93,10 @@ #4A4A55 - @color/primary_text_dark_theme - @color/primary_text_dark_theme - @color/foundation_dark_theme - @color/accent_bright_dark_theme + @color/light_grey_05 + @color/light_grey_60 + @color/dark_grey_80 + @color/violet_50_32a #FBFBFE @@ -115,10 +130,10 @@ #312A65 - @color/primary_text_private_theme - @color/primary_text_private_theme - @color/foundation_private_theme - @color/accent_bright_private_theme + @color/light_grey_05 + @color/light_grey_60 + @color/ink_90 + @color/violet_50_32a @color/primary_text_light_theme @@ -152,7 +167,7 @@ @color/tab_tray_item_text_light_theme - @color/tab_tray_item_selected_text_light_theme + @color/tab_tray_item_url_light_theme @color/tab_tray_item_background_light_theme @color/tab_tray_item_selected_background_light_theme @@ -228,7 +243,6 @@ #5C592ACB @color/foundation_private_theme #FBFBFE - #FBFBFE #15141A @color/white_color #cccccc diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index a8e3a68f5..9c5cb13fd 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -68,7 +68,7 @@ @color/swipe_delete_background_normal_theme @color/tab_tray_item_text_normal_theme - @color/tab_tray_item_selected_text_normal_theme + @color/tab_tray_item_url_normal_theme @color/foundation_normal_theme @color/tab_tray_item_selected_background_normal_theme @@ -179,7 +179,7 @@ @color/tab_tray_item_text_private_theme - @color/tab_tray_item_selected_text_private_theme + @color/tab_tray_item_url_private_theme @color/foundation_private_theme @color/tab_tray_item_selected_background_private_theme