OLD | NEW |
---|---|
1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
2 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> | 3 <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/paper-button/paper-butt on.html"> | 4 <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-checkbox/paper-ch eckbox.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> |
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap er-dropdown-menu-light.html"> | |
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-listbox/paper-lis tbox.html"> | |
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-slider/paper-slid er.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-slider/paper-slid er.html"> |
9 <link rel="import" href="/device_page/display_layout.html"> | 7 <link rel="import" href="/device_page/display_layout.html"> |
10 <link rel="import" href="/device_page/display_overscan_dialog.html"> | 8 <link rel="import" href="/device_page/display_overscan_dialog.html"> |
9 <link rel="import" href="/md_select_css.html"> | |
11 <link rel="import" href="/settings_shared_css.html"> | 10 <link rel="import" href="/settings_shared_css.html"> |
12 | 11 |
13 <dom-module id="settings-display"> | 12 <dom-module id="settings-display"> |
14 <template> | 13 <template> |
15 <style include="settings-shared"> | 14 <style include="settings-shared md-select"> |
16 .settings-box.embedded { | 15 .settings-box.embedded { |
17 align-self: stretch; | 16 align-self: stretch; |
18 margin-left: 20px; | 17 margin-left: 20px; |
19 padding: 0; | 18 padding: 0; |
20 } | 19 } |
21 | 20 |
22 display-layout { | 21 display-layout { |
23 align-self: stretch; | 22 align-self: stretch; |
24 flex: 1 1; | 23 flex: 1 1; |
25 height: 300px; | 24 height: 300px; |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
69 <paper-slider snaps max-markers="100" step="1" | 68 <paper-slider snaps max-markers="100" step="1" |
70 disabled="[[!enableSetResolution_(selectedDisplay)]]" | 69 disabled="[[!enableSetResolution_(selectedDisplay)]]" |
71 min="0" max="[[maxModeIndex_]]" | 70 min="0" max="[[maxModeIndex_]]" |
72 value="[[selectedModeIndex_]]" | 71 value="[[selectedModeIndex_]]" |
73 immediate-value="{{immediateSelectedModeIndex_}}" | 72 immediate-value="{{immediateSelectedModeIndex_}}" |
74 on-change="onChangeMode_"> | 73 on-change="onChangeMode_"> |
75 </paper-slider> | 74 </paper-slider> |
76 </div> | 75 </div> |
77 <div class="settings-box embedded"> | 76 <div class="settings-box embedded"> |
78 <div class="start textarea">$i18n{displayOrientation}</div> | 77 <div class="start textarea">$i18n{displayOrientation}</div> |
79 <paper-dropdown-menu-light vertical-align="auto" no-label-float> | 78 <div class="md-select-wrapper"> |
80 <paper-listbox class="dropdown-content" | 79 <select id="orientation" class="md-select" |
81 selected="[[selectedDisplay.rotation]]" | 80 on-change="onSetOrientation_"> |
dpapad
2016/10/18 00:14:46
Nit(optional): Consider renaming this to onOrienta
stevenjb
2016/10/18 00:43:10
Done.
| |
82 attr-for-selected="value" | 81 <option value="0">$i18n{displayOrientationStandard}</option> |
83 on-iron-activate="onSetOrientation_"> | 82 <option value="90">90</option> |
84 <button class="dropdown-item" role="option" value="0"> | 83 <option value="180">180</option> |
85 $i18n{displayOrientationStandard} | 84 <option value="270">270</option> |
86 </button> | 85 </select> |
87 <button class="dropdown-item" role="option" value="90">90</button> | 86 <span class="md-select-underline"></span> |
88 <button class="dropdown-item" role="option" value="180">180</button> | 87 </div> |
89 <button class="dropdown-item" role="option" value="270">270</button> | |
90 </paper-listbox> | |
91 </paper-dropdown-menu-light> | |
92 </div> | 88 </div> |
93 <div class="settings-box embedded" | 89 <div class="settings-box embedded" |
94 hidden$="[[selectedDisplay.isInternal]]"> | 90 hidden$="[[selectedDisplay.isInternal]]"> |
95 <paper-button disabled="[[selectedDisplay.isInternal]]" | 91 <paper-button disabled="[[selectedDisplay.isInternal]]" |
96 on-tap="onOverscanTap_"> | 92 on-tap="onOverscanTap_"> |
97 $i18n{displayOverscanPageTitle} | 93 $i18n{displayOverscanPageTitle} |
98 </paper-button> | 94 </paper-button> |
99 </div> | 95 </div> |
100 | 96 |
101 <settings-display-overscan-dialog id="displayOverscan" | 97 <settings-display-overscan-dialog id="displayOverscan" |
102 display-id="{{overscanDisplayId}}"> | 98 display-id="{{overscanDisplayId}}"> |
103 </settings-display-overscan-dialog> | 99 </settings-display-overscan-dialog> |
104 | 100 |
105 </div> | 101 </div> |
106 </template> | 102 </template> |
107 <script src="display.js"></script> | 103 <script src="display.js"></script> |
108 </dom-module> | 104 </dom-module> |
OLD | NEW |