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

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

Issue 2283933002: [MD settings] layout sub-headers in display settings (Closed)
Patch Set: Created 4 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/resources/settings/settings_shared_css.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap er-dropdown-menu.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-listbox/paper-lis tbox.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"> 8 <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"> 9 <link rel="import" href="/device_page/display_layout.html">
10 <link rel="import" href="/device_page/display_overscan_dialog.html"> 10 <link rel="import" href="/device_page/display_overscan_dialog.html">
11 <link rel="import" href="/settings_shared_css.html"> 11 <link rel="import" href="/settings_shared_css.html">
12 12
13 <dom-module id="settings-display"> 13 <dom-module id="settings-display">
14 <template> 14 <template>
15 <style include="settings-shared"> 15 <style include="settings-shared">
16 .display-section {
17 align-self: flex-start;
18 font-size: 100%;
19 font-weight: 500;
20 margin: 10px 0;
21 }
22
23 .settings-box.embedded { 16 .settings-box.embedded {
24 align-self: stretch; 17 align-self: stretch;
25 margin-left: 20px; 18 margin-left: 20px;
26 padding: 0; 19 padding: 0;
27 } 20 }
28 21
29 display-layout { 22 display-layout {
30 align-self: stretch; 23 align-self: stretch;
31 flex: 1 1; 24 flex: 1 1;
32 height: 300px; 25 height: 300px;
33 margin: 10px; 26 margin: 10px;
34 } 27 }
35 28
36 .textarea { 29 .textarea {
37 margin: 10px 0; 30 margin: 10px 0;
38 } 31 }
39 32
40 .info-text { 33 .info-text {
41 color: var(--paper-grey-500); 34 color: var(--paper-grey-500);
42 margin-top: 5px; 35 margin-top: 5px;
43 } 36 }
44 37
45 .settings-box > paper-button:first-child { 38 .settings-box > paper-button:first-child {
46 padding-left: 0 39 padding-left: 0
47 } 40 }
48 </style> 41 </style>
49 <div class="settings-box first layout vertical self-stretch"> 42 <div class="settings-box first layout vertical self-stretch">
50 <div class="display-section">$i18n{displayArrangement}</div> 43 <h2>$i18n{displayArrangement}</h2>
51 <display-layout id="displayLayout" 44 <display-layout id="displayLayout"
52 selected-display="[[selectedDisplay]]" 45 selected-display="[[selectedDisplay]]"
53 on-select-display="onSelectDisplay_"> 46 on-select-display="onSelectDisplay_">
54 </display-layout> 47 </display-layout>
55 </div> 48 </div>
56 <div class="settings-box layout vertical"> 49 <div class="settings-box layout vertical first">
57 <div class="display-section">[[selectedDisplay.name]]</div> 50 <h2>[[selectedDisplay.name]]</h2>
58 <div class="settings-box embedded first"> 51 <div class="settings-box embedded first">
59 <paper-checkbox class="flex" checked="[[isMirrored_(displays)]]" 52 <paper-checkbox class="flex" checked="[[isMirrored_(displays)]]"
60 hidden$="[[!showMirror_(displays)]]" on-tap="onMirroredTap_"> 53 hidden$="[[!showMirror_(displays)]]" on-tap="onMirroredTap_">
61 $i18n{displayMirror} 54 $i18n{displayMirror}
62 </paper-checkbox> 55 </paper-checkbox>
63 <paper-button 56 <paper-button
64 hidden$="[[!showMakePrimary_(selectedDisplay, primaryDisplayId)]]" 57 hidden$="[[!showMakePrimary_(selectedDisplay, primaryDisplayId)]]"
65 on-tap="onMakePrimaryTap_"> 58 on-tap="onMakePrimaryTap_">
66 $i18n{displayMakePrimary} 59 $i18n{displayMakePrimary}
67 </paper-button> 60 </paper-button>
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 </div> 99 </div>
107 100
108 <settings-display-overscan-dialog id="displayOverscan" 101 <settings-display-overscan-dialog id="displayOverscan"
109 display-id="{{overscanDisplayId}}"> 102 display-id="{{overscanDisplayId}}">
110 </settings-display-overscan-dialog> 103 </settings-display-overscan-dialog>
111 104
112 </div> 105 </div>
113 </template> 106 </template>
114 <script src="display.js"></script> 107 <script src="display.js"></script>
115 </dom-module> 108 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/settings_shared_css.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698