Commit b75aad29 authored by Christopher Lam's avatar Christopher Lam Committed by Commit Bot

[CrOS Semantic Colors] Clean up color palette

gogoy@ has indicated that non-refresh Google colors are no longer to be
used for Chrome OS. As such, remove them from the palette, and OS Settings.

Also, add a PRESUBMIT to prevent them from getting added back to OS Settings.

Bug: 1062154
Change-Id: I73465f867b5916bdd234a2a7c292038cd805f2a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2100556Reviewed-by: default avatarGiovanni Ortuño Urquidi <ortuno@chromium.org>
Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Commit-Queue: calamity <calamity@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751934}
parent 63f47ba0
# Copyright 2020 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Presubmit script for OS Settings."""
import re
def _CheckSemanticColors(input_api, output_api):
problems = []
for f in input_api.AffectedFiles():
exts = ['html', 'css']
if not any(f.LocalPath().endswith(ext) for ext in exts):
continue
paper_color_re = re.compile(r'--paper-\w+-\d+')
google_refresh_color_re = re.compile(r'--google-\w+-refresh-\d+')
for line_num, line in f.ChangedContents():
# Search for paper-colors.
if paper_color_re.search(line):
problems.append(line.strip())
# Search for google-refresh-colors.
if google_refresh_color_re.search(line):
problems.append(line.strip())
if not problems:
return []
return [
output_api.PresubmitPromptWarning(
'Please avoid using paper-colors and google-refresh-colors on ' +
'Chrome OS.\n' + 'Allowed colors are listed in ' +
'ui/webui/resources/css/cros_palette.json5.\n' +
'See https://crbug.com/1062154 or contact calamity@chromium.org ' +
'or ortuno@chromium.org for more information.',
items=problems)
]
def _CommonChecks(input_api, output_api):
"""Checks common to both upload and commit."""
results = []
results.extend(_CheckSemanticColors(input_api, output_api))
return results
def CheckChangeOnUpload(input_api, output_api):
return _CommonChecks(input_api, output_api)
def CheckChangeOnCommit(input_api, output_api):
return _CommonChecks(input_api, output_api)
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
in getDivStyle_ and getMirrorDivStyle_ */ in getDivStyle_ and getMirrorDivStyle_ */
.display { .display {
align-items: center; align-items: center;
background: var(--paper-grey-100); background: var(--google-grey-100);
color: var(--paper-grey-700); color: var(--google-grey-700);
cursor: default; cursor: default;
display: flex; display: flex;
font-size: 100%; font-size: 100%;
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
} }
.instructions { .instructions {
color: var(--paper-grey-600); color: var(--google-grey-600);
margin-top: 4px; margin-top: 4px;
} }
......
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
} }
button > iron-icon { button > iron-icon {
--iron-icon-fill-color: var(--paper-grey-400); --iron-icon-fill-color: var(--google-grey-400);
--iron-icon-height: 24px; --iron-icon-height: 24px;
--iron-icon-width: 24px; --iron-icon-width: 24px;
} }
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
} }
paper-ripple { paper-ripple {
color: var(--google-grey-refresh-700); color: var(--google-grey-700);
} }
</style> </style>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<style include="settings-shared"> <style include="settings-shared">
#dialog { #dialog {
/* Force a bottom border regardless of scroll state. */ /* Force a bottom border regardless of scroll state. */
--cr-dialog-body-border-bottom: 1px solid var(--paper-grey-300); --cr-dialog-body-border-bottom: 1px solid var(--google-grey-300);
} }
#dialog [slot=body] { #dialog [slot=body] {
padding-inline-end: 0; padding-inline-end: 0;
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
background: none; background: none;
border: none; border: none;
box-sizing: border-box; box-sizing: border-box;
color: var(--paper-grey-800); color: var(--google-grey-800);
cursor: pointer; cursor: pointer;
font: inherit; font: inherit;
min-height: 32px; min-height: 32px;
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
} }
.list-item:focus { .list-item:focus {
background-color: var(--paper-grey-300); background-color: var(--google-grey-300);
outline: none; outline: none;
} }
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
} }
#authorCredit { #authorCredit {
color: var(--paper-grey-500); color: var(--google-grey-500);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-top: 20px; margin-top: 20px;
......
...@@ -14,17 +14,17 @@ ...@@ -14,17 +14,17 @@
* Recommended colors. * Recommended colors.
*/ */
cros_default_text_color: "$google_grey_900", cros_default_text_color: "$google_grey_900",
cros_default_text_color_secondary: "$google_grey_refresh_700", cros_default_text_color_secondary: "$google_grey_700",
cros_default_bg_color: "#ffffff", cros_default_bg_color: "#ffffff",
cros_default_toolbar_bg_color: "#ffffff", cros_default_toolbar_bg_color: "#ffffff",
cros_default_toolbar_search_bg_color: "$google_grey_refresh_100", cros_default_toolbar_search_bg_color: "$google_grey_100",
cros_default_button_color: "$google_blue_600", cros_default_button_color: "$google_blue_600",
cros_menu_button_bg_color_active: "$google_blue_50", cros_menu_button_bg_color_active: "$google_blue_50",
cros_menu_button_bg_color_hover: "$google_grey_refresh_100", cros_menu_button_bg_color_hover: "$google_grey_100",
cros_menu_button_outline_color_focused: "$google_blue_600", cros_menu_button_outline_color_focused: "$google_blue_600",
cros_toggle_color: "$cros_default_button_color", cros_toggle_color: "$cros_default_button_color",
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
cros_radio_button_color: "$cros_default_button_color", cros_radio_button_color: "$cros_default_button_color",
cros_radio_button_ripple_color: "rgba($cros_radio_button_color_rgb, .2)", cros_radio_button_ripple_color: "rgba($cros_radio_button_color_rgb, .2)",
cros_radio_button_color_unchecked: "$google_grey_refresh_700", cros_radio_button_color_unchecked: "$google_grey_700",
cros_radio_button_ripple_color_unchecked: "rgba($google_grey_600_rgb, .15)", cros_radio_button_ripple_color_unchecked: "rgba($google_grey_600_rgb, .15)",
cros_separator_color: "rgba(0, 0, 0, 0.12)", cros_separator_color: "rgba(0, 0, 0, 0.12)",
...@@ -52,10 +52,10 @@ ...@@ -52,10 +52,10 @@
/* OS Settings */ /* OS Settings */
cros_error_color: "$google_red_700", cros_error_color: "$google_red_700",
cros_success_color: "$google_green_refresh_700", cros_success_color: "$google_green_700",
cros_search_page_question_icon_color: "$google_grey_refresh_500", cros_search_page_question_icon_color: "$google_grey_500",
cros_app_management_permission_icon_color: "$paper_grey_600", cros_app_management_permission_icon_color: "$google_grey_600",
cros_user_icon_color_secondary: "rgb(210, 210, 212)", cros_user_icon_color_secondary: "rgb(210, 210, 212)",
}, },
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment