Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7204)

Unified Diff: chrome/browser/resources/settings/settings_shared_css.html

Issue 2889493002: [MD settings] removing secondary-button class (Closed)
Patch Set: review changes Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/settings/settings_shared_css.html
diff --git a/chrome/browser/resources/settings/settings_shared_css.html b/chrome/browser/resources/settings/settings_shared_css.html
index bf2f422fd8c7f389a71b400080672b2fc9f7243e..1c1e5d3fbd95083b3a71e5d71997eeb5c92a3c34 100644
--- a/chrome/browser/resources/settings/settings_shared_css.html
+++ b/chrome/browser/resources/settings/settings_shared_css.html
@@ -35,7 +35,20 @@
--iron-icon-fill-color: var(--google-green-500);
}
+ /* See notes in .primary-button.
+ * TODO(dschuyler): Remove unnecessary .secondary-button references. */
paper-button {
+ --paper-button: {
+ -webkit-padding-end: var(--settings-button-edge-spacing);
+ -webkit-padding-start: var(--settings-button-edge-spacing);
+ color: var(--paper-grey-600);
+ font-weight: 500;
+ min-width: 1em; /* A tighter fit than 5.14em for short buttons. */
+ text-decoration: none;
+ };
+ --paper-button-flat-keyboard-focus: {
+ background: rgba(0, 0, 0, .12);
+ };
flex-shrink: 0;
height: 36px;
margin: 0;
@@ -45,6 +58,27 @@
background-color: var(--paper-grey-300);
}
+ .settings-box paper-button {
+ -webkit-margin-end: calc(var(--settings-button-edge-spacing) * -1);
+ -webkit-margin-start: calc(var(--settings-button-edge-spacing) * -1);
+ }
+
+ /* There are two settings button styles, .primary-button and normal
+ * buttons. The primary is the action button (e.g. "edit", "delete")
+ * while the normal (secondary-button) is often a "Cancel" button. */
+ .primary-button {
+ --paper-button: {
+ -webkit-padding-end: var(--settings-button-edge-spacing);
+ -webkit-padding-start: var(--settings-button-edge-spacing);
+ font-weight: 500;
+ text-align: start;
+ };
+ --paper-button-flat-keyboard-focus: {
+ background: rgba(51, 103, 214, .12); /* --google-blue-700 */
+ };
+ color: var(--google-blue-500);
+ }
+
paper-toggle-button {
@apply(--settings-actionable);
height: var(--settings-row-min-height);
@@ -55,20 +89,10 @@
-webkit-margin-start: 4px;
}
- .primary-button {
- color: var(--google-blue-500);
- }
-
a[href] {
color: var(--google-blue-700);
}
- .primary-button {
- --paper-button-flat-keyboard-focus: {
- background: rgba(51, 103, 214, .12); /* --google-blue-700 */
- };
- }
-
a[href] {
text-decoration: none;
}
@@ -78,20 +102,6 @@
color: inherit !important;
}
- /* There are three main button styles, .primary-button, .secondary-button,
- * and .tertiary-button. The primary is the action button (e.g. "edit",
- * "delete") while the secondary is often a "Cancel" button. A tertiary
- * button may be used to get more information or similar, that we expect
- * most users will not need. */
- .primary-button {
- --paper-button: {
- -webkit-padding-end: var(--settings-button-edge-spacing);
- -webkit-padding-start: var(--settings-button-edge-spacing);
- font-weight: 500;
- text-align: start;
- };
- }
-
.primary-toggle {
color: var(--paper-grey-600);
font-weight: 500;
@@ -101,27 +111,6 @@
color: var(--google-blue-500);
}
- /* See notes in .primary-button. */
- .secondary-button {
- --paper-button: {
- -webkit-padding-end: var(--settings-button-edge-spacing);
- -webkit-padding-start: var(--settings-button-edge-spacing);
- color: var(--paper-grey-600);
- font-weight: 500;
- min-width: 1em; /* A tighter fit than 5.14em for short buttons. */
- text-decoration: none;
- };
- --paper-button-flat-keyboard-focus: {
- background: rgba(0, 0, 0, .12);
- };
- }
-
- .settings-box .primary-button,
- .settings-box .secondary-button {
- -webkit-margin-end: calc(var(--settings-button-edge-spacing) * -1);
- -webkit-margin-start: calc(var(--settings-button-edge-spacing) * -1);
- }
-
paper-checkbox {
--paper-checkbox-checked-color: var(--google-blue-500);
--paper-checkbox-label-spacing: var(--settings-control-label-spacing);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698