chrome/browser/resources/settings/device_page/display.html - Issue 2664503004: MD Settings: Make all HTML import href's relative.

Side by Side Diff: chrome/browser/resources/settings/device_page/display.html

Issue 2664503004: MD Settings: Make all HTML import href's relative. (Closed)

Patch Set: resolve more conflicts Created 3 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:

« no previous file with comments | « chrome/browser/resources/settings/device_page/device_page.html ('k') | chrome/browser/resources/settings/device_page/display_layout.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/cr_slider/cr_slider.html ">	1 <link rel="import" href="chrome://resources/cr_elements/cr_slider/cr_slider.html ">

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

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

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

5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">	5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">

6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">	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-icon-button/paper -icon-button-light.html">	7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">

8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-tabs/paper-tabs.h tml">	8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-tabs/paper-tabs.h tml">

9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">	9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">

10 <link rel="import" href="/device_page/display_layout.html">	10 <link rel="import" href="display_layout.html">

11 <link rel="import" href="/device_page/display_overscan_dialog.html">	11 <link rel="import" href="display_overscan_dialog.html">

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

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

14	14

15 <dom-module id="settings-display">	15 <dom-module id="settings-display">

16 <template>	16 <template>

17 <style include="settings-shared md-select">	17 <style include="settings-shared md-select">

18 .settings-box.embedded {	18 .settings-box.embedded {

19 -webkit-margin-start: 20px;	19 -webkit-margin-start: 20px;

20 align-self: stretch;	20 align-self: stretch;

21 padding: 0;	21 padding: 0;

22 }	22 }

23	23

(...skipping 127 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
151 <div class="start">	151 <div class="start">

152 <div>$i18n{displayTouchCalibrationTitle}</div>	152 <div>$i18n{displayTouchCalibrationTitle}</div>

153 <div class="secondary">$i18n{displayTouchCalibrationText}</div>	153 <div class="secondary">$i18n{displayTouchCalibrationText}</div>

154 </div>	154 </div>

155 <button class="subpage-arrow" is="paper-icon-button-light"></button>	155 <button class="subpage-arrow" is="paper-icon-button-light"></button>

156 </div>	156 </div>

157 </div>	157 </div>

158 </template>	158 </template>

159 <script src="display.js"></script>	159 <script src="display.js"></script>

160 </dom-module>	160 </dom-module>

OLD	NEW