Side by Side Diff: mobile/android/base/resources/values/colors.xml
Issue 29348083:
Issue 3769 - UI colours gone bad (Closed)
Patch Set: Adjusting comments which indicates what has being changed by this issue in upstream code
Created Oct. 25, 2016, 12:16 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« mobile/android/base/resources/values/abb_styles.xml ('k')
|
mobile/android/base/resources/values/dimens.xml » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- This Source Code Form is subject to the terms of the Mozilla Public | 2 <!-- This Source Code Form is subject to the terms of the Mozilla Public |
| 3 - License, v. 2.0. If a copy of the MPL was not distributed with this | 3 - License, v. 2.0. If a copy of the MPL was not distributed with this |
| 4 - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> | 4 - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> |
| 5 | 5 |
| 6 <resources> | 6 <resources> |
| 7 <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 - -> | |
| 7 <!-- Fennec color palette (bug 1127517) --> | 8 <!-- Fennec color palette (bug 1127517) --> |
| 8 <color name="fennec_ui_orange">#009CD0</color> | 9 <color name="fennec_ui_orange">@color/abb_accent_dark_blue</color> |
| 9 <color name="affirmative_green">#6FBE4A</color> | 10 <color name="affirmative_green">#6FBE4A</color> |
| 10 <color name="rejection_red">#D23228</color> | 11 <color name="rejection_red">#D23228</color> |
| 11 <color name="action_orange">#E66000</color> | 12 <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 - -> |
| 12 <color name="action_orange_pressed">#DC5600</color> | 13 <color name="action_orange">@color/abb_accent_dark_blue</color> |
| 14 <color name="action_orange_pressed">@color/abb_accent_dark_blue</color> | |
| 13 <color name="link_blue">#0096DD</color> | 15 <color name="link_blue">#0096DD</color> |
| 14 <color name="link_blue_pressed">#0082C6</color> | 16 <color name="link_blue_pressed">#0082C6</color> |
| 15 <color name="private_browsing_purple">#CF68FF</color> | 17 <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 - -> |
| 18 <color name="private_browsing_purple">@color/abb_private_purple</color> | |
| 16 | 19 |
| 17 <color name="placeholder_active_grey">#222222</color> | 20 <color name="placeholder_active_grey">#222222</color> |
| 18 <color name="placeholder_grey">#777777</color> | 21 <color name="placeholder_grey">#777777</color> |
| 19 <color name="private_toolbar_grey">#F8F8F8</color> | 22 <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 - -> |
| 20 <color name="text_and_tabs_tray_grey">#F8F8F8</color> | 23 <color name="private_toolbar_grey">@color/abb_background_light_grey</color> |
| 21 <color name="tabs_tray_grey_pressed">#F8F8F8</color> | 24 <color name="text_and_tabs_tray_grey">@color/abb_text_icons_dark_grey</color> |
| 22 <color name="toolbar_icon_grey">#5F6368</color> | 25 <color name="tabs_tray_grey_pressed">@color/abb_background_light_grey</color> |
| 26 <color name="toolbar_icon_grey">@color/abb_text_icons_dark_grey</color> | |
| 23 | 27 |
| 24 <color name="tabs_tray_icon_grey">#AFB1B3</color> | 28 <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 - -> |
| 29 <color name="tabs_tray_icon_grey">@color/abb_text_icons_dark_grey</color> | |
| 25 <color name="disabled_grey">#BFBFBF</color> | 30 <color name="disabled_grey">#BFBFBF</color> |
| 26 <color name="toolbar_grey_pressed">#F8F8F8</color> | 31 <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 - -> |
| 32 <color name="toolbar_grey_pressed">@color/abb_background_light_grey</color> | |
| 27 <color name="toolbar_menu_dark_grey">#E1E1E6</color> | 33 <color name="toolbar_menu_dark_grey">#E1E1E6</color> |
| 28 <color name="toolbar_grey">#F8F8F8</color> | 34 <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 - -> |
| 35 <color name="toolbar_grey">@color/abb_background_light_grey</color> | |
| 29 <color name="about_page_header_grey">#F5F5F5</color> | 36 <color name="about_page_header_grey">#F5F5F5</color> |
| 30 | 37 |
| 31 <!-- ABB custom colors --> | |
| 32 <color name="abb_thumbnail_row_text">#3B3B3B</color> | |
| 33 | |
| 34 <color name="url_bar_shadow_private">#7878A5</color> | 38 <color name="url_bar_shadow_private">#7878A5</color> |
| 35 | 39 |
| 36 <!-- Restricted profiles palette --> | 40 <!-- Restricted profiles palette --> |
| 37 | 41 |
| 38 <color name="restricted_profile_background_gold">#ffffcb51</color> | 42 <color name="restricted_profile_background_gold">#ffffcb51</color> |
| 39 <color name="restricted_profile_background_green">#1aaa86</color> | 43 <color name="restricted_profile_background_green">#1aaa86</color> |
| 40 | 44 |
| 41 <!-- Non-palette colors --> | 45 <!-- Non-palette colors --> |
| 42 | 46 |
| 43 <!-- Synced w/ toolbar_grey --> | 47 <!-- Synced w/ toolbar_grey --> |
| 44 <color name="background_normal_lwt">#DDEBEBF0</color> | 48 <color name="background_normal_lwt">#DDEBEBF0</color> |
| 45 | 49 |
| 46 <color name="background_tabs">#FF363B40</color> | 50 <color name="background_tabs">#FF363B40</color> |
| 47 <color name="highlight">#33000000</color> | 51 <color name="highlight">#1A000000</color> |
| 48 <color name="highlight_focused">#1A000000</color> | 52 <color name="highlight_focused">#1A000000</color> |
| 49 <color name="highlight_dark">#33FFFFFF</color> | 53 <color name="highlight_dark">#1AFFFFFF</color> |
| 50 <color name="highlight_dark_focused">#1AFFFFFF</color> | 54 <color name="highlight_dark_focused">#1AFFFFFF</color> |
| 51 | 55 |
| 52 <!-- Synced w/ toolbar_grey_pressed --> | 56 <!-- Synced w/ toolbar_grey_pressed --> |
| 53 <color name="tablet_highlight_lwt">#AAD7D7DC</color> | 57 <color name="tablet_highlight_lwt">#AAD7D7DC</color> |
| 54 | 58 |
| 55 <!-- Synced w/ tabs_tray_grey_pressed --> | 59 <!-- Synced w/ tabs_tray_grey_pressed --> |
| 56 <color name="tablet_highlight_dark_lwt">#AA45494E</color> | 60 <color name="tablet_highlight_dark_lwt">#AA45494E</color> |
| 57 | 61 |
| 58 <!-- (bug 1077195) Focused state values are temporary. --> | 62 <!-- (bug 1077195) Focused state values are temporary. --> |
| 59 <color name="tablet_highlight_focused">#C0C9D0</color> | 63 <color name="tablet_highlight_focused">#C0C9D0</color> |
| 60 | 64 |
| 65 <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 - -> | |
| 61 <!-- highlight on shaped button: 20% white over text_and_tabs_tray_grey --> | 66 <!-- highlight on shaped button: 20% white over text_and_tabs_tray_grey --> |
| 62 <color name="highlight_shaped">#FFF8F8F8</color> | 67 <color name="highlight_shaped">@color/abb_background_light_grey</color> |
| 63 | 68 |
| 64 <!-- highlight-focused on shaped button: 10% white over text_and_tabs_tray_gre y --> | 69 <!-- highlight-focused on shaped button: 10% white over text_and_tabs_tray_gre y --> |
| 65 <color name="highlight_shaped_focused">#FF565B60</color> | 70 <color name="highlight_shaped_focused">#FF565B60</color> |
| 66 | 71 |
| 72 <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 - -> | |
| 67 <!-- highlight on private nav button: 20% white over private_toolbar_grey --> | 73 <!-- highlight on private nav button: 20% white over private_toolbar_grey --> |
| 68 <color name="highlight_nav_pb">#FFF8F8F8</color> | 74 <color name="highlight_nav_pb">@color/abb_background_light_grey</color> |
| 69 | 75 |
| 70 <color name="dark_transparent_overlay">#99000000</color> | 76 <color name="dark_transparent_overlay">#99000000</color> |
| 71 | 77 |
| 72 <!-- Firstrun tour--> | 78 <!-- Firstrun tour--> |
| 73 <color name="firstrun_tabstrip">#1193CB</color> | 79 <color name="firstrun_tabstrip">#1193CB</color> |
| 74 <color name="firstrun_pager_background">#16A3DF</color> | 80 <color name="firstrun_pager_background">#16A3DF</color> |
| 75 | 81 |
| 76 <!-- Tab Queue --> | 82 <!-- Tab Queue --> |
| 77 <color name="tab_queue_dismiss_button_foreground">#16A3DF</color> | 83 <color name="tab_queue_dismiss_button_foreground">#16A3DF</color> |
| 78 <color name="tab_queue_dismiss_button_foreground_pressed">#1193CB</color> | 84 <color name="tab_queue_dismiss_button_foreground_pressed">#1193CB</color> |
| 79 | 85 |
| 80 <!-- | 86 <!-- |
| 81 Application theme colors | 87 Application theme colors |
| 82 --> | 88 --> |
| 83 <!-- Default colors --> | 89 <!-- Default colors --> |
| 84 <color name="text_color_tertiary">#9198A1</color> | 90 <color name="text_color_tertiary">#9198A1</color> |
| 85 | 91 |
| 86 <!-- Default inverse colors --> | 92 <!-- Default inverse colors --> |
| 87 <color name="text_color_secondary_inverse">#DDDDDD</color> | 93 <color name="text_color_secondary_inverse">#DDDDDD</color> |
| 88 | 94 |
| 89 <!-- Disabled colors --> | 95 <!-- Disabled colors --> |
| 90 <color name="text_color_primary_disable_only">#999999</color> | 96 <color name="text_color_primary_disable_only">#999999</color> |
| 91 | 97 |
| 92 <!-- Hint colors --> | 98 <!-- Hint colors --> |
| 93 <color name="text_color_hint">#666666</color> | 99 <color name="text_color_hint">#666666</color> |
| 94 <color name="text_color_hint_inverse">#7F828A</color> | 100 <color name="text_color_hint_inverse">#7F828A</color> |
| 95 <color name="text_color_hint_floating_focused">#33b5e5</color> | 101 <color name="text_color_hint_floating_focused">#33b5e5</color> |
| 96 | 102 |
| 103 <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 - -> | |
| 97 <!-- Highlight colors --> | 104 <!-- Highlight colors --> |
| 98 <color name="text_color_highlight_inverse">#D06BFF</color> | 105 <color name="text_color_highlight_inverse">@color/abb_private_purple</color> |
| 99 | 106 |
| 100 <!-- Link colors --> | 107 <!-- Link colors --> |
| 101 <color name="text_color_link">#22629E</color> | 108 <color name="text_color_link">#22629E</color> |
| 102 | 109 |
| 103 <!-- Divider colors --> | 110 <!-- Divider colors --> |
| 104 <color name="divider_light">#FFD7D9DB</color> | 111 <color name="divider_light">#FFD7D9DB</color> |
| 105 | 112 |
| 106 <color name="doorhanger_link">#FF2AA1FE</color> | 113 <color name="doorhanger_link">#FF2AA1FE</color> |
| 107 | 114 |
| 108 <color name="validation_message_text">#ffffff</color> | 115 <color name="validation_message_text">#ffffff</color> |
| 109 <color name="url_bar_text_highlight_pb">#FFD06BFF</color> | 116 <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 - -> |
| 117 <color name="url_bar_text_highlight_pb">@color/abb_private_purple</color> | |
| 110 <color name="tab_row_pressed">#4D000000</color> | 118 <color name="tab_row_pressed">#4D000000</color> |
| 111 | 119 |
| 112 <color name="textbox_background">#FFF</color> | 120 <color name="textbox_background">#FFF</color> |
| 113 <color name="textbox_background_disabled">#DDD</color> | 121 <color name="textbox_background_disabled">#DDD</color> |
| 114 <color name="textbox_stroke">#000</color> | 122 <color name="textbox_stroke">#000</color> |
| 115 <color name="textbox_stroke_disabled">#666</color> | 123 <color name="textbox_stroke_disabled">#666</color> |
| 116 | 124 |
| 117 <color name="url_bar_urltext">#A6A6A6</color> | 125 <color name="url_bar_urltext">#A6A6A6</color> |
| 118 <color name="url_bar_domaintext">#000</color> | 126 <color name="url_bar_domaintext">#000</color> |
| 119 <color name="url_bar_domaintext_private">#FFF</color> | 127 <color name="url_bar_domaintext_private">#FFF</color> |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 154 <!-- Top sites thumbnail colors --> | 162 <!-- Top sites thumbnail colors --> |
| 155 <color name="top_site_default">#FFECF0F3</color> | 163 <color name="top_site_default">#FFECF0F3</color> |
| 156 <color name="top_site_border">#FFCFD9E1</color> | 164 <color name="top_site_border">#FFCFD9E1</color> |
| 157 | 165 |
| 158 <color name="private_active_text">#FFFFFF</color> | 166 <color name="private_active_text">#FFFFFF</color> |
| 159 | 167 |
| 160 <!-- This color is from a 2.3 Samsung device. --> | 168 <!-- This color is from a 2.3 Samsung device. --> |
| 161 <color name="gingerbread_menu_background_color">#1b1b1b</color> | 169 <color name="gingerbread_menu_background_color">#1b1b1b</color> |
| 162 | 170 |
| 163 </resources> | 171 </resources> |
| OLD | NEW |
« no previous file with comments
|
« mobile/android/base/resources/values/abb_styles.xml ('k')
|
mobile/android/base/resources/values/dimens.xml » ('j')
|
no next file with comments »
