chrome/browser/resources/settings/reset_page/reset_page.html - Issue 1652553002: [MD settings] adjusting heights of settings rows; removing two .css files; unifying settings layout

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/reset_page/reset_page.html

Issue 1652553002: [MD settings] adjusting heights of settings rows; removing two .css files; unifying settings layout (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge with master Created 4 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/privacy_page/privacy_page.html ('k') | chrome/browser/resources/settings/search_page/search_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/polymer/v1_0/polymer/polymer.html">	1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">

2 <link rel="import" href="chrome://md-settings/reset_page/reset_profile_dialog.ht ml">	2 <link rel="import" href="chrome://md-settings/reset_page/reset_profile_dialog.ht ml">

3	3

4 <if expr="chromeos">	4 <if expr="chromeos">

5 <link rel="import" href="chrome://md-settings/reset_page/powerwash_dialog.html">	5 <link rel="import" href="chrome://md-settings/reset_page/powerwash_dialog.html">

6 </if>	6 </if>

7	7

8 <dom-module id="settings-reset-page">	8 <dom-module id="settings-reset-page">

9 <link rel="import" type="css"	9 <link rel="import" type="css" href="chrome://md-settings/settings_shared.css">

10 href="chrome://md-settings/settings_shared.css">

11 <template>	10 <template>

12 <div class="settings-box first" id="resetProfile"	11 <div class="settings-box first two-line" id="resetProfile"

13 on-tap="onShowResetProfileDialog_">	12 on-tap="onShowResetProfileDialog_">

14 <div i18n-content="resetPageTitle"></div>	13 <div>

15 <div i18n-content="resetPageDescription"></div>	14 <div i18n-content="resetPageTitle"></div>

	15 <div class="secondary" i18n-content="resetPageDescription"></div>

	16 </div>

16 </div>	17 </div>

17 <if expr="chromeos">	18 <if expr="chromeos">

18 <div class="settings-box" id="powerwash" on-tap="onShowPowerwashDialog_"	19 <div class="settings-box two-line" id="powerwash"

19 hidden="[[!allowPowerwash_]]">	20 on-tap="onShowPowerwashDialog_" hidden="[[!allowPowerwash_]]">

20 <div i18n-content="powerwashTitle"></div>	21 <div>

21 <div i18n-content="powerwashDescription"></div>	22 <div i18n-content="powerwashTitle"></div>

	23 <div class="secondary" i18n-content="powerwashDescription"></div>

	24 </div>

22 </div>	25 </div>

23 </if>	26 </if>

24 </template>	27 </template>

25 <script src="chrome://md-settings/reset_page/reset_page.js"></script>	28 <script src="chrome://md-settings/reset_page/reset_page.js"></script>

26 </dom-module>	29 </dom-module>

OLD	NEW