chrome/browser/resources/settings/settings_main/settings_main.html - Issue 990473002: Add initial implementation of date-time-settings MD settings page.

Side by Side Diff: chrome/browser/resources/settings/settings_main/settings_main.html

Issue 990473002: Add initial implementation of date-time-settings MD settings page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing issues Created 5 years, 8 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/a11y_page/a11y_page.html ('K') | « chrome/browser/resources/settings/prefs/prefs.js ('k') | chrome/browser/resources/settings/settings_page/settings_page_header.html » ('j') | chrome/browser/resources/settings/settings_page/settings_page_header.html » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

2 <link rel="import" href="chrome://resources/polymer/core-animated-pages/core-ani mated-pages.html">	2 <link rel="import" href="chrome://resources/polymer/core-animated-pages/core-ani mated-pages.html">

3 <link rel="import" href="chrome://resources/polymer/core-transition/core-transit ion.html">	3 <link rel="import" href="chrome://resources/polymer/core-transition/core-transit ion.html">

4 <link rel="import" href="chrome://resources/polymer/paper-shadow/paper-shadow.ht ml">	4 <link rel="import" href="chrome://resources/polymer/paper-shadow/paper-shadow.ht ml">

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

	6 <link rel="import" href="chrome://md-settings/date_time_page/date_time_page.html ">

6 <link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html ">	7 <link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html ">

7	8

8 <polymer-element name="cr-settings-main">	9 <polymer-element name="cr-settings-main">

9 <template>	10 <template>

10 <link rel="stylesheet" href="settings_main.css">	11 <link rel="stylesheet" href="settings_main.css">

11 <div id="outer">	12 <div id="outer">

12 <content select="core-icon-button"></content>	13 <content select="core-icon-button"></content>

13 <core-animated-pages id="pageContainer" selected="{{selectedPageId}}"	14 <core-animated-pages id="pageContainer" selected="{{selectedPageId}}"

14 valueattr="PAGE_ID" transitions="cross-fade">	15 valueattr="PAGE_ID" transitions="cross-fade">

15 <cr-settings-a11y-page prefs="{{prefs}}"></cr-settings-a11y-page>	16 <cr-settings-a11y-page prefs="{{prefs}}"></cr-settings-a11y-page>

	17 <if expr="chromeos">
	michaelpg 2015/04/07 06:00:29 <if> tags should be 0-aligned, i.e. not indented a <if> tags should be 0-aligned, i.e. not indented at all. Oren Blasberg 2015/04/07 23:25:59 Done. BTW, why is that? Show quoted text On 2015/04/07 06:00:29, michaelpg wrote: > <if> tags should be 0-aligned, i.e. not indented at all. Done. BTW, why is that? michaelpg 2015/04/10 08:01:04 It is just The Way Of Things. Interestingly, the Show quoted text On 2015/04/07 23:25:59, Oren Blasberg wrote: > On 2015/04/07 06:00:29, michaelpg wrote: > > <if> tags should be 0-aligned, i.e. not indented at all. > > Done. BTW, why is that? It is just The Way Of Things. Interestingly, the style guide doesn't say whether or not <if> should be indented: https://www.chromium.org/developers/web-development-style-guide And the example used does indent the inner HTML of the <if> tag. But most of chromium's HTML I've seen 0-aligns <if> tags (just like C++ #ifdef tags), and generally doesn't indent the inner HTML (again like #ifdef tags). James Hawkins 2015/04/10 15:03:55 That portion of the style guide is ambiguous becau Show quoted text On 2015/04/10 08:01:04, michaelpg wrote: > On 2015/04/07 23:25:59, Oren Blasberg wrote: > > On 2015/04/07 06:00:29, michaelpg wrote: > > > <if> tags should be 0-aligned, i.e. not indented at all. > > > > Done. BTW, why is that? > > It is just The Way Of Things. > > Interestingly, the style guide doesn't say whether or not <if> should be > indented: > https://www.chromium.org/developers/web-development-style-guide > > And the example used does indent the inner HTML of the <if> tag. > > But most of chromium's HTML I've seen 0-aligns <if> tags (just like C++ #ifdef > tags), and generally doesn't indent the inner HTML (again like #ifdef tags). That portion of the style guide is ambiguous because there is no <body> with which to reference the indentation of the rest of the example HTML. The <if> should behave like #if and similar macros in C++, i.e., zero indentation. The content inside the <if> should be aligned with respect to the surrounding HTML as though the <if> did not exist, e.g., <div> <if> <span>My Content</span> </if> </div>
	18 <cr-settings-date-time-page prefs="{{prefs}}">
	michaelpg 2015/04/07 06:00:29 and this line should not be indented relative to t and this line should not be indented relative to the line before the <if>, i.e., delete 2 leading spaces here. Oren Blasberg 2015/04/07 23:25:59 Done. Show quoted text On 2015/04/07 06:00:29, michaelpg wrote: > and this line should not be indented relative to the line before the <if>, i.e., > delete 2 leading spaces here. Done.
	19 </cr-settings-date-time-page>

	20 </if>

16 <cr-settings-downloads-page prefs="{{prefs}}">	21 <cr-settings-downloads-page prefs="{{prefs}}">

17 </cr-settings-downloads-page>	22 </cr-settings-downloads-page>

18 </core-animated-pages>	23 </core-animated-pages>

19 </div>	24 </div>

20 </template>	25 </template>

21 <script src="settings_main.js"></script>	26 <script src="settings_main.js"></script>

22 </polymer-element>	27 </polymer-element>

OLD	NEW