Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: mobile/android/base/resources/values/styles.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.
Jump to:
View unified diff | Download patch
OLDNEW
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 xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tool s="http://schemas.android.com/tools"> 6 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tool s="http://schemas.android.com/tools">
7 7
8 <!-- 8 <!--
9 Base application styles. This could be overridden in other res/values-XX X/themes.xml. 9 Base application styles. This could be overridden in other res/values-XX X/themes.xml.
10 --> 10 -->
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 <style name="TextAppearance.Small.Inverse"> 359 <style name="TextAppearance.Small.Inverse">
360 <item name="android:textColor">?android:attr/textColorSecondaryInverse</ item> 360 <item name="android:textColor">?android:attr/textColorSecondaryInverse</ item>
361 <item name="android:textColorHint">?android:attr/textColorHintInverse</i tem> 361 <item name="android:textColorHint">?android:attr/textColorHintInverse</i tem>
362 <item name="android:textColorHighlight">@color/text_color_highlight_inve rse</item> 362 <item name="android:textColorHighlight">@color/text_color_highlight_inve rse</item>
363 <item name="android:textColorLink">?android:attr/textColorLink</item> 363 <item name="android:textColorLink">?android:attr/textColorLink</item>
364 </style> 364 </style>
365 365
366 <style name="TextAppearance.EmptyMessage" parent="TextAppearance.Large"/> 366 <style name="TextAppearance.EmptyMessage" parent="TextAppearance.Large"/>
367 367
368 <style name="TextAppearance.EmptyHint" parent="TextAppearance.Medium"> 368 <style name="TextAppearance.EmptyHint" parent="TextAppearance.Medium">
369 <item name="android:textColor">#FFA62F</item> 369 <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/ 3769 -->
370 <item name="android:textColor">@color/abb_accent_dark_blue</item>
370 </style> 371 </style>
371 372
372 <style name="TextAppearance.Micro"> 373 <style name="TextAppearance.Micro">
373 <item name="android:textSize">12sp</item> 374 <item name="android:textSize">12sp</item>
374 <item name="android:textColor">?android:attr/textColorTertiary</item> 375 <item name="android:textColor">?android:attr/textColorTertiary</item>
375 </style> 376 </style>
376 377
377 <style name="TextAppearance.Micro.Inverse"> 378 <style name="TextAppearance.Micro.Inverse">
378 <item name="android:textColor">?android:attr/textColorTertiaryInverse</i tem> 379 <item name="android:textColor">?android:attr/textColorTertiaryInverse</i tem>
379 <item name="android:textColorHint">?android:attr/textColorHintInverse</i tem> 380 <item name="android:textColorHint">?android:attr/textColorHintInverse</i tem>
(...skipping 26 matching lines...) Expand all
406 407
407 <style name="TextAppearance.Widget.Home" /> 408 <style name="TextAppearance.Widget.Home" />
408 409
409 <style name="TextAppearance.Widget.Home.Header" parent="TextAppearance.Small "> 410 <style name="TextAppearance.Widget.Home.Header" parent="TextAppearance.Small ">
410 <item name="android:textColor">?android:attr/textColorPrimary</item> 411 <item name="android:textColor">?android:attr/textColorPrimary</item>
411 </style> 412 </style>
412 413
413 <style name="TextAppearance.Widget.Home.ItemTitle" parent="TextAppearance.Me dium"/> 414 <style name="TextAppearance.Widget.Home.ItemTitle" parent="TextAppearance.Me dium"/>
414 415
415 <style name="TextAppearance.Widget.Home.ItemDescription" parent="TextAppeara nce.Micro"> 416 <style name="TextAppearance.Widget.Home.ItemDescription" parent="TextAppeara nce.Micro">
416 <item name="android:textColor">@color/tabs_tray_icon_grey</item> 417 <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/ 3769 -->
418 <item name="android:textColor">@color/abb_text_divider_grey</item>
417 </style> 419 </style>
418 420
419 <style name="TextAppearance.Widget.HomeBanner" parent="TextAppearance.Small" > 421 <style name="TextAppearance.Widget.HomeBanner" parent="TextAppearance.Small" >
420 <item name="android:textColor">?android:attr/textColorHint</item> 422 <item name="android:textColor">?android:attr/textColorHint</item>
421 </style> 423 </style>
422 424
423 <style name="TextAppearance.DoorHanger"> 425 <style name="TextAppearance.DoorHanger">
424 <item name="android:textColor">@color/placeholder_active_grey</item> 426 <item name="android:textColor">@color/placeholder_active_grey</item>
425 <item name="android:textColorLink">@color/doorhanger_link</item> 427 <item name="android:textColorLink">@color/doorhanger_link</item>
426 </style> 428 </style>
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 580
579 <!-- TabWidget --> 581 <!-- TabWidget -->
580 <style name="TabWidget"> 582 <style name="TabWidget">
581 <item name="android:layout_width">wrap_content</item> 583 <item name="android:layout_width">wrap_content</item>
582 <item name="android:layout_height">40dip</item> 584 <item name="android:layout_height">40dip</item>
583 <item name="android:layout_weight">1.0</item> 585 <item name="android:layout_weight">1.0</item>
584 </style> 586 </style>
585 587
586 <!-- Find bar --> 588 <!-- Find bar -->
587 <style name="FindBar"> 589 <style name="FindBar">
588 <item name="android:background">@color/text_and_tabs_tray_grey</item> 590 <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/ 3769 -->
591 <item name="android:background">@color/abb_background_light_grey</item>
589 <item name="android:paddingLeft">3dip</item> 592 <item name="android:paddingLeft">3dip</item>
590 <item name="android:paddingRight">3dip</item> 593 <item name="android:paddingRight">3dip</item>
591 <item name="android:paddingTop">6dip</item> 594 <item name="android:paddingTop">6dip</item>
592 <item name="android:paddingBottom">6dip</item> 595 <item name="android:paddingBottom">6dip</item>
593 </style> 596 </style>
594 597
595 <!-- Find bar - Image Button --> 598 <!-- Find bar - Image Button -->
596 <style name="FindBar.ImageButton"> 599 <style name="FindBar.ImageButton">
597 <item name="android:layout_width">wrap_content</item> 600 <item name="android:layout_width">wrap_content</item>
598 <item name="android:layout_height">wrap_content</item> 601 <item name="android:layout_height">wrap_content</item>
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
838 <item name="android:textSize">20sp</item> 841 <item name="android:textSize">20sp</item>
839 <item name="android:gravity">center</item> 842 <item name="android:gravity">center</item>
840 <item name="android:paddingTop">16dp</item> 843 <item name="android:paddingTop">16dp</item>
841 <item name="android:paddingBottom">16dp</item> 844 <item name="android:paddingBottom">16dp</item>
842 <item name="android:paddingLeft">8dp</item> 845 <item name="android:paddingLeft">8dp</item>
843 <item name="android:paddingRight">8dp</item> 846 <item name="android:paddingRight">8dp</item>
844 </style> 847 </style>
845 848
846 <style name="TabQueueActivity" parent="android:style/Theme.NoDisplay" /> 849 <style name="TabQueueActivity" parent="android:style/Theme.NoDisplay" />
847 </resources> 850 </resources>
OLDNEW
« no previous file with comments | « mobile/android/base/resources/values/dimens.xml ('k') | mobile/android/base/resources/values/themes.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld