chrome/browser/resources/settings/settings_page/settings_subpage.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/settings_page/settings_subpage.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/settings_page/settings_section.html ('k') | chrome/browser/resources/settings/settings_page_css.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/polymer/v1_0/iron-resizable-behavior /iron-resizable-behavior.html">	2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-resizable-behavior /iron-resizable-behavior.html">

3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable-behavior.html">	3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable-behavior.html">

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

5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html">	5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html">

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

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

8 <link rel="import" href="/settings_page/settings_subpage_search.html">	8 <link rel="import" href="settings_subpage_search.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-subpage">	11 <dom-module id="settings-subpage">

12 <template>	12 <template>

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

14 :host {	14 :host {

15 --iron-icon-fill-color: var(--settings-nav-grey);	15 --iron-icon-fill-color: var(--settings-nav-grey);

16 display: block;	16 display: block;

17 padding-bottom: 60px;	17 padding-bottom: 60px;

18 }	18 }

19	19

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
59 </template>	59 </template>

60 <template is="dom-if" if="[[showSpinner]]">	60 <template is="dom-if" if="[[showSpinner]]">

61 <paper-spinner active></paper-spinner>	61 <paper-spinner active></paper-spinner>

62 </template>	62 </template>

63 <content select=".subpage-title-extra"></content>	63 <content select=".subpage-title-extra"></content>

64 </div>	64 </div>

65 <content></content>	65 <content></content>

66 </template>	66 </template>

67 <script src="settings_subpage.js"></script>	67 <script src="settings_subpage.js"></script>

68 </dom-module>	68 </dom-module>

OLD	NEW