Side by Side Diff: mobile/android/base/resources/values/colors.xml
Issue 29330952:
Issue 3127 - Merge conflicts, base 42.0.1 (Closed)
Patch Set:
Created Nov. 26, 2015, 11:01 a.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/menu/browser_app_menu.xml ('k')
|
mobile/android/base/resources/xml-v11/preference_headers.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 <!-- Fennec color palette (bug 1127517) --> | 7 <!-- Fennec color palette (bug 1127517) --> |
| 8 <color name="fennec_ui_orange">#FF9500</color> | 8 <!-- Adblock Browser uses blue as orange --> |
| 9 <color name="fennec_ui_orange">#009CD0</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 <color name="action_orange">#E66000</color> |
| 12 <color name="action_orange_pressed">#DC5600</color> | 13 <color name="action_orange_pressed">#DC5600</color> |
| 13 <color name="link_blue">#0096DD</color> | 14 <color name="link_blue">#0096DD</color> |
| 14 <color name="link_blue_pressed">#0082C6</color> | 15 <color name="link_blue_pressed">#0082C6</color> |
| 15 <color name="private_browsing_purple">#CF68FF</color> | 16 <color name="private_browsing_purple">#CF68FF</color> |
| 16 | 17 |
| 17 <color name="placeholder_active_grey">#222222</color> | 18 <color name="placeholder_active_grey">#222222</color> |
| 18 <color name="placeholder_grey">#777777</color> | 19 <color name="placeholder_grey">#777777</color> |
| 19 <color name="private_toolbar_grey">#292C29</color> | 20 <color name="private_toolbar_grey">#F8F8F8</color> |
| 20 <color name="text_and_tabs_tray_grey">#363B40</color> | 21 <color name="text_and_tabs_tray_grey">#F8F8F8</color> |
| 21 <color name="tabs_tray_grey_pressed">#45494E</color> | 22 <color name="tabs_tray_grey_pressed">#F8F8F8</color> |
| 22 <color name="toolbar_icon_grey">#5F6368</color> | 23 <color name="toolbar_icon_grey">#5F6368</color> |
| 23 | 24 |
| 24 <color name="tabs_tray_icon_grey">#AFB1B3</color> | 25 <color name="tabs_tray_icon_grey">#AFB1B3</color> |
| 25 <color name="disabled_grey">#BFBFBF</color> | 26 <color name="disabled_grey">#BFBFBF</color> |
| 26 <color name="toolbar_grey_pressed">#D7D7DC</color> | 27 <color name="toolbar_grey_pressed">#F8F8F8</color> |
| 27 <color name="toolbar_menu_dark_grey">#E1E1E6</color> | 28 <color name="toolbar_menu_dark_grey">#E1E1E6</color> |
| 28 <color name="toolbar_grey">#EBEBF0</color> | 29 <color name="toolbar_grey">#F8F8F8</color> |
| 29 <color name="about_page_header_grey">#F5F5F5</color> | 30 <color name="about_page_header_grey">#F5F5F5</color> |
| 30 | 31 |
| 32 <!-- ABB custom colors --> | |
| 33 <color name="abb_thumbnail_row_text">#3B3B3B</color> | |
| 34 | |
| 31 <color name="url_bar_shadow_private">#7878A5</color> | 35 <color name="url_bar_shadow_private">#7878A5</color> |
| 32 | 36 |
| 33 <!-- Restricted profiles palette --> | 37 <!-- Restricted profiles palette --> |
| 34 | 38 |
| 35 <color name="restricted_profile_background_gold">#ffffcb51</color> | 39 <color name="restricted_profile_background_gold">#ffffcb51</color> |
| 36 <color name="restricted_profile_background_green">#1aaa86</color> | 40 <color name="restricted_profile_background_green">#1aaa86</color> |
| 37 | 41 |
| 38 <!-- Non-palette colors --> | 42 <!-- Non-palette colors --> |
| 39 | 43 |
| 40 <!-- Synced w/ toolbar_grey --> | 44 <!-- Synced w/ toolbar_grey --> |
| 41 <color name="background_normal_lwt">#DDEBEBF0</color> | 45 <color name="background_normal_lwt">#DDEBEBF0</color> |
| 42 | 46 |
| 43 <color name="background_tabs">#FF363B40</color> | 47 <color name="background_tabs">#FF363B40</color> |
| 44 <color name="highlight">#33000000</color> | 48 <color name="highlight">#33000000</color> |
| 45 <color name="highlight_focused">#1A000000</color> | 49 <color name="highlight_focused">#1A000000</color> |
| 46 <color name="highlight_dark">#33FFFFFF</color> | 50 <color name="highlight_dark">#33FFFFFF</color> |
| 47 <color name="highlight_dark_focused">#1AFFFFFF</color> | 51 <color name="highlight_dark_focused">#1AFFFFFF</color> |
| 48 | 52 |
| 49 <!-- Synced w/ toolbar_grey_pressed --> | 53 <!-- Synced w/ toolbar_grey_pressed --> |
| 50 <color name="new_tablet_highlight_lwt">#AAD7D7DC</color> | 54 <color name="new_tablet_highlight_lwt">#AAD7D7DC</color> |
| 51 | 55 |
| 52 <!-- Synced w/ tabs_tray_grey_pressed --> | 56 <!-- Synced w/ tabs_tray_grey_pressed --> |
| 53 <color name="new_tablet_highlight_dark_lwt">#AA45494E</color> | 57 <color name="new_tablet_highlight_dark_lwt">#AA45494E</color> |
| 54 | 58 |
| 55 <!-- (bug 1077195) Focused state values are temporary. --> | 59 <!-- (bug 1077195) Focused state values are temporary. --> |
| 56 <color name="new_tablet_highlight_focused">#C0C9D0</color> | 60 <color name="new_tablet_highlight_focused">#C0C9D0</color> |
| 57 | 61 |
| 58 <!-- highlight on shaped button: 20% white over text_and_tabs_tray_grey --> | 62 <!-- highlight on shaped button: 20% white over text_and_tabs_tray_grey --> |
| 59 <color name="highlight_shaped">#FF696D71</color> | 63 <color name="highlight_shaped">#FFF8F8F8</color> |
| 60 | 64 |
| 61 <!-- highlight-focused on shaped button: 10% white over text_and_tabs_tray_gre y --> | 65 <!-- highlight-focused on shaped button: 10% white over text_and_tabs_tray_gre y --> |
| 62 <color name="highlight_shaped_focused">#FF565B60</color> | 66 <color name="highlight_shaped_focused">#FF565B60</color> |
| 63 | 67 |
| 64 <!-- highlight on private nav button: 20% white over private_toolbar_grey --> | 68 <!-- highlight on private nav button: 20% white over private_toolbar_grey --> |
| 65 <color name="highlight_nav_pb">#FF545654</color> | 69 <color name="highlight_nav_pb">#FFF8F8F8</color> |
| 66 | 70 |
| 67 <color name="dark_transparent_overlay">#99000000</color> | 71 <color name="dark_transparent_overlay">#99000000</color> |
| 68 | 72 |
| 69 <!-- Firstrun tour--> | 73 <!-- Firstrun tour--> |
| 70 <color name="firstrun_tabstrip">#1193CB</color> | 74 <color name="firstrun_tabstrip">#1193CB</color> |
| 71 <color name="firstrun_pager_background">#16A3DF</color> | 75 <color name="firstrun_pager_background">#16A3DF</color> |
| 72 | 76 |
| 73 <!-- Tab Queue --> | 77 <!-- Tab Queue --> |
| 74 <color name="tab_queue_dismiss_button_foreground">#16A3DF</color> | 78 <color name="tab_queue_dismiss_button_foreground">#16A3DF</color> |
| 75 <color name="tab_queue_dismiss_button_foreground_pressed">#1193CB</color> | 79 <color name="tab_queue_dismiss_button_foreground_pressed">#1193CB</color> |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 148 <!-- Canvas delegate paint color --> | 152 <!-- Canvas delegate paint color --> |
| 149 <color name="canvas_delegate_paint">#FFFF0000</color> | 153 <color name="canvas_delegate_paint">#FFFF0000</color> |
| 150 | 154 |
| 151 <!-- Top sites thumbnail colors --> | 155 <!-- Top sites thumbnail colors --> |
| 152 <color name="top_site_default">#FFECF0F3</color> | 156 <color name="top_site_default">#FFECF0F3</color> |
| 153 <color name="top_site_border">#FFCFD9E1</color> | 157 <color name="top_site_border">#FFCFD9E1</color> |
| 154 | 158 |
| 155 <color name="private_active_text">#FFFFFF</color> | 159 <color name="private_active_text">#FFFFFF</color> |
| 156 | 160 |
| 157 </resources> | 161 </resources> |
| OLD | NEW |
« no previous file with comments
|
« mobile/android/base/resources/menu/browser_app_menu.xml ('k')
|
mobile/android/base/resources/xml-v11/preference_headers.xml » ('j')
|
no next file with comments »
