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

Unified Diff: chrome/browser/resources/settings/internet_page/internet_detail_page.html

Issue 2296063003: MD Settings: Internet: Minor html cleanup (Closed)
Patch Set: Add missing css Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/settings/internet_page/internet_shared_css.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/settings/internet_page/internet_detail_page.html
diff --git a/chrome/browser/resources/settings/internet_page/internet_detail_page.html b/chrome/browser/resources/settings/internet_page/internet_detail_page.html
index eb623e24a9d483c77eb7ac7a59f24a0c36f0a4a7..fa7ca618a85c5c1814fe71e74c5756a5cd3dfe55 100644
--- a/chrome/browser/resources/settings/internet_page/internet_detail_page.html
+++ b/chrome/browser/resources/settings/internet_page/internet_detail_page.html
@@ -41,6 +41,18 @@
margin: 10px;
}
+ .settings-box.embedded {
+ -webkit-margin-start: 0;
+ align-items: stretch;
+ flex-direction: column;
+ justify-content: center;
+ padding: 0;
+ }
+
+ .settings-box.stretch {
+ align-items: stretch;
+ }
+
.subtitle {
-webkit-margin-start: 20px;
font-weight: 500;
@@ -59,7 +71,7 @@
#networkState {
@apply(--settings-secondary);
- }
+ }
#networkState[connected] {
color: var(--google-green-500);
@@ -69,65 +81,67 @@
max-width: 500px;
}
</style>
- <div class="settings-box first single-column">
- <!-- Title section: Icon + name + connection state. -->
- <div class="settings-box embedded">
- <div class="start layout horizontal center">
- <cr-network-icon network-state="[[networkProperties]]">
- </cr-network-icon>
- <div class="layout vertical">
- <div id="networkName">[[getStateName_(networkProperties)]]</div>
- <div id="networkState"
- connected$="[[isConnectedState_(networkProperties)]]">
- [[getStateText_(networkProperties)]]
- </div>
+ <!-- Title section: Icon + name + connection state. -->
+ <div class="settings-box first">
+ <div class="start layout horizontal center">
+ <cr-network-icon network-state="[[networkProperties]]">
+ </cr-network-icon>
+ <div class="layout vertical">
+ <div id="networkName">[[getStateName_(networkProperties)]]</div>
+ <div id="networkState"
+ connected$="[[isConnectedState_(networkProperties)]]">
+ [[getStateText_(networkProperties)]]
</div>
</div>
- <div id="buttonDiv" class="layout horizontal center">
- <paper-button class="secondary-button" on-tap="onForgetTap_"
- hidden$="[[!showForget_(networkProperties)]]">
- $i18n{networkButtonForget}
- </paper-button>
- <paper-button class="secondary-button" on-tap="onViewAccountTap_"
- hidden$="[[!showViewAccount_(networkProperties)]]">
- $i18n{networkButtonViewAccount}
- </paper-button>
- <paper-button class="secondary-button" on-tap="onActivateTap_"
- hidden$="[[!showActivate_(networkProperties)]]">
- $i18n{networkButtonActivate}
- </paper-button>
- <paper-button class="secondary-button" on-tap="onConfigureTap_"
- hidden$="[[!showConfigure_(networkProperties)]]">
- $i18n{networkButtonConfigure}
- </paper-button>
- <paper-button class="primary-button" on-tap="onConnectTap_"
- hidden$="[[!showConnect_(networkProperties)]]"
- disabled="[[!enableConnect_(networkProperties, defaultNetwork)]]">
- $i18n{networkButtonConnect}
- </paper-button>
- <paper-button class="primary-button" on-tap="onDisconnectTap_"
- hidden$="[[!showDisconnect_(networkProperties)]]">
- $i18n{networkButtonDisconnect}
- </paper-button>
- </div>
</div>
- <!-- Shared. -->
- <div class="settings-box embedded"
- hidden$="[[!showShared_(networkProperties)]]">
- $i18n{networkShared}
+ <div id="buttonDiv" class="layout horizontal center">
+ <paper-button class="secondary-button" on-tap="onForgetTap_"
+ hidden$="[[!showForget_(networkProperties)]]">
+ $i18n{networkButtonForget}
+ </paper-button>
+ <paper-button class="secondary-button" on-tap="onViewAccountTap_"
+ hidden$="[[!showViewAccount_(networkProperties)]]">
+ $i18n{networkButtonViewAccount}
+ </paper-button>
+ <paper-button class="secondary-button" on-tap="onActivateTap_"
+ hidden$="[[!showActivate_(networkProperties)]]">
+ $i18n{networkButtonActivate}
+ </paper-button>
+ <paper-button class="secondary-button" on-tap="onConfigureTap_"
+ hidden$="[[!showConfigure_(networkProperties)]]">
+ $i18n{networkButtonConfigure}
+ </paper-button>
+ <paper-button class="primary-button" on-tap="onConnectTap_"
+ hidden$="[[!showConnect_(networkProperties)]]"
+ disabled="[[!enableConnect_(networkProperties, defaultNetwork)]]">
+ $i18n{networkButtonConnect}
+ </paper-button>
+ <paper-button class="primary-button" on-tap="onDisconnectTap_"
+ hidden$="[[!showDisconnect_(networkProperties)]]">
+ $i18n{networkButtonDisconnect}
+ </paper-button>
</div>
+ </div>
+
+ <!-- Shared. -->
+ <div class="settings-box continuation"
+ hidden$="[[!showShared_(networkProperties)]]">
+ $i18n{networkShared}
+ </div>
+ <!-- Top level properties -->
+ <div class="settings-box continuation embedded">
<!-- Prefer this network. -->
- <div class="settings-box embedded"
+ <div class="settings-box"
hidden$="[[!showPreferNetwork_(networkProperties)]]">
<paper-checkbox checked="{{preferNetwork_}}"
- disabled="[[isNetworkPolicyEnforced(networkProperties.Priority)]]">
+ disabled="[[isNetworkPolicyEnforced(networkProperties.Priority)]]">
dschuyler 2016/09/01 20:45:13 nit: wrap line or indent less.
stevenjb 2016/09/02 17:07:58 Aha! My editor was doing this and I did some more
$i18n{networkPrefer}
</paper-checkbox>
<cr-policy-network-indicator property="[[networkProperties.Priority]]">
</cr-policy-network-indicator>
</div>
<!-- Autoconnect. -->
- <div class="settings-box embedded"
+ <div class="settings-box"
hidden$="[[!showAutoConnect_(networkProperties)]]">
<paper-checkbox checked="{{autoConnect_}}">
$i18n{networkAutoConnect}
@@ -136,28 +150,28 @@
property="[[getManagedAutoConnect_(networkProperties)]]">
</cr-policy-network-indicator>
</div>
+ <!-- SIM Info (Cellular only). -->
+ <div class="settings-box single-column stretch">
+ <network-siminfo
+ editable on-siminfo-change="onNetworkPropertyChange_"
+ hidden$="[[!showCellularSim_(networkProperties)]]"
+ network-properties="[[networkProperties]]"
+ networking-private="[[networkingPrivate]]">
+ </network-siminfo>
+ </div>
+ <!-- IP Address. -->
+ <div class="settings-box two-line single-column stretch"
+ hidden$="[[!IPAddress_]]">
+ <div>$i18n{networkIPAddress}</div>
+ <div class="secondary">[[IPAddress_]]</div>
+ </div>
+ <!-- Properties to always show if present. -->
+ <network-property-list hidden$="[[!hasInfoFields_(networkProperties)]]"
+ fields="[[getInfoFields_(networkProperties)]]"
+ property-dict="[[networkProperties]]">
+ </network-property-list>
</div>
- <!-- SIM Info (Cellular only). -->
- <network-siminfo
- editable on-siminfo-change="onNetworkPropertyChange_"
- hidden$="[[!showCellularSim_(networkProperties)]]"
- network-properties="[[networkProperties]]"
- networking-private="[[networkingPrivate]]">
- </network-siminfo>
-
- <!-- IP Address. -->
- <div class="settings-box two-line single-column" hidden$="[[!IPAddress_]]">
- <div>$i18n{networkIPAddress}</div>
- <div class="secondary">[[IPAddress_]]</div>
- </div>
-
- <!-- Properties to always show if present. -->
- <network-property-list hidden$="[[!hasInfoFields_(networkProperties)]]"
- fields="[[getInfoFields_(networkProperties)]]"
- property-dict="[[networkProperties]]">
- </network-property-list>
-
<!-- Advanced toggle. -->
<div class="settings-box" actionable on-tap="toggleAdvancedExpanded_"
hidden$="[[!hasAdvancedOrDeviceFields_(networkProperties)]]">
« no previous file with comments | « no previous file | chrome/browser/resources/settings/internet_page/internet_shared_css.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698