| 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_indicat
or.html"> | 5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_indicat
or.html"> |
| 6 <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
_behavior.html"> |
| 7 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_indicator.html"> | 7 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_indicator.html"> |
| 8 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 8 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 9 <link rel="import" href="chrome://resources/html/polymer.html"> | 9 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 10 <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-collapse/iron-coll
apse.html"> |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 <link rel="import" href="network_proxy.html"> | 23 <link rel="import" href="network_proxy.html"> |
| 24 <link rel="import" href="network_siminfo.html"> | 24 <link rel="import" href="network_siminfo.html"> |
| 25 | 25 |
| 26 <dom-module id="settings-internet-detail-page"> | 26 <dom-module id="settings-internet-detail-page"> |
| 27 <template> | 27 <template> |
| 28 <style include="internet-shared"> | 28 <style include="internet-shared"> |
| 29 :host { | 29 :host { |
| 30 padding-bottom: 40px; | 30 padding-bottom: 40px; |
| 31 } | 31 } |
| 32 | 32 |
| 33 cr-network-icon { | |
| 34 -webkit-padding-end: 8px; | |
| 35 } | |
| 36 | |
| 37 iron-collapse { | 33 iron-collapse { |
| 38 margin: 10px 0; | 34 margin: 10px 0; |
| 39 } | 35 } |
| 40 | 36 |
| 41 iron-icon { | 37 iron-icon { |
| 42 -webkit-margin-end: 10px; | 38 -webkit-margin-end: 10px; |
| 43 } | 39 } |
| 44 | 40 |
| 45 paper-toggle-button, | 41 paper-toggle-button, |
| 46 cr-policy-network-indicator, | 42 cr-policy-network-indicator, |
| 47 cr-policy-indicator { | 43 cr-policy-indicator { |
| 48 -webkit-margin-start: var(--settings-control-spacing); | 44 -webkit-margin-start: var(--settings-control-spacing); |
| 49 } | 45 } |
| 50 | 46 |
| 51 .indented { | 47 .indented { |
| 52 -webkit-margin-start: var(--settings-box-row-padding); | 48 -webkit-margin-start: var(--settings-box-row-padding); |
| 53 } | 49 } |
| 54 | 50 |
| 55 .settings-box.stretch { | 51 .settings-box.stretch { |
| 56 align-items: stretch; | 52 align-items: stretch; |
| 57 } | 53 } |
| 58 | 54 |
| 59 .settings-box:first-of-type { | 55 .settings-box:first-of-type { |
| 60 border-top: none; | 56 border-top: none; |
| 61 } | 57 } |
| 62 | 58 |
| 63 #buttonDiv paper-button { | |
| 64 /* Align text edge with trailing margin (12px button padding) */ | |
| 65 -webkit-margin-end: -12px; | |
| 66 /* 8px spacing between highlight edges. */ | |
| 67 -webkit-margin-start: calc(12px + 8px); | |
| 68 margin-bottom: 10px; | |
| 69 margin-top: 10px; | |
| 70 } | |
| 71 | |
| 72 #networkState { | 59 #networkState { |
| 73 -webkit-padding-start: 8px; | 60 -webkit-padding-start: 8px; |
| 74 font-size: 107.69%; /* 14px / 13px */ | 61 font-size: 107.69%; /* 14px / 13px */ |
| 75 font-weight: 500; | 62 font-weight: 500; |
| 76 } | 63 } |
| 77 | 64 |
| 78 #networkState[connected] { | 65 #networkState[connected] { |
| 79 color: var(--google-green-500); | 66 color: var(--google-green-500); |
| 80 } | 67 } |
| 81 </style> | 68 </style> |
| 82 <!-- Title section: Icon + name + connection state. --> | 69 <!-- Title section: Icon + name + connection state. --> |
| 83 <div class="settings-box first"> | 70 <div class="settings-box first"> |
| 84 <div class="start layout horizontal center"> | 71 <div class="start layout horizontal center"> |
| 85 <cr-network-icon network-state="[[networkProperties]]"> | 72 <cr-network-icon network-state="[[networkProperties]]"> |
| 86 </cr-network-icon> | 73 </cr-network-icon> |
| 87 <div id="networkState" | 74 <div id="networkState" |
| 88 connected$="[[isConnectedState_(networkProperties)]]"> | 75 connected$="[[isConnectedState_(networkProperties)]]"> |
| 89 [[getStateText_(networkProperties)]] | 76 [[getStateText_(networkProperties)]] |
| 90 </div> | 77 </div> |
| 91 <template is="dom-if" | 78 <template is="dom-if" |
| 92 if="[[isPolicySource(networkProperties.Source))]]"> | 79 if="[[isPolicySource(networkProperties.Source))]]"> |
| 93 <cr-policy-indicator | 80 <cr-policy-indicator |
| 94 indicator-type="[[getIndicatorTypeForSource( | 81 indicator-type="[[getIndicatorTypeForSource( |
| 95 networkProperties.Source)]]"> | 82 networkProperties.Source)]]"> |
| 96 </cr-policy-indicator> | 83 </cr-policy-indicator> |
| 97 </template> | 84 </template> |
| 98 </div> | 85 </div> |
| 99 <div id="buttonDiv" class="layout horizontal center"> | 86 <div id="buttonDiv"> |
| 100 <template is="dom-if" if="[[!isSecondaryUser_]]"> | 87 <template is="dom-if" if="[[!isSecondaryUser_]]"> |
| 101 <paper-button class="secondary-button" on-tap="onForgetTap_" | 88 <paper-button class="secondary-button" on-tap="onForgetTap_" |
| 102 hidden$="[[!showForget_(networkProperties)]]"> | 89 hidden$="[[!showForget_(networkProperties)]]"> |
| 103 $i18n{networkButtonForget} | 90 $i18n{networkButtonForget} |
| 104 </paper-button> | 91 </paper-button> |
| 105 <paper-button class="secondary-button" on-tap="onViewAccountTap_" | 92 <paper-button class="secondary-button" on-tap="onViewAccountTap_" |
| 106 hidden$="[[!showViewAccount_(networkProperties)]]"> | 93 hidden$="[[!showViewAccount_(networkProperties)]]"> |
| 107 $i18n{networkButtonViewAccount} | 94 $i18n{networkButtonViewAccount} |
| 108 </paper-button> | 95 </paper-button> |
| 109 <paper-button class="secondary-button" on-tap="onActivateTap_" | 96 <paper-button class="secondary-button" on-tap="onActivateTap_" |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 296 <network-proxy editable prefs="{{prefs}}" | 283 <network-proxy editable prefs="{{prefs}}" |
| 297 on-proxy-change="onProxyChange_" | 284 on-proxy-change="onProxyChange_" |
| 298 network-properties="[[networkProperties]]"> | 285 network-properties="[[networkProperties]]"> |
| 299 </network-proxy> | 286 </network-proxy> |
| 300 </iron-collapse> | 287 </iron-collapse> |
| 301 </template> | 288 </template> |
| 302 </template> | 289 </template> |
| 303 </template> | 290 </template> |
| 304 <script src="internet_detail_page.js"></script> | 291 <script src="internet_detail_page.js"></script> |
| 305 </dom-module> | 292 </dom-module> |
| OLD | NEW |