chrome/browser/resources/settings/site_settings/zoom_levels.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/site_settings/zoom_levels.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/site_settings/usb_devices.html ('k') | chrome/browser/resources/settings/site_settings_page/site_settings_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/html/polymer.html">	1 <link rel="import" href="chrome://resources/html/polymer.html">

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

3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">	3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.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="/i18n_setup.html">	5 <link rel="import" href="../i18n_setup.html">

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

7 <link rel="import" href="/site_settings/site_settings_behavior.html">	7 <link rel="import" href="site_settings_behavior.html">

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

9	9

10 <dom-module id="zoom-levels">	10 <dom-module id="zoom-levels">

11 <template>	11 <template>

12 <style include="settings-shared">	12 <style include="settings-shared">

13 :host {	13 :host {

14 display: block;	14 display: block;

15 }	15 }

16	16

17 .empty-message {	17 .empty-message {

18 margin-top: 15px;	18 margin-top: 15px;

(...skipping 18 matching lines...) Expand all Loading...
37 </template>	37 </template>

38 <template is="dom-if" if="{{!renderedCount}}">	38 <template is="dom-if" if="{{!renderedCount}}">

39 <div class="empty-message" id="empty">	39 <div class="empty-message" id="empty">

40 $i18n{siteSettingsNoZoomedSites}	40 $i18n{siteSettingsNoZoomedSites}

41 </div>	41 </div>

42 </template>	42 </template>

43 </div>	43 </div>

44 </template>	44 </template>

45 <script src="zoom_levels.js"></script>	45 <script src="zoom_levels.js"></script>

46 </dom-module>	46 </dom-module>

OLD	NEW