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

Side by Side Diff: ui/webui/resources/webui_resources.grd

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 | « ui/webui/resources/roboto/roboto-regular-latin.woff2 ('k') | 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 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- This comment is only here because changes to resources are not picked up 2 <!-- This comment is only here because changes to resources are not picked up
3 without changes to the corresponding grd file. --> 3 without changes to the corresponding grd file. -->
4 <grit latest_public_release="0" current_release="1"> 4 <grit latest_public_release="0" current_release="1">
5 <outputs> 5 <outputs>
6 <output filename="grit/webui_resources.h" type="rc_header"> 6 <output filename="grit/webui_resources.h" type="rc_header">
7 <emit emit_type='prepend'></emit> 7 <emit emit_type='prepend'></emit>
8 </output> 8 </output>
9 <output filename="grit/webui_resources_map.cc" 9 <output filename="grit/webui_resources_map.cc"
10 type="resource_file_map_source" /> 10 type="resource_file_map_source" />
11 <output filename="grit/webui_resources_map.h" type="resource_map_header" /> 11 <output filename="grit/webui_resources_map.h" type="resource_map_header" />
12 <output filename="webui_resources.pak" type="data_package" /> 12 <output filename="webui_resources.pak" type="data_package" />
13 </outputs> 13 </outputs>
14 <release seq="1"> 14 <release seq="1">
15 <includes> 15 <includes>
16 <include name="IDR_WEBUI_I18N_TEMPLATE_JS" file="js/i18n_template.js" flat tenhtml="true" type="BINDATA" /> 16 <include name="IDR_WEBUI_I18N_TEMPLATE_JS" file="js/i18n_template.js" flat tenhtml="true" type="BINDATA" />
17 <include name="IDR_WEBUI_I18N_TEMPLATE_POLYMER_JS" file="js/i18n_template_ polymer.js" flattenhtml="true" type="BINDATA" /> 17 <include name="IDR_WEBUI_I18N_TEMPLATE_POLYMER_JS" file="js/i18n_template_ polymer.js" flattenhtml="true" type="BINDATA" />
18 <include name="IDR_WEBUI_JSTEMPLATE_JS" file="js/jstemplate_compiled.js" f lattenhtml="true" type="BINDATA" /> 18 <include name="IDR_WEBUI_JSTEMPLATE_JS" file="js/jstemplate_compiled.js" f lattenhtml="true" type="BINDATA" />
19 <include name="IDR_WEBUI_ANALYTICS_JS" file="js/analytics.js" flattenhtml= "true" type="BINDATA" /> 19 <include name="IDR_WEBUI_ANALYTICS_JS" file="js/analytics.js" flattenhtml= "true" type="BINDATA" />
20 <!-- Roboto Font --> 20 <!-- Roboto Font -->
21 <include name="IDR_WEBUI_ROBOTO_ROBOTO_WOFF" file="roboto/roboto.woff" ty pe="BINDATA" /> 21 <include name="IDR_WEBUI_ROBOTO_ROBOTO_REGULAR_LATIN_WOFF2" file="roboto/r oboto-regular-latin.woff2" type="BINDATA" />
22 <include name="IDR_WEBUI_ROBOTO_ROBOTO_WOFF2" file="roboto/roboto.woff2" t ype="BINDATA" /> 22 <include name="IDR_WEBUI_ROBOTO_ROBOTO_MEDIUM_LATIN_WOFF2" file="roboto/ro boto-medium-latin.woff2" type="BINDATA" />
23 23
24 <!-- Component apps common image resources - 1x --> 24 <!-- Component apps common image resources - 1x -->
25 <!-- White button --> 25 <!-- White button -->
26 <include name="IDR_WEBUI_IMAGES_APPS_BUTTON" 26 <include name="IDR_WEBUI_IMAGES_APPS_BUTTON"
27 file="../../resources/default_100_percent/common/button.png" type ="BINDATA" /> 27 file="../../resources/default_100_percent/common/button.png" type ="BINDATA" />
28 <include name="IDR_WEBUI_IMAGES_APPS_BUTTON_PRESSED" 28 <include name="IDR_WEBUI_IMAGES_APPS_BUTTON_PRESSED"
29 file="../../resources/default_100_percent/common/button_pressed.p ng" type="BINDATA" /> 29 file="../../resources/default_100_percent/common/button_pressed.p ng" type="BINDATA" />
30 <include name="IDR_WEBUI_IMAGES_APPS_BUTTON_HOVER" 30 <include name="IDR_WEBUI_IMAGES_APPS_BUTTON_HOVER"
31 file="../../resources/default_100_percent/common/button_hover.png " type="BINDATA" /> 31 file="../../resources/default_100_percent/common/button_hover.png " type="BINDATA" />
32 <include name="IDR_WEBUI_IMAGES_APPS_BUTTON_DISABLED" 32 <include name="IDR_WEBUI_IMAGES_APPS_BUTTON_DISABLED"
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 file="css/menu.css" type="chrome_html" 231 file="css/menu.css" type="chrome_html"
232 flattenhtml="true" /> 232 flattenhtml="true" />
233 <structure name="IDR_WEBUI_CSS_MENU_BUTTON" 233 <structure name="IDR_WEBUI_CSS_MENU_BUTTON"
234 file="css/menu_button.css" type="chrome_html" 234 file="css/menu_button.css" type="chrome_html"
235 flattenhtml="true" /> 235 flattenhtml="true" />
236 <structure name="IDR_WEBUI_CSS_TEXT_DEFAULTS" 236 <structure name="IDR_WEBUI_CSS_TEXT_DEFAULTS"
237 file="css/text_defaults.css" type="chrome_html" /> 237 file="css/text_defaults.css" type="chrome_html" />
238 <structure name="IDR_WEBUI_CSS_OVERLAY" 238 <structure name="IDR_WEBUI_CSS_OVERLAY"
239 file="css/overlay.css" type="chrome_html" 239 file="css/overlay.css" type="chrome_html"
240 flattenhtml="true" /> 240 flattenhtml="true" />
241 <structure name="IDR_WEBUI_CSS_ROBOTO"
242 file="css/roboto.css" type="chrome_html" />
241 <structure name="IDR_WEBUI_CSS_SPINNER" 243 <structure name="IDR_WEBUI_CSS_SPINNER"
242 file="css/spinner.css" type="chrome_html" /> 244 file="css/spinner.css" type="chrome_html" />
243 <structure name="IDR_WEBUI_CSS_TABLE" 245 <structure name="IDR_WEBUI_CSS_TABLE"
244 file="css/table.css" type="chrome_html" /> 246 file="css/table.css" type="chrome_html" />
245 <structure name="IDR_WEBUI_CSS_TABS" 247 <structure name="IDR_WEBUI_CSS_TABS"
246 file="css/tabs.css" type="chrome_html" /> 248 file="css/tabs.css" type="chrome_html" />
247 <structure name="IDR_WEBUI_CSS_THROBBER" 249 <structure name="IDR_WEBUI_CSS_THROBBER"
248 file="css/throbber.css" type="chrome_html" /> 250 file="css/throbber.css" type="chrome_html" />
249 <structure name="IDR_WEBUI_CSS_TRASH" 251 <structure name="IDR_WEBUI_CSS_TRASH"
250 file="css/trash.css" type="chrome_html" /> 252 file="css/trash.css" type="chrome_html" />
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 type="chrome_html" /> 392 type="chrome_html" />
391 <structure name="IDR_WEBUI_JS_UI_ACCOUNT_TWEAKS" 393 <structure name="IDR_WEBUI_JS_UI_ACCOUNT_TWEAKS"
392 file="js/chromeos/ui_account_tweaks.js" 394 file="js/chromeos/ui_account_tweaks.js"
393 type="chrome_html" /> 395 type="chrome_html" />
394 </if> 396 </if>
395 <part file="cr_elements_resources.grdp" /> 397 <part file="cr_elements_resources.grdp" />
396 <part file="polymer_resources.grdp" /> 398 <part file="polymer_resources.grdp" />
397 </structures> 399 </structures>
398 </release> 400 </release>
399 </grit> 401 </grit>
OLDNEW
« no previous file with comments | « ui/webui/resources/roboto/roboto-regular-latin.woff2 ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698