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

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

Issue 2128773004: MD Settings: Display: Add mirroring and other fixes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_625106_settings_dropdown_style
Patch Set: Fix drag + mirrored, cleanup, feedback Created 4 years, 5 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/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">
(...skipping 21 matching lines...) Expand all
32 height: 300px; 32 height: 300px;
33 margin: 10px; 33 margin: 10px;
34 } 34 }
35 35
36 .textarea { 36 .textarea {
37 margin: 10px 0; 37 margin: 10px 0;
38 } 38 }
39 39
40 .info-text { 40 .info-text {
41 color: var(--paper-grey-500); 41 color: var(--paper-grey-500);
42 margin-top: 5px;
42 } 43 }
43 44
44 .settings-box > paper-button:first-child { 45 .settings-box > paper-button:first-child {
45 padding-left: 0 46 padding-left: 0
46 } 47 }
47 </style> 48 </style>
48 <div class="settings-box first layout vertical self-stretch"> 49 <div class="settings-box first layout vertical self-stretch">
49 <div class="display-section">$i18n{displayArrangement}</div> 50 <div class="display-section">$i18n{displayArrangement}</div>
50 <display-layout id="displayLayout" 51 <display-layout id="displayLayout"
51 selected-display="[[selectedDisplay]]" 52 selected-display="[[selectedDisplay]]"
(...skipping 23 matching lines...) Expand all
75 <paper-slider snaps max-markers="100" step="1" 76 <paper-slider snaps max-markers="100" step="1"
76 disabled="[[!enableSetResolution_(selectedDisplay)]]" 77 disabled="[[!enableSetResolution_(selectedDisplay)]]"
77 min="0" max="[[maxModeIndex_]]" 78 min="0" max="[[maxModeIndex_]]"
78 value="[[selectedModeIndex_]]" 79 value="[[selectedModeIndex_]]"
79 immediate-value="{{immediateSelectedModeIndex_}}" 80 immediate-value="{{immediateSelectedModeIndex_}}"
80 on-change="onChangeMode_"> 81 on-change="onChangeMode_">
81 </paper-slider> 82 </paper-slider>
82 </div> 83 </div>
83 <div class="settings-box embedded"> 84 <div class="settings-box embedded">
84 <div class="start textarea">$i18n{displayOrientation}</div> 85 <div class="start textarea">$i18n{displayOrientation}</div>
85 <paper-dropdown-menu> 86 <paper-dropdown-menu no-label-float>
86 <paper-listbox class="dropdown-content" 87 <paper-listbox class="dropdown-content"
87 selected="[[selectedDisplay.rotation]]" 88 selected="[[selectedDisplay.rotation]]"
88 attr-for-selected="value" 89 attr-for-selected="value"
89 on-iron-activate="onSetOrientation_"> 90 on-iron-activate="onSetOrientation_">
90 <paper-item value="0">$i18n{displayOrientationStandard} 91 <div class="dropdown-item" value="0">
91 </paper-item> 92 $i18n{displayOrientationStandard}
92 <paper-item value="90">90</paper-item> 93 </div>
93 <paper-item value="180">180</paper-item> 94 <div class="dropdown-item" value="90">90</div>
94 <paper-item value="270">270</paper-item> 95 <div class="dropdown-item" value="180">180</div>
96 <div class="dropdown-item" value="270">270</div>
95 </paper-listbox> 97 </paper-listbox>
96 </paper-dropdown-menu> 98 </paper-dropdown-menu>
97 </div> 99 </div>
98 <div class="settings-box embedded" 100 <div class="settings-box embedded"
99 hidden$="[[selectedDisplay.isInternal]]"> 101 hidden$="[[selectedDisplay.isInternal]]">
100 <paper-button disabled="[[selectedDisplay.isInternal]]" 102 <paper-button disabled="[[selectedDisplay.isInternal]]"
101 on-tap="onOverscanTap_"> 103 on-tap="onOverscanTap_">
102 $i18n{displayOverscanPageTitle} 104 $i18n{displayOverscanPageTitle}
103 </paper-button> 105 </paper-button>
104 </div> 106 </div>
105 107
106 <settings-display-overscan-dialog id="displayOverscan" 108 <settings-display-overscan-dialog id="displayOverscan"
107 display-id="{{overscanDisplayId}}"> 109 display-id="{{overscanDisplayId}}">
108 </settings-display-overscan-dialog> 110 </settings-display-overscan-dialog>
109 111
110 </div> 112 </div>
111 </template> 113 </template>
112 <script src="display.js"></script> 114 <script src="display.js"></script>
113 </dom-module> 115 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698