| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list.
html"> | 1 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list.
html"> |
| 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 3 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap
er-toggle-button.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap
er-toggle-button.html"> |
| 8 <link rel="import" href="../settings_shared_css.html"> | 8 <link rel="import" href="../settings_shared_css.html"> |
| 9 | 9 |
| 10 <dom-module id="settings-internet-subpage"> | 10 <dom-module id="settings-internet-subpage"> |
| 11 <template> | 11 <template> |
| 12 <style include="settings-shared"> | 12 <style include="settings-shared"> |
| 13 #networkListDiv { | 13 #networkListDiv { |
| 14 /* cr-network-list is padded to the right to allow space for a ripple */ | 14 /* cr-network-list is padded to the right to allow space for a ripple */ |
| 15 -webkit-padding-end: calc(var(--settings-box-row-padding) - | 15 -webkit-padding-end: calc(var(--settings-box-row-padding) - |
| 16 var(--cr-icon-ripple-padding)); | 16 var(--cr-icon-ripple-padding)); |
| 17 -webkit-padding-start: var(--settings-box-row-padding); | 17 -webkit-padding-start: var(--settings-box-row-padding); |
| 18 margin-top: var(--settings-page-vertical-margin); | 18 margin-top: var(--settings-page-vertical-margin); |
| 19 min-height: var(--settings-box-min-height); | 19 min-height: var(--settings-box-min-height); |
| 20 } | 20 } |
| 21 | 21 |
| 22 #addButton { | 22 #addButton { |
| 23 -webkit-margin-end: var(--settings-control-spacing); | 23 -webkit-margin-end: var(--settings-control-spacing); |
| 24 } | 24 } |
| 25 | 25 |
| 26 #onoff[on] { | 26 #onOff { |
| 27 font-weight: 500; |
| 28 } |
| 29 |
| 30 #onOff[on] { |
| 27 color: var(--settings-toggle-color); | 31 color: var(--settings-toggle-color); |
| 28 font-weight: 500; | |
| 29 } | 32 } |
| 30 | 33 |
| 31 .vpn-header { | 34 .vpn-header { |
| 32 -webkit-margin-end: 12px; | 35 -webkit-margin-end: 12px; |
| 33 -webkit-margin-start: 4px; | 36 -webkit-margin-start: 4px; |
| 34 margin-bottom: 8px; | 37 margin-bottom: 8px; |
| 35 margin-top: 8px; | 38 margin-top: 8px; |
| 36 } | 39 } |
| 37 | 40 |
| 38 .no-networks { | 41 .no-networks { |
| 39 margin: 4px; | 42 margin: 4px; |
| 40 } | 43 } |
| 41 </style> | 44 </style> |
| 42 | 45 |
| 43 <template is="dom-if" if="[[enableToggleIsVisible_(deviceState)]]"> | 46 <template is="dom-if" if="[[enableToggleIsVisible_(deviceState)]]"> |
| 44 <div class="settings-box first"> | 47 <div class="settings-box first"> |
| 45 <div id="onoff" class="start" on$="[[deviceIsEnabled_(deviceState)]]"> | 48 <div id="onOff" class="start" on$="[[deviceIsEnabled_(deviceState)]]"> |
| 46 [[getOffOnString_(deviceState, | 49 [[getOffOnString_(deviceState, |
| 47 '$i18nPolymer{deviceOn}', '$i18nPolymer{deviceOff}')]] | 50 '$i18nPolymer{deviceOn}', '$i18nPolymer{deviceOff}')]] |
| 48 </div> | 51 </div> |
| 49 <!-- The add button in this row is only shown for WiFi networks. --> | 52 <!-- The add button in this row is only shown for WiFi networks. --> |
| 50 <paper-icon-button id="addButton" icon="settings:add-wifi" | 53 <paper-icon-button id="addButton" icon="settings:add-wifi" |
| 51 hidden$="[[!showAddButton_(deviceState, globalPolicy)]]" | 54 hidden$="[[!showAddButton_(deviceState, globalPolicy)]]" |
| 52 aria-label="$i18n{internetAddWiFi}" | 55 aria-label="$i18n{internetAddWiFi}" |
| 53 on-tap="onAddButtonTap_" tabindex$="[[tabindex]]"> | 56 on-tap="onAddButtonTap_" tabindex$="[[tabindex]]"> |
| 54 </paper-icon-button> | 57 </paper-icon-button> |
| 55 <paper-toggle-button id="deviceEnabledButton" | 58 <paper-toggle-button id="deviceEnabledButton" |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 </div> | 117 </div> |
| 115 </template> | 118 </template> |
| 116 </template> | 119 </template> |
| 117 </div> | 120 </div> |
| 118 | 121 |
| 119 </template> | 122 </template> |
| 120 | 123 |
| 121 </template> | 124 </template> |
| 122 <script src="internet_subpage.js"></script> | 125 <script src="internet_subpage.js"></script> |
| 123 </dom-module> | 126 </dom-module> |
| OLD | NEW |