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

Side by Side Diff: chrome/browser/resources/settings/settings_shared_css.html

Issue 1732143002: [MD settings] using paper and google colors in settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review changes Created 4 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* Copyright 2016 The Chromium Authors. All rights reserved. 1 /* Copyright 2016 The Chromium Authors. All rights reserved.
2 * Use of this source code is governed by a BSD-style license that can be 2 * Use of this source code is governed by a BSD-style license that can be
3 * found in the LICENSE file. */ 3 * found in the LICENSE file. */
4 4
5 /** 5 /**
6 * @fileoverview 6 * @fileoverview
7 * Common styles for Material Design settings. 7 * Common styles for Material Design settings.
8 */ 8 */
9 9
10 <dom-module id="settings-shared"> 10 <dom-module id="settings-shared">
11 <template> 11 <template>
12 <style> 12 <style>
13 :root { 13 :root {
14 --settings-secondary: { 14 --settings-secondary: {
15 color: #969696; 15 color: var(--paper-grey-500);
16 font-weight: 400; 16 font-weight: 400;
17 } 17 }
18 } 18 }
19 19
20 h2 { 20 h2 {
21 @apply(--layout-center); 21 @apply(--layout-center);
22 color: var(--paper-grey-500); 22 color: var(--paper-grey-500);
23 display: flex; 23 display: flex;
24 font-size: 100%; 24 font-size: 100%;
25 font-weight: 500; 25 font-weight: 500;
26 margin: 0; 26 margin: 0;
27 min-height: 40px; 27 min-height: 40px;
28 } 28 }
29 29
30 iron-icon { 30 iron-icon {
31 color: #969696; 31 color: var(--paper-grey-300);
32 } 32 }
33 33
34 iron-icon[icon=done] { 34 iron-icon[icon=done] {
35 color: rgb(0, 128, 0); 35 color: var(--google-green-500);
36 } 36 }
37 37
38 paper-button { 38 paper-button {
39 margin: 0; 39 margin: 0;
40 min-width: auto; 40 min-width: auto;
41 } 41 }
42 42
43 paper-button[toggles][active] { 43 paper-button[toggles][active] {
44 background-color: LightGray; 44 background-color: var(--paper-grey-300);
45 } 45 }
46 46
47 span ~ a { 47 span ~ a {
48 -webkit-margin-start: 4px; 48 -webkit-margin-start: 4px;
49 } 49 }
50 50
51 [is='action-link'], 51 [is='action-link'],
52 [is='action-link']:active, 52 [is='action-link']:active,
53 [is='action-link']:hover, 53 [is='action-link']:hover,
54 [is='action-link']:visited, 54 [is='action-link']:visited,
55 paper-button.primary-button { 55 paper-button.primary-button,
56 /* TODO(dbeam): change all other colors in this file into --google or 56 paper-button.tertiary-button {
57 * --paper where applicable. */
58 color: var(--google-blue-700); 57 color: var(--google-blue-700);
59 } 58 }
60 59
61 [is='action-link']:hover { 60 [is='action-link']:hover {
62 /* TODO(dbeam): check with bettes@ on this one, but I'm pretty sure we 61 /* TODO(dbeam): check with bettes@ on this one, but I'm pretty sure we
63 * shouldn't be showing much :hover stuff on Polymer pages. */ 62 * shouldn't be showing much :hover stuff on Polymer pages. */
64 text-decoration: none; 63 text-decoration: none;
65 } 64 }
66 65
67 paper-button.primary-button { 66 paper-button.primary-button {
68 --paper-button: { 67 --paper-button: {
69 font-weight: 500; 68 font-weight: 500;
70 text-align: start; 69 text-align: start;
71 }; 70 };
72 margin: 0 -0.57em; /* Offsets default paper-button padding. */ 71 margin: 0 -0.57em; /* Offsets default paper-button padding. */
73 } 72 }
74 73
75 paper-button.secondary-button { 74 paper-button.secondary-button {
76 --paper-button: { 75 --paper-button: {
77 color: #5a5a5a; 76 color: var(--paper-grey-700);
78 text-decoration: none; 77 text-decoration: none;
79 font-weight: 500; 78 font-weight: 500;
80 }; 79 };
81 } 80 }
82 81
83 paper-button.tertiary-button { 82 paper-button.tertiary-button {
84 --paper-button: { 83 --paper-button: {
85 color: rgb(51, 103, 214);
86 font-weight: 400; 84 font-weight: 400;
87 text-decoration: none; 85 text-decoration: none;
88 }; 86 };
89 } 87 }
90 88
91 paper-radio-button { 89 paper-radio-button {
92 --paper-radio-button-checked-color: var(--google-blue-500); 90 --paper-radio-button-checked-color: var(--google-blue-500);
93 --paper-radio-button-label-spacing: 18px; 91 --paper-radio-button-label-spacing: 18px;
94 --paper-radio-button-unchecked-color: #969696; 92 --paper-radio-button-unchecked-color: var(--paper-grey-500);
95 -webkit-margin-start: 2px; 93 -webkit-margin-start: 2px;
96 } 94 }
97 95
98 .text-elide { 96 .text-elide {
99 overflow: hidden; 97 overflow: hidden;
100 text-overflow: ellipsis; 98 text-overflow: ellipsis;
101 white-space: nowrap; 99 white-space: nowrap;
102 } 100 }
103 101
104 .button-row { 102 .button-row {
(...skipping 25 matching lines...) Expand all
130 .list-item { 128 .list-item {
131 @apply(--layout-center); 129 @apply(--layout-center);
132 display: flex; 130 display: flex;
133 min-height: 40px; 131 min-height: 40px;
134 padding: 0; 132 padding: 0;
135 } 133 }
136 134
137 /* This button has no ink ripple */ 135 /* This button has no ink ripple */
138 .list-item.list-button { 136 .list-item.list-button {
139 @apply(--layout-center); 137 @apply(--layout-center);
140 color: rgb(66, 133, 244); 138 color: var(--google-blue-500);
141 font-weight: 500; 139 font-weight: 500;
142 text-decoration: none; 140 text-decoration: none;
Dan Beam 2016/02/25 22:28:09 fwiw: I'm not sure text-decoration: none; is neede
dschuyler 2016/02/25 22:33:38 Done.
143 } 141 }
144 142
145 .list-item iron-icon { 143 .list-item iron-icon {
146 @apply(--layout-center); 144 @apply(--layout-center);
147 height: 20px; 145 height: 20px;
148 width: 20px; 146 width: 20px;
149 } 147 }
150 148
151 .list-item > .middle { 149 .list-item > .middle {
152 flex: 1; 150 flex: 1;
153 margin: 8px 12px; 151 margin: 8px 12px;
154 overflow: hidden; 152 overflow: hidden;
155 white-space: nowrap; 153 white-space: nowrap;
156 } 154 }
157 155
158 .list-item > .start { 156 .list-item > .start {
159 flex: 1; 157 flex: 1;
160 overflow: hidden; 158 overflow: hidden;
161 white-space: nowrap; 159 white-space: nowrap;
162 } 160 }
163 161
164 .list-item > paper-icon-item { 162 .list-item > paper-icon-item {
165 padding: 0; 163 padding: 0;
166 } 164 }
167 165
168 /* This button has no ink ripple. */
169 .list-item.list-button {
170 @apply(--layout-center);
171 color: rgb(66, 133, 244);
172 font-weight: 500;
173 }
174
175 .settings-card { 166 .settings-card {
176 padding: 8px 0; 167 padding: 8px 0;
177 } 168 }
178 169
179 .settings-box { 170 .settings-box {
180 @apply(--layout-center); 171 @apply(--layout-center);
181 border-top: 1px solid var(--paper-grey-300); 172 border-top: 1px solid var(--paper-grey-300);
182 display: flex; 173 display: flex;
183 min-height: 40px; 174 min-height: 40px;
184 padding: 0 20px; 175 padding: 0 20px;
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 .vertical-list > div:first-of-type { 231 .vertical-list > div:first-of-type {
241 border-top: none; 232 border-top: none;
242 } 233 }
243 234
244 .vertical-list > div { 235 .vertical-list > div {
245 border-top: 1px solid var(--paper-grey-300); 236 border-top: 1px solid var(--paper-grey-300);
246 } 237 }
247 </style> 238 </style>
248 </template> 239 </template>
249 </dom-module> 240 </dom-module>
OLDNEW
« 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