chrome/browser/resources/settings/settings_menu/settings_menu.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_menu/settings_menu.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_main/settings_main.html ('k') | chrome/browser/resources/settings/settings_page/main_page_behavior.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/icons.html">	1 <link rel="import" href="chrome://resources/cr_elements/icons.html">

2 <link rel="import" href="chrome://resources/html/assert.html">	2 <link rel="import" href="chrome://resources/html/assert.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/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-menu/paper-menu.h tml">	5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml">

6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submen u.html">	6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submen u.html">

7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-ripple/paper-ripp le.html">	7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-ripple/paper-ripp le.html">

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

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

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

11	11

12 <dom-module id="settings-menu">	12 <dom-module id="settings-menu">

13 <template>	13 <template>

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

15 #about-menu[about-selected] {	15 #about-menu[about-selected] {

16 color: var(--google-blue-700);	16 color: var(--google-blue-700);

17 }	17 }

18	18

19 iron-icon {	19 iron-icon {

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

(...skipping 188 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
209 <paper-submenu class="page-menu">	209 <paper-submenu class="page-menu">

210 <div about-selected$="[[aboutSelected_]]" class="menu-trigger"	210 <div about-selected$="[[aboutSelected_]]" class="menu-trigger"

211 id="about-menu" on-tap="openPage_" data-path="/help">	211 id="about-menu" on-tap="openPage_" data-path="/help">

212 $i18n{aboutPageTitle}	212 $i18n{aboutPageTitle}

213 </div>	213 </div>

214 </paper-submenu>	214 </paper-submenu>

215 </paper-menu>	215 </paper-menu>

216 </template>	216 </template>

217 <script src="settings_menu.js"></script>	217 <script src="settings_menu.js"></script>

218 </dom-module>	218 </dom-module>

OLD	NEW