| OLD | NEW |
| 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/classe
s/iron-flex-layout.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"> |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 align-self: stretch; | 33 align-self: stretch; |
| 34 flex: 1 1; | 34 flex: 1 1; |
| 35 height: 300px; | 35 height: 300px; |
| 36 margin: 10px; | 36 margin: 10px; |
| 37 } | 37 } |
| 38 | 38 |
| 39 .textarea { | 39 .textarea { |
| 40 margin: 10px 0; | 40 margin: 10px 0; |
| 41 } | 41 } |
| 42 | 42 |
| 43 .title-text { | |
| 44 margin-top: 10px; | |
| 45 } | |
| 46 | |
| 47 .settings-box > paper-button:first-child { | 43 .settings-box > paper-button:first-child { |
| 48 -webkit-padding-start: 0 | 44 -webkit-padding-start: 0 |
| 49 } | 45 } |
| 50 | 46 |
| 51 paper-tab { | 47 paper-tab { |
| 52 text-transform: uppercase; | 48 text-transform: uppercase; |
| 53 } | 49 } |
| 54 | 50 |
| 55 #controlsDiv > .settings-box:first-of-type { | 51 #controlsDiv > .settings-box:first-of-type { |
| 56 border-top: none; | 52 border-top: none; |
| 57 } | 53 } |
| 58 </style> | 54 </style> |
| 59 <div class="settings-box first layout vertical self-stretch"> | 55 <div class="settings-box first layout vertical self-stretch"> |
| 60 <div class="title-text layout self-start"> | 56 <h2 class="layout self-start"> |
| 61 $i18n{displayArrangementTitle} | 57 $i18n{displayArrangementTitle} |
| 62 </div> | 58 </h2> |
| 63 <div class="secondary layout self-start" | 59 <div class="secondary layout self-start" |
| 64 hidden="[[!hasMultipleDisplays_(displays)]]"> | 60 hidden="[[!hasMultipleDisplays_(displays)]]"> |
| 65 $i18n{displayArrangementText} | 61 $i18n{displayArrangementText} |
| 66 </div> | 62 </div> |
| 67 <display-layout id="displayLayout" | 63 <display-layout id="displayLayout" |
| 68 selected-display="[[selectedDisplay]]" | 64 selected-display="[[selectedDisplay]]" |
| 69 on-select-display="onSelectDisplay_"> | 65 on-select-display="onSelectDisplay_"> |
| 70 </display-layout> | 66 </display-layout> |
| 71 </div> | 67 </div> |
| 72 <div hidden="[[!hasMultipleDisplays_(displays)]]" class="settings-box"> | 68 <div hidden="[[!hasMultipleDisplays_(displays)]]" class="settings-box"> |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 </div> | 192 </div> |
| 197 </div> | 193 </div> |
| 198 <button class="subpage-arrow" is="paper-icon-button-light" | 194 <button class="subpage-arrow" is="paper-icon-button-light" |
| 199 aria-label="$i18n{displayTouchCalibrationTitle}" | 195 aria-label="$i18n{displayTouchCalibrationTitle}" |
| 200 aria-describedby="touchCalibrationSecondary"></button> | 196 aria-describedby="touchCalibrationSecondary"></button> |
| 201 </div> | 197 </div> |
| 202 </div> | 198 </div> |
| 203 </template> | 199 </template> |
| 204 <script src="display.js"></script> | 200 <script src="display.js"></script> |
| 205 </dom-module> | 201 </dom-module> |
| OLD | NEW |