Index: chrome/browser/resources/settings/internet_page/network_summary_item.html |
diff --git a/chrome/browser/resources/settings/internet_page/network_summary_item.html b/chrome/browser/resources/settings/internet_page/network_summary_item.html |
index c230096c4559e55f5daa817226b71cf54c5b9e30..99b85e914ea9b2c6da0a32b00c5d429ae82d68b5 100644 |
--- a/chrome/browser/resources/settings/internet_page/network_summary_item.html |
+++ b/chrome/browser/resources/settings/internet_page/network_summary_item.html |
@@ -25,16 +25,19 @@ |
}; |
} |
- #buttons { |
- align-items: center; |
+ paper-spinner { |
+ -webkit-margin-start: 20px; |
} |
- .invisible { |
- visibility: hidden; |
+ .button-row { |
+ align-items: center; |
+ border-top: var(--settings-separator-line); |
+ display: flex; |
+ min-height: var(--settings-row-min-height); |
} |
- paper-spinner { |
- -webkit-margin-start: 20px; |
+ #buttons { |
+ align-items: center; |
} |
#deviceEnabledButton { |
@@ -46,24 +49,27 @@ |
max-height: 400px; |
} |
</style> |
- <div class="settings-box two-line" hidden$="[[isHidden]]"> |
+ <div class="settings-box two-line"> |
<div id="details" class="start" on-tap="onDetailsTap_" actionable> |
- <cr-network-list-network-item id="detailsItem" network-state="[[networkState]]" show-buttons> |
+ <cr-network-list-network-item id="detailsItem" |
+ network-state="[[activeNetworkState]]" show-buttons> |
</cr-network-list-network-item> |
<paper-spinner active="[[showScanning_(deviceState, expanded)]]"> |
</paper-spinner> |
</div> |
<div> |
<div id="buttons" class="layout horizontal"> |
- <cr-expand-button id="expandListButton" |
- class$="[[getExpandButtonClass_(deviceState, networkStateList)]]" |
- expanded="{{expanded}}"> |
- </cr-expand-button> |
- <paper-toggle-button id="deviceEnabledButton" |
- checked="[[deviceIsEnabled_(deviceState)]]" |
- class$="[[getDeviceEnabledButtonClass_(deviceState)]]" |
- on-tap="onDeviceEnabledTap_"> |
- </paper-toggle-button> |
+ <template is="dom-if" |
+ if="[[expandIsVisible_(deviceState, networkStateList)]]"> |
+ <cr-expand-button id="expandListButton" expanded="{{expanded}}"> |
+ </cr-expand-button> |
+ </template> |
+ <template is="dom-if" if="[[enableIsVisible_(deviceState)]]"> |
+ <paper-toggle-button id="deviceEnabledButton" |
+ checked="[[deviceIsEnabled_(deviceState)]]" |
+ on-tap="onDeviceEnabledTap_"> |
+ </paper-toggle-button> |
+ </template> |
</div> |
</div> |
</div> |
@@ -75,13 +81,14 @@ |
opened="{{expanded}}" |
show-buttons> |
</cr-network-list> |
- <div class="layout horizontal"> |
- <paper-button |
- hidden$="[[!showKnownNetworks_(networkState, expanded)]]" |
- on-tap="onKnownNetworksTap_"> |
- Known networks |
- </paper-button> |
- </div> |
+ <template is="dom-if" |
+ if="[[knownNetworksIsVisible_(activeNetworkState)]]"> |
+ <div class="button-row"> |
+ <paper-button on-tap="onKnownNetworksTap_"> |
+ Known networks |
+ </paper-button> |
+ </div> |
+ </template> |
</div> |
</template> |
</template> |