| 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/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 { | 28 paper-spinner { |
| 29 -webkit-margin-start: 20px; | 29 height: 20px; |
| 30 margin: 0 20px; |
| 31 width: 20px; |
| 30 } | 32 } |
| 31 | 33 |
| 32 .button-row { | 34 .button-row { |
| 33 align-items: center; | 35 align-items: center; |
| 34 border-top: var(--settings-separator-line); | 36 border-top: var(--settings-separator-line); |
| 35 display: flex; | 37 display: flex; |
| 36 min-height: var(--settings-row-min-height); | 38 min-height: var(--settings-row-min-height); |
| 37 } | 39 } |
| 38 | 40 |
| 39 #buttons { | 41 #buttons { |
| 40 align-items: center; | 42 align-items: center; |
| 41 } | 43 } |
| 42 | 44 |
| 43 #deviceEnabledButton { | 45 #deviceEnabledButton { |
| 44 -webkit-margin-start: 10px; | 46 -webkit-margin-start: 10px; |
| 45 } | 47 } |
| 46 | 48 |
| 47 #networkList { | 49 #networkList { |
| 48 margin: 5px 0 10px; | 50 margin: 5px 0 10px; |
| 49 max-height: 400px; | 51 max-height: 400px; |
| 50 } | 52 } |
| 51 </style> | 53 </style> |
| 52 <div class="settings-box two-line"> | 54 <div class="settings-box two-line"> |
| 53 <div id="details" class="start" on-tap="onDetailsTap_" actionable> | 55 <div id="details" actionable class="start layout horizontal center" |
| 54 <cr-network-list-network-item id="detailsItem" | 56 on-tap="onDetailsTap_"> |
| 57 <cr-network-list-network-item class="flex" |
| 55 network-state="[[activeNetworkState]]" show-buttons> | 58 network-state="[[activeNetworkState]]" show-buttons> |
| 56 </cr-network-list-network-item> | 59 </cr-network-list-network-item> |
| 57 <paper-spinner active="[[showScanning_(deviceState, expanded)]]"> | 60 <paper-spinner active="[[showScanning_(deviceState, expanded)]]"> |
| 58 </paper-spinner> | 61 </paper-spinner> |
| 59 </div> | 62 </div> |
| 60 <div> | 63 <div> |
| 61 <div id="buttons" class="layout horizontal"> | 64 <div id="buttons" class="layout horizontal"> |
| 62 <template is="dom-if" | 65 <template is="dom-if" |
| 63 if="[[expandIsVisible_(deviceState, networkStateList)]]"> | 66 if="[[expandIsVisible_(deviceState, networkStateList)]]"> |
| 64 <cr-expand-button id="expandListButton" expanded="{{expanded}}"> | 67 <cr-expand-button id="expandListButton" expanded="{{expanded}}"> |
| (...skipping 22 matching lines...) Expand all Loading... |
| 87 <paper-button on-tap="onKnownNetworksTap_"> | 90 <paper-button on-tap="onKnownNetworksTap_"> |
| 88 Known networks | 91 Known networks |
| 89 </paper-button> | 92 </paper-button> |
| 90 </div> | 93 </div> |
| 91 </template> | 94 </template> |
| 92 </div> | 95 </div> |
| 93 </template> | 96 </template> |
| 94 </template> | 97 </template> |
| 95 <script src="network_summary_item.js"></script> | 98 <script src="network_summary_item.js"></script> |
| 96 </dom-module> | 99 </dom-module> |
| OLD | NEW |