chrome/browser/resources/settings/appearance_page/appearance_fonts_page.html - Issue 2664503004: MD Settings: Make all HTML import href's relative.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/resources/settings/appearance_page/appearance_fonts_page.html

Issue 2664503004: MD Settings: Make all HTML import href's relative. (Closed)

Patch Set: resolve more conflicts Created 3 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 | « chrome/browser/resources/settings/android_apps_page/android_apps_page.html ('k') | chrome/browser/resources/settings/appearance_page/appearance_page.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <link rel="import" href="chrome://resources/cr_elements/cr_slider/cr_slider.html ">	1 <link rel="import" href="chrome://resources/cr_elements/cr_slider/cr_slider.html ">

2 <link rel="import" href="chrome://resources/html/i18n_behavior.html">	2 <link rel="import" href="chrome://resources/html/i18n_behavior.html">

3 <link rel="import" href="chrome://resources/html/polymer.html">	3 <link rel="import" href="chrome://resources/html/polymer.html">

4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">	4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">

5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">	5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">

6 <link rel="import" href="/appearance_page/fonts_browser_proxy.html">	6 <link rel="import" href="fonts_browser_proxy.html">

7 <link rel="import" href="/controls/settings_dropdown_menu.html">	7 <link rel="import" href="../controls/settings_dropdown_menu.html">

8 <link rel="import" href="/i18n_setup.html">	8 <link rel="import" href="../i18n_setup.html">

9 <link rel="import" href="/settings_shared_css.html">	9 <link rel="import" href="../settings_shared_css.html">

10	10

11 <dom-module id="settings-appearance-fonts-page">	11 <dom-module id="settings-appearance-fonts-page">

12 <template>	12 <template>

13 <style include="settings-shared"></style>	13 <style include="settings-shared"></style>

14 <div class="settings-box first">	14 <div class="settings-box first">

15 <div class="start">$i18n{fontSize}</div>	15 <div class="start">$i18n{fontSize}</div>

16 <cr-slider id="sizeSlider"	16 <cr-slider id="sizeSlider"

17 value="{{prefs.webkit.webprefs.default_font_size.value}}"	17 value="{{prefs.webkit.webprefs.default_font_size.value}}"

18 tick-values="[[fontSizeRange_]]"	18 tick-values="[[fontSizeRange_]]"

19 label-min="$i18n{tiny}" label-max="$i18n{huge}">	19 label-min="$i18n{tiny}" label-max="$i18n{huge}">

(...skipping 96 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
116 <div>$i18n{advancedFontSettings}</div>	116 <div>$i18n{advancedFontSettings}</div>

117 <div class="secondary" id="advancedButtonSublabel">	117 <div class="secondary" id="advancedButtonSublabel">

118 [[advancedExtensionSublabel_]]	118 [[advancedExtensionSublabel_]]

119 </div>	119 </div>

120 </div>	120 </div>

121 <button class="icon-external" is="paper-icon-button-light"></button>	121 <button class="icon-external" is="paper-icon-button-light"></button>

122 </div>	122 </div>

123 </template>	123 </template>

124 <script src="appearance_fonts_page.js"></script>	124 <script src="appearance_fonts_page.js"></script>

125 </dom-module>	125 </dom-module>

OLD	NEW