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

Side by Side Diff: chrome/browser/resources/contextual_search/promo.css

Issue 1142893002: Add Roboto-Medium webfont and factor out common Roboto WebUI CSS file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rearrange properties in promo.css to abate presubmit Created 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/contextual_search/promo.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* Copyright 2014 The Chromium Authors. All rights reserved. 1 /* Copyright 2014 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 /* TODO: Need to clean up @font-face after we remove font-family from body. */
6 @font-face {
7 font-family: 'Roboto2';
8 font-weight: 400;
9 src: local('Roboto'), local('Roboto2-Regular'),
10 url(chrome://resources/roboto/roboto.woff2) format('woff2'),
11 url(chrome://resources/roboto/roboto.woff) format('woff');
12 }
13
14 /* TODO(pedrosimonetti): Find a better way to fix the problem when the 5 /* TODO(pedrosimonetti): Find a better way to fix the problem when the
15 * text scaling preference is set to a high value. 6 * text scaling preference is set to a high value.
16 * 7 *
17 * This CSS rule prevents the promo text from scaling as explained here: 8 * This CSS rule prevents the promo text from scaling as explained here:
18 * https://code.google.com/p/chromium/issues/detail?id=252828#c10 9 * https://code.google.com/p/chromium/issues/detail?id=252828#c10
19 * 10 *
20 * For for background about the problem, see: 11 * For for background about the problem, see:
21 * https://code.google.com/p/chromium/issues/detail?id=466773 12 * https://code.google.com/p/chromium/issues/detail?id=466773
22 */ 13 */
23 #heading, 14 #heading,
24 #description { 15 #description {
25 max-height: 999999px; 16 max-height: 999999px;
26 } 17 }
27 18
28 body { 19 body {
29 font-family: 'Roboto2', sans-serif; 20 font-family: 'Roboto', sans-serif;
30 margin: 0; 21 margin: 0;
31 } 22 }
32 23
33 a { 24 a {
34 text-decoration: none; 25 text-decoration: none;
35 } 26 }
36 27
37 a.colored-link { 28 a.colored-link {
38 color: rgb(66, 133, 244); 29 color: rgb(66, 133, 244);
39 } 30 }
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 .portrait { 78 .portrait {
88 display: block; 79 display: block;
89 } 80 }
90 .landscape { 81 .landscape {
91 display: none; 82 display: none;
92 } 83 }
93 84
94 /* Landscape */ 85 /* Landscape */
95 @media screen and (orientation:landscape) { 86 @media screen and (orientation:landscape) {
96 #heading { 87 #heading {
97 margin-top: 0;
98 /* The heading text and description text should be aligned, therefore 88 /* The heading text and description text should be aligned, therefore
99 * the left margin here will be equal to the header image width (156px) 89 * the left margin here will be equal to the header image width (156px)
100 * plus its right margin (24px). Therefore the total left should be 90 * plus its right margin (24px). Therefore the total left should be
101 * 156px + 24px = 180px. 91 * 156px + 24px = 180px.
102 */ 92 */
103 margin-left: 180px; 93 margin-left: 180px;
94 margin-top: 0;
104 padding-top: 8px; 95 padding-top: 8px;
105 text-align: left; 96 text-align: left;
106 } 97 }
107 .header-image { 98 .header-image {
108 /* The header image is supposed to be vertically centered when the promo 99 /* The header image is supposed to be vertically centered when the promo
109 * is in landscape mode. For now, we're forcefully moving the image 4 100 * is in landscape mode. For now, we're forcefully moving the image 4
110 * pixels up to make it centered. A better approach would be using CSS 101 * pixels up to make it centered. A better approach would be using CSS
111 * flexbox to properly center it, but this will require changing the 102 * flexbox to properly center it, but this will require changing the
112 * markup and styling of the whole promo, and it could be tricky coming 103 * markup and styling of the whole promo, and it could be tricky coming
113 * up with a single markup that works in both portrait and lanscape modes. 104 * up with a single markup that works in both portrait and lanscape modes.
(...skipping 11 matching lines...) Expand all
125 } 116 }
126 html[dir='rtl'] .landscape { 117 html[dir='rtl'] .landscape {
127 float: right; 118 float: right;
128 } 119 }
129 } 120 }
130 121
131 button { 122 button {
132 background: none; 123 background: none;
133 border: none; 124 border: none;
134 display: inline-block; 125 display: inline-block;
135 font-family: 'Roboto2', sans-serif; 126 font-family: 'Roboto', sans-serif;
136 font-size: 14px; 127 font-size: 14px;
137 margin: 6px 0; 128 margin: 6px 0;
138 /* We use a slightly different top-bottom padding because Roboto has a 129 /* We use a slightly different top-bottom padding because Roboto has a
139 * rendering bug which makes an extra padding to be rendered at the bottom of 130 * rendering bug which makes an extra padding to be rendered at the bottom of
140 * text. 131 * text.
141 */ 132 */
142 padding: 12px 16px 8px; 133 padding: 12px 16px 8px;
143 white-space: nowrap; 134 white-space: nowrap;
144 } 135 }
145 136
146 button .caption { 137 button .caption {
147 text-transform: uppercase; 138 text-transform: uppercase;
148 } 139 }
149 140
150 #optin-button { 141 #optin-button {
151 background: rgb(66, 133, 244); 142 background: rgb(66, 133, 244);
152 background-clip: padding-box; 143 background-clip: padding-box;
153 border-radius: 3px; 144 border-radius: 3px;
154 } 145 }
155 146
156 #optin-button .caption { 147 #optin-button .caption {
157 color: white; 148 color: white;
158 } 149 }
159 150
160 #optout-button .caption { 151 #optout-button .caption {
161 color: rgb(66, 133, 244); 152 color: rgb(66, 133, 244);
162 } 153 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/contextual_search/promo.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698