chrome/browser/resources/settings/settings_main/settings_main.html - Issue 2840713002: MD Settings: Remove usage of deprecated iron-flex-layout.html.

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 2840713002: MD Settings: Remove usage of deprecated iron-flex-layout.html. (Closed)

Patch Set: Use cr-hidden-style Created 3 years, 7 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

« chrome/browser/resources/settings/downloads_page/downloads_page.html ('K') | « chrome/browser/resources/settings/reset_page/reset_profile_dialog.html ('k') | chrome/browser/resources/settings/settings_page/settings_animated_pages.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/hidden_style_css.html">

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

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

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

4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-announcer/iro n-a11y-announcer.html">	5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-announcer/iro n-a11y-announcer.html">

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

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

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

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

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

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

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

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

12	14

13 <dom-module id="settings-main">	15 <dom-module id="settings-main">

14 <template>	16 <template>

15 <style>	17 <style include="cr-hidden-style">

16 #overscroll {	18 #overscroll {

17 margin-top: 64px;	19 margin-top: 64px;

18 }	20 }

19	21

20 .showing-subpage ~ #overscroll {	22 .showing-subpage ~ #overscroll {

21 display: none;	23 display: none;

22 }	24 }

23	25

24 #noSearchResults {	26 #noSearchResults {

25 align-items: center;	27 align-items: center;

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

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

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

52 </settings-about-page>	54 </settings-about-page>

53 </template>	55 </template>

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

55 </template>	57 </template>

56 <script src="settings_main.js"></script>	58 <script src="settings_main.js"></script>

57 <script src="../search_settings.js"></script>	59 <script src="../search_settings.js"></script>

58 </dom-module>	60 </dom-module>

OLD	NEW