chrome/browser/resources/settings/settings_main/settings_main.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_main/settings_main.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

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

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

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

4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">	4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">

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

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

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

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

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

10	10

11 <dom-module id="settings-main">	11 <dom-module id="settings-main">

12 <template>	12 <template>

13 <style>	13 <style>

14 #overscroll {	14 #overscroll {

15 margin-top: 64px;	15 margin-top: 64px;

16 }	16 }

17	17

18 #noSearchResults {	18 #noSearchResults {

19 align-items: center;	19 align-items: center;

(...skipping 23 matching lines...) Expand all Loading...
43 </template>	43 </template>

44 <template is="dom-if" if="[[showPages_.about]]">	44 <template is="dom-if" if="[[showPages_.about]]">

45 <settings-about-page in-search-mode="[[inSearchMode_]]">	45 <settings-about-page in-search-mode="[[inSearchMode_]]">

46 </settings-about-page>	46 </settings-about-page>

47 </template>	47 </template>

48 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div>	48 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div>

49 </template>	49 </template>

50 <script src="settings_main.js"></script>	50 <script src="settings_main.js"></script>

51 <script src="../search_settings.js"></script>	51 <script src="../search_settings.js"></script>

52 </dom-module>	52 </dom-module>

OLD	NEW