| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa
nd_button.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa
nd_button.html"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon.
html"> | 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon.
html"> |
| 4 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
l"> | 4 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
l"> |
| 5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_behavior.html"> | 5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_behavior.html"> |
| 6 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_indicator.html"> | 6 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_indicator.html"> |
| 7 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 7 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 8 <link rel="import" href="chrome://resources/html/polymer.html"> | 8 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll
apse.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll
apse.html"> |
| 10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 <link rel="import" href="network_siminfo.html"> | 21 <link rel="import" href="network_siminfo.html"> |
| 22 | 22 |
| 23 <dom-module id="settings-internet-detail-page"> | 23 <dom-module id="settings-internet-detail-page"> |
| 24 <template> | 24 <template> |
| 25 <style include="internet-shared"> | 25 <style include="internet-shared"> |
| 26 :host { | 26 :host { |
| 27 padding-bottom: 40px; | 27 padding-bottom: 40px; |
| 28 } | 28 } |
| 29 | 29 |
| 30 cr-network-icon { | 30 cr-network-icon { |
| 31 -webkit-margin-end: 20px; | 31 -webkit-margin-end: 15px; |
| 32 height: 32px; | 32 height: 32px; |
| 33 margin-top: -4px; /* Align better with text */ |
| 33 width: 32px; | 34 width: 32px; |
| 34 } | 35 } |
| 35 | 36 |
| 36 cr-policy-network-indicator { | 37 cr-policy-network-indicator { |
| 37 -webkit-margin-start: 10px; | 38 -webkit-margin-start: 10px; |
| 38 } | 39 } |
| 39 | 40 |
| 40 iron-collapse { | 41 iron-collapse { |
| 41 margin: 10px; | 42 margin: 10px; |
| 42 } | 43 } |
| 43 | 44 |
| 44 .subtitle { | 45 .subtitle { |
| 45 -webkit-margin-start: 20px; | 46 -webkit-margin-start: 20px; |
| 46 font-weight: 500; | 47 font-weight: 500; |
| 47 padding: 20px 0; | 48 padding: 20px 0; |
| 48 } | 49 } |
| 49 | 50 |
| 50 #buttonDiv paper-button { | 51 #buttonDiv paper-button { |
| 51 margin: 10px 0; | 52 margin: 10px 0; |
| 52 } | 53 } |
| 53 | 54 |
| 54 #networkName { | 55 #networkState { |
| 55 /* TODO(stevenjb): Finalize font-size for this and networkState. */ | 56 /* TODO(stevenjb): Finalize font-size / style for this. */ |
| 56 font-size: 125%; | 57 font-size: 125%; |
| 57 font-weight: 500; | 58 font-weight: 500; |
| 58 } | 59 } |
| 59 | 60 |
| 60 #networkState { | |
| 61 @apply(--settings-secondary); | |
| 62 } | |
| 63 | |
| 64 #networkState[connected] { | 61 #networkState[connected] { |
| 65 color: var(--google-green-500); | 62 color: var(--google-green-500); |
| 66 } | 63 } |
| 67 | 64 |
| 68 #proxyDiv { | 65 #proxyDiv { |
| 69 max-width: 500px; | 66 max-width: 500px; |
| 70 } | 67 } |
| 71 </style> | 68 </style> |
| 72 <div class="settings-box first single-column"> | 69 <div class="settings-box first single-column"> |
| 73 <!-- Title section: Icon + name + connection state. --> | 70 <!-- Title section: Icon + name + connection state. --> |
| 74 <div class="settings-box embedded"> | 71 <div class="settings-box embedded"> |
| 75 <div class="start layout horizontal center"> | 72 <div class="start layout horizontal center"> |
| 76 <cr-network-icon network-state="[[networkProperties]]"> | 73 <cr-network-icon network-state="[[networkProperties]]"> |
| 77 </cr-network-icon> | 74 </cr-network-icon> |
| 78 <div class="layout vertical"> | 75 <div id="networkState" |
| 79 <div id="networkName">[[getStateName_(networkProperties)]]</div> | 76 connected$="[[isConnectedState_(networkProperties)]]"> |
| 80 <div id="networkState" | 77 [[getStateText_(networkProperties)]] |
| 81 connected$="[[isConnectedState_(networkProperties)]]"> | |
| 82 [[getStateText_(networkProperties)]] | |
| 83 </div> | |
| 84 </div> | 78 </div> |
| 85 </div> | 79 </div> |
| 86 <div id="buttonDiv" class="layout horizontal center"> | 80 <div id="buttonDiv" class="layout horizontal center"> |
| 87 <paper-button class="secondary-button" on-tap="onForgetTap_" | 81 <paper-button class="secondary-button" on-tap="onForgetTap_" |
| 88 hidden$="[[!showForget_(networkProperties)]]"> | 82 hidden$="[[!showForget_(networkProperties)]]"> |
| 89 $i18n{networkButtonForget} | 83 $i18n{networkButtonForget} |
| 90 </paper-button> | 84 </paper-button> |
| 91 <paper-button class="secondary-button" on-tap="onViewAccountTap_" | 85 <paper-button class="secondary-button" on-tap="onViewAccountTap_" |
| 92 hidden$="[[!showViewAccount_(networkProperties)]]"> | 86 hidden$="[[!showViewAccount_(networkProperties)]]"> |
| 93 $i18n{networkButtonViewAccount} | 87 $i18n{networkButtonViewAccount} |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 <div class="subtitle">$i18n{networkSectionProxy}</div> | 206 <div class="subtitle">$i18n{networkSectionProxy}</div> |
| 213 <network-proxy editable on-proxy-change="onProxyChange_" | 207 <network-proxy editable on-proxy-change="onProxyChange_" |
| 214 network-properties="[[networkProperties]]"> | 208 network-properties="[[networkProperties]]"> |
| 215 </network-proxy> | 209 </network-proxy> |
| 216 </div> | 210 </div> |
| 217 </div> | 211 </div> |
| 218 </iron-collapse> | 212 </iron-collapse> |
| 219 </template> | 213 </template> |
| 220 <script src="internet_detail_page.js"></script> | 214 <script src="internet_detail_page.js"></script> |
| 221 </dom-module> | 215 </dom-module> |
| OLD | NEW |