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

Side by Side Diff: chrome/browser/resources/settings/internet_page/network_summary_item.html

Issue 2167473002: MD Settings: Internet: Reduce use of hidden for complex sections. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
5 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> 5 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html">
6 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list. html"> 6 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list. html">
7 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list_ network_item.html"> 7 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list_ network_item.html">
8 <link rel="import" href="/settings_shared_css.html"> 8 <link rel="import" href="/settings_shared_css.html">
9 9
10 <dom-module name="network-summary-item"> 10 <dom-module name="network-summary-item">
11 <template> 11 <template>
12 <style include="settings-shared"> 12 <style include="settings-shared">
13 :host { 13 :host {
14 --cr-network-icon-mixin: { 14 --cr-network-icon-mixin: {
15 height: 24px; 15 height: 24px;
16 left: -4px; 16 left: -4px;
17 width: 24px; 17 width: 24px;
18 } 18 }
19 --cr-network-name-mixin: { 19 --cr-network-name-mixin: {
20 font-size: inherit; 20 font-size: inherit;
21 }; 21 };
22 --cr-network-state-mixin: { 22 --cr-network-state-mixin: {
23 @apply(--settings-secondary); 23 @apply(--settings-secondary);
24 font-size: inherit; 24 font-size: inherit;
25 }; 25 };
26 } 26 }
27 27
28 paper-spinner {
29 -webkit-margin-start: 20px;
30 }
31
32 .button-row {
33 align-items: center;
34 border-top: var(--settings-separator-line);
35 display: flex;
36 min-height: var(--settings-row-min-height);
37 }
38
28 #buttons { 39 #buttons {
29 align-items: center; 40 align-items: center;
30 } 41 }
31 42
32 .invisible {
33 visibility: hidden;
34 }
35
36 paper-spinner {
37 -webkit-margin-start: 20px;
38 }
39
40 #deviceEnabledButton { 43 #deviceEnabledButton {
41 -webkit-margin-start: 10px; 44 -webkit-margin-start: 10px;
42 } 45 }
43 46
44 #networkList { 47 #networkList {
45 margin: 5px 0 10px; 48 margin: 5px 0 10px;
46 max-height: 400px; 49 max-height: 400px;
47 } 50 }
48 </style> 51 </style>
49 <div class="settings-box two-line" hidden$="[[isHidden]]"> 52 <div class="settings-box two-line">
50 <div id="details" class="start" on-tap="onDetailsTap_" actionable> 53 <div id="details" class="start" on-tap="onDetailsTap_" actionable>
51 <cr-network-list-network-item id="detailsItem" network-state="[[networkS tate]]" show-buttons> 54 <cr-network-list-network-item id="detailsItem"
55 network-state="[[activeNetworkState]]" show-buttons>
52 </cr-network-list-network-item> 56 </cr-network-list-network-item>
53 <paper-spinner active="[[showScanning_(deviceState, expanded)]]"> 57 <paper-spinner active="[[showScanning_(deviceState, expanded)]]">
54 </paper-spinner> 58 </paper-spinner>
55 </div> 59 </div>
56 <div> 60 <div>
57 <div id="buttons" class="layout horizontal"> 61 <div id="buttons" class="layout horizontal">
58 <cr-expand-button id="expandListButton" 62 <template is="dom-if"
59 class$="[[getExpandButtonClass_(deviceState, networkStateList)]]" 63 if="[[expandIsVisible_(deviceState, networkStateList)]]">
60 expanded="{{expanded}}"> 64 <cr-expand-button id="expandListButton" expanded="{{expanded}}">
61 </cr-expand-button> 65 </cr-expand-button>
62 <paper-toggle-button id="deviceEnabledButton" 66 </template>
63 checked="[[deviceIsEnabled_(deviceState)]]" 67 <template is="dom-if" if="[[enableIsVisible_(deviceState)]]">
64 class$="[[getDeviceEnabledButtonClass_(deviceState)]]" 68 <paper-toggle-button id="deviceEnabledButton"
65 on-tap="onDeviceEnabledTap_"> 69 checked="[[deviceIsEnabled_(deviceState)]]"
66 </paper-toggle-button> 70 on-tap="onDeviceEnabledTap_">
71 </paper-toggle-button>
72 </template>
67 </div> 73 </div>
68 </div> 74 </div>
69 </div> 75 </div>
70 <template is="dom-if" if="[[expanded]]"> 76 <template is="dom-if" if="[[expanded]]">
71 <div class="list-frame"> 77 <div class="list-frame">
72 <cr-network-list id="networkList" 78 <cr-network-list id="networkList"
73 max-height="[[maxHeight]]" 79 max-height="[[maxHeight]]"
74 networks="[[networkStateList]]" 80 networks="[[networkStateList]]"
75 opened="{{expanded}}" 81 opened="{{expanded}}"
76 show-buttons> 82 show-buttons>
77 </cr-network-list> 83 </cr-network-list>
78 <div class="layout horizontal"> 84 <template is="dom-if"
79 <paper-button 85 if="[[knownNetworksIsVisible_(activeNetworkState)]]">
80 hidden$="[[!showKnownNetworks_(networkState, expanded)]]" 86 <div class="button-row">
81 on-tap="onKnownNetworksTap_"> 87 <paper-button on-tap="onKnownNetworksTap_">
82 Known networks 88 Known networks
83 </paper-button> 89 </paper-button>
84 </div> 90 </div>
91 </template>
85 </div> 92 </div>
86 </template> 93 </template>
87 </template> 94 </template>
88 <script src="network_summary_item.js"></script> 95 <script src="network_summary_item.js"></script>
89 </dom-module> 96 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698