chrome/browser/resources/settings/date_time_page/date_time_page.html - Issue 1137063002: Convert date_time_page to 0.8.

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

Issue 1137063002: Convert date_time_page to 0.8. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Escape ampersand in XML file. Created 5 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/date_time_page/date_time_page.css ('K') | « chrome/browser/resources/settings/date_time_page/date_time_page.css ('k') | chrome/browser/resources/settings/date_time_page/date_time_page.js » ('j') | chrome/browser/resources/settings/date_time_page/date_time_page.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <link rel="import" href="chrome://md-settings/checkbox/checkbox.html">	1 <link rel="import" href="chrome://md-settings/checkbox/checkbox.html">

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

3 <link rel="import" href="chrome://resources/polymer/core-label/core-label.html">	3 <link rel="import" href="chrome://resources/polymer/v0_8/paper-material/paper-ma terial.html">

4 <link rel="import" href="chrome://resources/polymer/core-menu/core-menu.html">

5 <link rel="import" href="chrome://resources/polymer/paper-item/paper-item.html">

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

7 <link rel="import" href="date_time_page_style.html">

8	4

9 <polymer-element name="cr-settings-date-time-page">	5 <dom-module id="cr-settings-date-time-page">

	6 <link rel="import" type="css" href="date_time_page.css">

	7 <link rel="stylesheet" href="chrome://md-settings/settings_page/settings_page. css">
	Jeremy Klein 2015/05/11 21:20:48 I think this still needs to be rel="import" type=" I think this still needs to be rel="import" type="css" Kyle Horimoto 2015/05/11 21:34:58 Done. Show quoted text On 2015/05/11 21:20:48, Jeremy Klein wrote: > I think this still needs to be rel="import" type="css" Done.
10 <template>	8 <template>

11 <link rel="stylesheet" href="chrome://md-settings/settings_page/settings_pag e.css">	9 <paper-material class="layout veritcal cross-fade">
	Jeremy Klein 2015/05/11 21:20:48 This probably requires importing classes/iron-flex This probably requires importing classes/iron-flex-layout.html, but it may be easier to do these in css now. Side note - is cross-fade also a class now? Kyle Horimoto 2015/05/11 21:34:58 Imported the layout, and removed cross-fade as dis Show quoted text On 2015/05/11 21:20:48, Jeremy Klein wrote: > This probably requires importing classes/iron-flex-layout.html, but it may be > easier to do these in css now. > > Side note - is cross-fade also a class now? Imported the layout, and removed cross-fade as discussed offline.
12 <core-style ref="dateTimePageStyle"></core-style>	10 <div class="horizontal layout center">

13 <paper-shadow layout vertical cross-fade>	11 <span class="time-zone-label" i18n-content="dateTimeTimeZoneLabel"></spa n>

14 <div horizontal layout center>

15 <core-label horizontal layout center>

16 <span class="time-zone-label" i18n-content="dateTimeTimeZoneLabel"></s pan>

17 </core-label>

18 </div>	12 </div>

19 <cr-settings-checkbox	13 <cr-settings-checkbox

20 pref="{{prefs.settings.settings.clock.use_24hour_clock}}"	14 pref="{{prefs.settings.settings.clock.use_24hour_clock}}"

21 i18n-values="label:dateTime24HourClockLabel">	15 i18n-values="label:dateTime24HourClockLabel">

22 </cr-settings-checkbox>	16 </cr-settings-checkbox>

23 <span id="setAutomatically" i18n-content="dateTimeAutomaticallySet"></span >	17 <span id="setAutomatically" i18n-content="dateTimeAutomaticallySet"></span >

24 </paper-shadow>	18 </paper-material>

25 </template>	19 </template>

26 <script src="date_time_page.js"></script>	20 <script src="date_time_page.js"></script>

27 </polymer-element>	21 </dom-module>

OLD	NEW