Settings WebUI: Remove unnecessary shared CSS variables.
The following settings-* variables are mirroring existing cr-* variables.
and are not adding any value.
--settings-box-row-padding -> --cr-section-padding
--settings-box-row-indent -> --cr-section-indent-padding
--settings-indent-width -> --cr-section-indent-width
Bug: None
Change-Id: Ib686d4bddfb8ad15d31edede06498feffe1ff462
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1568198
Commit-Queue: Dan Beam <dbeam@chromium.org>
Auto-Submit: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Dan Beam <dbeam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#651492}diff --git a/chrome/browser/resources/settings/a11y_page/manage_a11y_page.html b/chrome/browser/resources/settings/a11y_page/manage_a11y_page.html
index b1bc15f4..253cd5c3 100644
--- a/chrome/browser/resources/settings/a11y_page/manage_a11y_page.html
+++ b/chrome/browser/resources/settings/a11y_page/manage_a11y_page.html
@@ -3,24 +3,24 @@
<link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html">
<link rel="import" href="chrome://resources/cr_elements/cr_link_row/cr_link_row.html">
<link rel="import" href="chrome://resources/cr_elements/icons.html">
+<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
<link rel="import" href="../controls/settings_slider.html">
<link rel="import" href="../controls/settings_toggle_button.html">
<link rel="import" href="../i18n_setup.html">
<link rel="import" href="../route.html">
<link rel="import" href="../settings_shared_css.html">
-<link rel="import" href="../settings_vars_css.html">
<link rel="import" href="tts_subpage.html">
<dom-module id="settings-manage-a11y-page">
<template>
<style include="settings-shared">
h2 {
- padding-inline-start: var(--settings-box-row-padding);
+ padding-inline-start: var(--cr-section-padding);
}
.sub-item {
- margin-inline-start: var(--settings-indent-width);
+ margin-inline-start: var(--cr-section-indent-width);
}
h2 ~ .settings-box,
@@ -29,8 +29,8 @@
iron-collapse .settings-box,
iron-collapse settings-toggle-button,
iron-collapse cr-link-row {
- margin-inline-end: var(--settings-box-row-padding);
- margin-inline-start: var(--settings-box-row-indent);
+ margin-inline-end: var(--cr-section-padding);
+ margin-inline-start: var(--cr-section-indent-padding);
padding-inline-end: 0;
padding-inline-start: 0;
}
diff --git a/chrome/browser/resources/settings/a11y_page/tts_subpage.html b/chrome/browser/resources/settings/a11y_page/tts_subpage.html
index 7f0ec20..5866fcc 100644
--- a/chrome/browser/resources/settings/a11y_page/tts_subpage.html
+++ b/chrome/browser/resources/settings/a11y_page/tts_subpage.html
@@ -1,7 +1,8 @@
<link rel="import" href="chrome://resources/html/polymer.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html"
<link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expand_button.html">
+<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html"
+<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/html/md_select_css.html">
<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
@@ -10,18 +11,17 @@
<link rel="import" href="../i18n_setup.html">
<link rel="import" href="../languages_page/languages_browser_proxy.html">
<link rel="import" href="../settings_shared_css.html">
-<link rel="import" href="../settings_vars_css.html">
<dom-module id="settings-tts-subpage">
<template>
<style include="settings-shared md-select">
h2 {
- padding-inline-start: var(--settings-box-row-padding);
+ padding-inline-start: var(--cr-section-padding);
}
.settings-box {
- margin-inline-end: var(--settings-box-row-padding);
- margin-inline-start: var(--settings-box-row-indent);
+ margin-inline-end: var(--cr-section-padding);
+ margin-inline-start: var(--cr-section-indent-padding);
padding-inline-end: 0;
padding-inline-start: 0;
}
diff --git a/chrome/browser/resources/settings/change_password_page/change_password_page.html b/chrome/browser/resources/settings/change_password_page/change_password_page.html
index 8bb78ad..50554b2 100644
--- a/chrome/browser/resources/settings/change_password_page/change_password_page.html
+++ b/chrome/browser/resources/settings/change_password_page/change_password_page.html
@@ -11,7 +11,7 @@
<template>
<style include="settings-shared">
.icon-container {
- padding-inline-end: var(--settings-box-row-padding);
+ padding-inline-end: var(--cr-section-padding);
}
.change-password-icon {
@@ -25,7 +25,7 @@
.top-aligned-settings-box {
align-items: start;
min-height: 0;
- padding: 12px var(--settings-box-row-padding);
+ padding: 12px var(--cr-section-padding);
}
</style>
<div class="settings-box first top-aligned-settings-box">
diff --git a/chrome/browser/resources/settings/chrome_cleanup_page/items_to_remove_list.html b/chrome/browser/resources/settings/chrome_cleanup_page/items_to_remove_list.html
index 6fda33ac..2ff69ed6d 100644
--- a/chrome/browser/resources/settings/chrome_cleanup_page/items_to_remove_list.html
+++ b/chrome/browser/resources/settings/chrome_cleanup_page/items_to_remove_list.html
@@ -12,7 +12,7 @@
:host {
display: block;
margin: 0;
- padding: 0 var(--settings-box-row-padding);
+ padding: 0 var(--cr-section-padding);
word-break: break-all;
}
diff --git a/chrome/browser/resources/settings/device_page/pointers.html b/chrome/browser/resources/settings/device_page/pointers.html
index 3208555..95301b1 100644
--- a/chrome/browser/resources/settings/device_page/pointers.html
+++ b/chrome/browser/resources/settings/device_page/pointers.html
@@ -1,6 +1,7 @@
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_elements/cr_radio_button/cr_radio_button.html">
+<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="../controls/settings_radio_group.html">
<link rel="import" href="../controls/settings_slider.html">
<link rel="import" href="../controls/settings_toggle_button.html">
@@ -11,12 +12,12 @@
<template>
<style include="settings-shared">
h2 {
- padding-inline-start: var(--settings-box-row-padding);
+ padding-inline-start: var(--cr-section-padding);
}
.subsection {
- padding-inline-end: var(--settings-box-row-padding);
- padding-inline-start: var(--settings-box-row-indent);
+ padding-inline-end: var(--cr-section-padding);
+ padding-inline-start: var(--cr-section-indent-padding);
}
.subsection > settings-toggle-button,
diff --git a/chrome/browser/resources/settings/device_page/stylus.html b/chrome/browser/resources/settings/device_page/stylus.html
index 67e0572..7dad79f1 100644
--- a/chrome/browser/resources/settings/device_page/stylus.html
+++ b/chrome/browser/resources/settings/device_page/stylus.html
@@ -2,6 +2,7 @@
<link rel="import" href="chrome://resources/cr_elements/cr_link_row/cr_link_row.html">
<link rel="import" href="chrome://resources/cr_elements/cr_toggle/cr_toggle.html">
+<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/html/action_link.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner-lite.html">
<link rel="import" href="../controls/settings_toggle_button.html">
@@ -27,7 +28,7 @@
}
#note-taking-app-lock-screen-settings {
- padding: 0 var(--settings-box-row-padding);
+ padding: 0 var(--cr-section-padding);
}
</style>
diff --git a/chrome/browser/resources/settings/internet_page/internet_shared_css.html b/chrome/browser/resources/settings/internet_page/internet_shared_css.html
index a3b39fb..414a3b8f 100644
--- a/chrome/browser/resources/settings/internet_page/internet_shared_css.html
+++ b/chrome/browser/resources/settings/internet_page/internet_shared_css.html
@@ -1,4 +1,7 @@
+<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="../settings_shared_css.html">
+
+<!--TODO(dpapad): Remove this HTML import, should not be here -->
<link rel="import" href="internet_page_browser_proxy.html">
<!-- Common styles for Internet settings. -->
@@ -6,7 +9,7 @@
<template>
<style include="settings-shared">
cr-network-icon {
- padding-inline-end: var(--settings-box-row-padding);
+ padding-inline-end: var(--cr-section-padding);
}
iron-icon.policy {
@@ -14,7 +17,7 @@
}
.indented {
- margin-inline-start: var(--settings-box-row-padding);
+ margin-inline-start: var(--cr-section-padding);
}
.stretch {
diff --git a/chrome/browser/resources/settings/internet_page/internet_subpage.html b/chrome/browser/resources/settings/internet_page/internet_subpage.html
index 8b4ce8ff..e477cea3 100644
--- a/chrome/browser/resources/settings/internet_page/internet_subpage.html
+++ b/chrome/browser/resources/settings/internet_page/internet_subpage.html
@@ -21,9 +21,9 @@
separator lines can fill the entire width of the page. */
#networkListDiv > * {
/* cr-network-list is padded to the right to allow space for a ripple */
- padding-inline-end: calc(var(--settings-box-row-padding) -
+ padding-inline-end: calc(var(--cr-section-padding) -
var(--cr-icon-ripple-padding));
- padding-inline-start: var(--settings-box-row-padding);
+ padding-inline-start: var(--cr-section-padding);
}
#addButton {
diff --git a/chrome/browser/resources/settings/internet_page/network_summary_item.html b/chrome/browser/resources/settings/internet_page/network_summary_item.html
index d9b0ad0e..e5326a65 100644
--- a/chrome/browser/resources/settings/internet_page/network_summary_item.html
+++ b/chrome/browser/resources/settings/internet_page/network_summary_item.html
@@ -9,17 +9,16 @@
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html">
<link rel="import" href="../settings_page/settings_subpage.html">
-<link rel="import" href="../settings_shared_css.html">
<dom-module id="network-summary-item">
<template>
<style include="internet-shared iron-flex">
network-siminfo {
- padding-inline-start: var(--settings-box-row-padding);
+ padding-inline-start: var(--cr-section-padding);
}
#outerBox {
- padding: 0 var(--settings-box-row-padding);
+ padding: 0 var(--cr-section-padding);
@apply(--network-summary-item-outer-box);
}
diff --git a/chrome/browser/resources/settings/people_page/signout_dialog.html b/chrome/browser/resources/settings/people_page/signout_dialog.html
index af7c0a5..4a93842 100644
--- a/chrome/browser/resources/settings/people_page/signout_dialog.html
+++ b/chrome/browser/resources/settings/people_page/signout_dialog.html
@@ -3,6 +3,7 @@
<link rel="import" href="chrome://resources/cr_elements/cr_checkbox/cr_checkbox.html">
<link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
<link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expand_button.html">
+<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
<link rel="import" href="profile_info_browser_proxy.html">
@@ -13,7 +14,7 @@
<template>
<style include="settings-shared">
#dialog [slot=footer] .settings-box {
- --settings-box-row-padding: 0;
+ --cr-section-padding: 0;
}
.delete-profile-warning {
diff --git a/chrome/browser/resources/settings/people_page/sync_page.html b/chrome/browser/resources/settings/people_page/sync_page.html
index d15fdf1..c68b40c 100644
--- a/chrome/browser/resources/settings/people_page/sync_page.html
+++ b/chrome/browser/resources/settings/people_page/sync_page.html
@@ -37,7 +37,7 @@
#create-password-box {
/* In order to line up with the encryption radio box text. */
- margin-inline-start: var(--settings-indent-width);
+ margin-inline-start: var(--cr-section-indent-width);
}
#create-password-box {
@@ -56,7 +56,7 @@
border-bottom: var(--cr-separator-line);
border-top: var(--cr-separator-line);
/* This particular list frame is not indented. */
- padding-inline-start: var(--settings-box-row-padding);
+ padding-inline-start: var(--cr-section-padding);
}
#submitExistingPassphrase {
diff --git a/chrome/browser/resources/settings/people_page/users_page.html b/chrome/browser/resources/settings/people_page/users_page.html
index 597cfba..afdbbe7d 100644
--- a/chrome/browser/resources/settings/people_page/users_page.html
+++ b/chrome/browser/resources/settings/people_page/users_page.html
@@ -1,7 +1,8 @@
<link rel="import" href="chrome://resources/html/polymer.html">
-<link rel="import" href="chrome://resources/html/action_link.html">
+<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/html/action_link_css.html">
+<link rel="import" href="chrome://resources/html/action_link.html">
<link rel="import" href="chrome://resources/html/assert.html">
<link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
@@ -19,7 +20,7 @@
#add-user-button {
/* Add user button must be lined up with the start of users' names. */
- margin-inline-start: var(--settings-box-row-indent);
+ margin-inline-start: var(--cr-section-indent-padding);
}
#add-user-button a {
diff --git a/chrome/browser/resources/settings/search_page/search_page.html b/chrome/browser/resources/settings/search_page/search_page.html
index e18531b..d2797c0 100644
--- a/chrome/browser/resources/settings/search_page/search_page.html
+++ b/chrome/browser/resources/settings/search_page/search_page.html
@@ -2,6 +2,7 @@
<link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html">
<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_indicator.html">
+<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/html/assert.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/html/md_select_css.html">
@@ -37,7 +38,7 @@
}
.indented {
- margin-inline-start: var(--settings-indent-width);
+ margin-inline-start: var(--cr-section-indent-width);
}
</style>
<settings-animated-pages id="pages" section="search"
diff --git a/chrome/browser/resources/settings/settings_shared_css.html b/chrome/browser/resources/settings/settings_shared_css.html
index a6eb0f2a..5585da8 100644
--- a/chrome/browser/resources/settings/settings_shared_css.html
+++ b/chrome/browser/resources/settings/settings_shared_css.html
@@ -248,7 +248,7 @@
/* A settings-box that is embedded in another settings-box (e.g. a control
* that is associated with a toggle button). */
.settings-box.embedded {
- padding-inline-start: var(--settings-box-row-indent);
+ padding-inline-start: var(--cr-section-indent-padding);
}
/* The lower line of text in a two-line row. */
diff --git a/chrome/browser/resources/settings/settings_vars_css.html b/chrome/browser/resources/settings/settings_vars_css.html
index 344d4f2..23ba190 100644
--- a/chrome/browser/resources/settings/settings_vars_css.html
+++ b/chrome/browser/resources/settings/settings_vars_css.html
@@ -12,15 +12,12 @@
/* Some colors use non-MD colors. These custom colors are specified by
* UX design (bettes@). */
- --settings-box-row-padding: var(--cr-section-padding);
- --settings-box-row-indent: var(--cr-section-indent-padding);
- --settings-indent-width: var(--cr-section-indent-width);
--settings-disabled-opacity: .65;
--settings-error-color: var(--google-red-700);
--settings-list-frame-padding: {
- padding-inline-end: var(--settings-box-row-padding);
- padding-inline-start: var(--settings-box-row-indent);
+ padding-inline-end: var(--cr-section-padding);
+ padding-inline-start: var(--cr-section-indent-padding);
padding-bottom: 0;
padding-top: 0;
}
diff --git a/chrome/browser/resources/settings/site_settings/all_sites.html b/chrome/browser/resources/settings/site_settings/all_sites.html
index 8be1d503..eb14758 100644
--- a/chrome/browser/resources/settings/site_settings/all_sites.html
+++ b/chrome/browser/resources/settings/site_settings/all_sites.html
@@ -1,12 +1,12 @@
<link rel="import" href="chrome://resources/html/polymer.html">
-<link rel="import" href="chrome://resources/html/md_select_css.html">
<link rel="import" href="chrome://resources/cr_elements/cr_search_field/cr_search_field.html">
+<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
+<link rel="import" href="chrome://resources/html/md_select_css.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.html">
<link rel="import" href="../global_scroll_target_behavior.html">
<link rel="import" href="../route.html">
<link rel="import" href="../settings_shared_css.html">
-<link rel="import" href="../settings_vars_css.html">
<link rel="import" href="site_entry.html">
<link rel="import" href="site_settings_behavior.html">
@@ -18,7 +18,7 @@
display: flex;
margin: 0 var(--cr-icon-button-margin-start);
margin-bottom: 50px;
- padding: 0 var(--settings-box-row-padding);
+ padding: 0 var(--cr-section-padding);
}
#sortMethod {
@@ -28,7 +28,7 @@
/* There is only one top-level heading for All Sites, so remove the
* additional leading padding used for lists. */
.list-frame.without-heading {
- padding-inline-start: var(--settings-box-row-padding);
+ padding-inline-start: var(--cr-section-padding);
}
</style>
<div id="sort">
diff --git a/chrome/browser/resources/settings/site_settings/site_details.html b/chrome/browser/resources/settings/site_settings/site_details.html
index d1f0b2db..16e1db8 100644
--- a/chrome/browser/resources/settings/site_settings/site_details.html
+++ b/chrome/browser/resources/settings/site_settings/site_details.html
@@ -8,6 +8,7 @@
<link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
<link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html">
<link rel="import" href="chrome://resources/cr_elements/icons.html">
+<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="../icons.html">
<link rel="import" href="../route.html">
<link rel="import" href="../settings_shared_css.html">
@@ -35,7 +36,7 @@
* that would normally be provided by the subheading. */
.list-frame.without-heading {
margin-top: 12px;
- padding-inline-start: var(--settings-box-row-padding);
+ padding-inline-start: var(--cr-section-padding);
}
#resetSettingsButton {
