Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(246)

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

Issue 2848443002: MD Settings: Remove usage of deprecated iron-flex-layout.html, for CrOS. (Closed)
Patch Set: Address more 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
OLDNEW
1 <link rel="import" href="chrome://resources/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.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/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 5 <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-icon-button/paper -icon-button-light.html"> 6 <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-tabs/paper-tabs.h tml"> 7 <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-toggle-button/pap er-toggle-button.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
9 <link rel="import" href="display_layout.html"> 9 <link rel="import" href="display_layout.html">
10 <link rel="import" href="display_overscan_dialog.html"> 10 <link rel="import" href="display_overscan_dialog.html">
11 <link rel="import" href="../controls/settings_slider.html"> 11 <link rel="import" href="../controls/settings_slider.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 iron-flex iron-flex-alignment">
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
24 :host { 24 :host {
25 --paper-tabs-selection-bar-color: var(--paper-blue-500); 25 --paper-tabs-selection-bar-color: var(--paper-blue-500);
26 } 26 }
27 27
(...skipping 15 matching lines...) Expand all
43 .settings-box > paper-button:first-child { 43 .settings-box > paper-button:first-child {
44 -webkit-padding-start: 0 44 -webkit-padding-start: 0
45 } 45 }
46 46
47 paper-tab { 47 paper-tab {
48 text-transform: uppercase; 48 text-transform: uppercase;
49 } 49 }
50 50
51 #controlsDiv > .settings-box:first-of-type { 51 #controlsDiv > .settings-box:first-of-type {
52 border-top: none; 52 border-top: none;
53 } 53 }
54 </style> 54 </style>
55 <div class="settings-box first layout vertical self-stretch"> 55 <div class="settings-box first layout vertical self-stretch">
56 <h2 class="layout self-start"> 56 <h2 class="layout self-start">
57 $i18n{displayArrangementTitle} 57 $i18n{displayArrangementTitle}
58 </h2> 58 </h2>
59 <div class="secondary layout self-start" 59 <div class="secondary layout self-start"
60 hidden="[[!hasMultipleDisplays_(displays)]]"> 60 hidden="[[!hasMultipleDisplays_(displays)]]">
61 $i18n{displayArrangementText} 61 $i18n{displayArrangementText}
62 </div> 62 </div>
63 <display-layout id="displayLayout" 63 <display-layout id="displayLayout"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 </div> 192 </div>
193 </div> 193 </div>
194 <button class="subpage-arrow" is="paper-icon-button-light" 194 <button class="subpage-arrow" is="paper-icon-button-light"
195 aria-label="$i18n{displayTouchCalibrationTitle}" 195 aria-label="$i18n{displayTouchCalibrationTitle}"
196 aria-describedby="touchCalibrationSecondary"></button> 196 aria-describedby="touchCalibrationSecondary"></button>
197 </div> 197 </div>
198 </div> 198 </div>
199 </template> 199 </template>
200 <script src="display.js"></script> 200 <script src="display.js"></script>
201 </dom-module> 201 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698