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/polymer/v1_0/iron-collapse/iron-coll apse.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-button/paper-butt on.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-spinner/paper-spi nner.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/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"> | 6 <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"> | 7 <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_ item.html"> | 8 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list_ item.html"> |
8 <link rel="import" href="/settings_shared_css.html"> | 9 <link rel="import" href="/settings_shared_css.html"> |
9 | 10 |
10 <dom-module name="network-summary-item"> | 11 <dom-module name="network-summary-item"> |
11 <template> | 12 <template> |
12 <style include="settings-shared"> | 13 <style include="settings-shared"> |
13 paper-spinner { | 14 paper-spinner { |
14 height: 20px; | 15 height: 20px; |
15 margin: 0 20px; | 16 margin: 0 20px; |
16 width: 20px; | 17 width: 20px; |
17 } | 18 } |
18 | 19 |
19 .button-row { | 20 .button-row { |
20 align-items: center; | 21 align-items: center; |
21 border-top: var(--settings-separator-line); | |
22 display: flex; | 22 display: flex; |
23 min-height: var(--settings-row-min-height); | 23 min-height: var(--settings-row-min-height); |
24 } | 24 } |
25 | 25 |
26 #buttons { | 26 #buttons { |
27 align-items: center; | 27 align-items: center; |
28 } | 28 } |
29 | 29 |
30 #deviceEnabledButton { | 30 #deviceEnabledButton { |
31 -webkit-margin-start: 10px; | 31 -webkit-margin-start: 10px; |
(...skipping 21 matching lines...) Expand all Loading... | |
53 </template> | 53 </template> |
54 <template is="dom-if" if="[[enableIsVisible_(deviceState)]]"> | 54 <template is="dom-if" if="[[enableIsVisible_(deviceState)]]"> |
55 <paper-toggle-button id="deviceEnabledButton" | 55 <paper-toggle-button id="deviceEnabledButton" |
56 checked="[[deviceIsEnabled_(deviceState)]]" | 56 checked="[[deviceIsEnabled_(deviceState)]]" |
57 on-tap="onDeviceEnabledTap_"> | 57 on-tap="onDeviceEnabledTap_"> |
58 </paper-toggle-button> | 58 </paper-toggle-button> |
59 </template> | 59 </template> |
60 </div> | 60 </div> |
61 </div> | 61 </div> |
62 </div> | 62 </div> |
63 <template is="dom-if" if="[[expanded]]"> | 63 <template is="dom-if" if="[[domIfIsVisible_(expanded, wasExpanded)]]"> |
64 <div class="list-frame"> | 64 <iron-collapse opened="[[ironCollapseIsOpened_(expanded, wasExpanded)]]"> |
dschuyler
2016/08/18 23:30:18
nit: The function names domIfIsVisible_ and
ironC
stevenjb
2016/08/19 00:20:43
You mean like networkListDomIfIsVisible? That's ge
dschuyler
2016/08/19 21:05:20
This is just a suggestion, feel free to ignore it.
stevenjb
2016/08/22 15:16:02
I appreciate the suggestion, and after some though
| |
65 <cr-network-list id="networkList" max-height="[[maxHeight]]" | 65 <div class="list-frame"> |
66 networks="[[networkStateList]]" opened="{{expanded}}" show-buttons> | 66 <cr-network-list id="networkList" max-height="[[maxHeight]]" |
67 </cr-network-list> | 67 networks="[[networkStateList]]" show-buttons> |
68 <template is="dom-if" | 68 </cr-network-list> |
69 if="[[knownNetworksIsVisible_(activeNetworkState)]]"> | 69 <template is="dom-if" |
70 <div class="button-row" actionable on-tap="onKnownNetworksTap_"> | 70 if="[[knownNetworksIsVisible_(activeNetworkState)]]"> |
71 <a is="action-link">$i18n{knownNetworksButton}</a> | 71 <div class="button-row" actionable on-tap="onKnownNetworksTap_"> |
72 </div> | 72 <a is="action-link">$i18n{knownNetworksButton}</a> |
73 </template> | 73 </div> |
74 </div> | 74 </template> |
75 </div> | |
76 </iron-collapse> | |
75 </template> | 77 </template> |
76 </template> | 78 </template> |
77 <script src="network_summary_item.js"></script> | 79 <script src="network_summary_item.js"></script> |
78 </dom-module> | 80 </dom-module> |
OLD | NEW |