Chromium Code Reviews| Index: chrome/browser/resources/settings/date_time_page/date_time_page.html |
| diff --git a/chrome/browser/resources/settings/date_time_page/date_time_page.html b/chrome/browser/resources/settings/date_time_page/date_time_page.html |
| index c9e8ff88cb776b42c299b16e92d7cfb8f1109267..41ed1ad8cd559c5dde539ed63e7cf04144be1cc1 100644 |
| --- a/chrome/browser/resources/settings/date_time_page/date_time_page.html |
| +++ b/chrome/browser/resources/settings/date_time_page/date_time_page.html |
| @@ -1,27 +1,21 @@ |
| <link rel="import" href="chrome://md-settings/checkbox/checkbox.html"> |
| <link rel="import" href="chrome://resources/polymer/polymer/polymer.html"> |
| -<link rel="import" href="chrome://resources/polymer/core-label/core-label.html"> |
| -<link rel="import" href="chrome://resources/polymer/core-menu/core-menu.html"> |
| -<link rel="import" href="chrome://resources/polymer/paper-item/paper-item.html"> |
| -<link rel="import" href="chrome://resources/polymer/paper-shadow/paper-shadow.html"> |
| -<link rel="import" href="date_time_page_style.html"> |
| +<link rel="import" href="chrome://resources/polymer/v0_8/paper-material/paper-material.html"> |
| -<polymer-element name="cr-settings-date-time-page"> |
| +<dom-module id="cr-settings-date-time-page"> |
| + <link rel="import" type="css" href="date_time_page.css"> |
| + <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="
Kyle Horimoto
2015/05/11 21:34:58
Done.
|
| <template> |
| - <link rel="stylesheet" href="chrome://md-settings/settings_page/settings_page.css"> |
| - <core-style ref="dateTimePageStyle"></core-style> |
| - <paper-shadow layout vertical cross-fade> |
| - <div horizontal layout center> |
| - <core-label horizontal layout center> |
| - <span class="time-zone-label" i18n-content="dateTimeTimeZoneLabel"></span> |
| - </core-label> |
| + <paper-material class="layout veritcal cross-fade"> |
|
Jeremy Klein
2015/05/11 21:20:48
This probably requires importing classes/iron-flex
Kyle Horimoto
2015/05/11 21:34:58
Imported the layout, and removed cross-fade as dis
|
| + <div class="horizontal layout center"> |
| + <span class="time-zone-label" i18n-content="dateTimeTimeZoneLabel"></span> |
| </div> |
| <cr-settings-checkbox |
| pref="{{prefs.settings.settings.clock.use_24hour_clock}}" |
| i18n-values="label:dateTime24HourClockLabel"> |
| </cr-settings-checkbox> |
| <span id="setAutomatically" i18n-content="dateTimeAutomaticallySet"></span> |
| - </paper-shadow> |
| + </paper-material> |
| </template> |
| <script src="date_time_page.js"></script> |
| -</polymer-element> |
| +</dom-module> |