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

Side by Side Diff: chrome/browser/resources/settings/internet_page/internet_subpage.html

Issue 2848973003: MD Settings: convert paper-icon-button to paper-icon-button-light. (Closed)
Patch Set: move unrelated fix to another CL Created 3 years, 6 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 unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 2
3 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list. html"> 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list. html">
4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html">
6 <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/iron-icon/iron-icon.htm l">
7 <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-icon-button/paper -icon-button-light.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
9 <link rel="import" href="../settings_shared_css.html"> 9 <link rel="import" href="../settings_shared_css.html">
10 10
11 <dom-module id="settings-internet-subpage"> 11 <dom-module id="settings-internet-subpage">
12 <template> 12 <template>
13 <style include="settings-shared iron-flex"> 13 <style include="settings-shared iron-flex">
14 #networkListDiv { 14 #networkListDiv {
15 /* cr-network-list is padded to the right to allow space for a ripple */ 15 /* cr-network-list is padded to the right to allow space for a ripple */
16 -webkit-padding-end: calc(var(--settings-box-row-padding) - 16 -webkit-padding-end: calc(var(--settings-box-row-padding) -
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 } 48 }
49 </style> 49 </style>
50 50
51 <template is="dom-if" if="[[enableToggleIsVisible_(deviceState)]]"> 51 <template is="dom-if" if="[[enableToggleIsVisible_(deviceState)]]">
52 <div class="settings-box first"> 52 <div class="settings-box first">
53 <div id="onOff" class="start" on$="[[deviceIsEnabled_(deviceState)]]"> 53 <div id="onOff" class="start" on$="[[deviceIsEnabled_(deviceState)]]">
54 [[getOffOnString_(deviceState, 54 [[getOffOnString_(deviceState,
55 '$i18nPolymer{deviceOn}', '$i18nPolymer{deviceOff}')]] 55 '$i18nPolymer{deviceOn}', '$i18nPolymer{deviceOff}')]]
56 </div> 56 </div>
57 <!-- The add button in this row is only shown for WiFi networks. --> 57 <!-- The add button in this row is only shown for WiFi networks. -->
58 <paper-icon-button id="addButton" icon="settings:add-wifi" 58 <button is="paper-icon-button-light" id="addButton"
59 hidden$="[[!showAddButton_(deviceState, globalPolicy)]]" 59 hidden$="[[!showAddButton_(deviceState, globalPolicy)]]"
60 aria-label="$i18n{internetAddWiFi}" 60 aria-label="$i18n{internetAddWiFi}" class="icon-add-wifi"
61 on-tap="onAddButtonTap_" tabindex$="[[tabindex]]"> 61 on-tap="onAddButtonTap_" tabindex$="[[tabindex]]">
62 </paper-icon-button> 62 </button>
63 <paper-toggle-button id="deviceEnabledButton" 63 <paper-toggle-button id="deviceEnabledButton"
64 aria-label$="[[getToggleA11yString_(deviceState)]]" 64 aria-label$="[[getToggleA11yString_(deviceState)]]"
65 checked="[[deviceIsEnabled_(deviceState)]]" 65 checked="[[deviceIsEnabled_(deviceState)]]"
66 disabled="[[!enableToggleIsEnabled_(deviceState)]]" 66 disabled="[[!enableToggleIsEnabled_(deviceState)]]"
67 on-tap="onDeviceEnabledTap_"> 67 on-tap="onDeviceEnabledTap_">
68 </paper-toggle-button> 68 </paper-toggle-button>
69 </div> 69 </div>
70 </template> 70 </template>
71 71
72 <template is="dom-if" if="[[knownNetworksIsVisible_(deviceState)]]"> 72 <template is="dom-if" if="[[knownNetworksIsVisible_(deviceState)]]">
73 <div actionable class="settings-box" on-tap="onKnownNetworksTap_"> 73 <div actionable class="settings-box" on-tap="onKnownNetworksTap_">
74 <div class="start">$i18n{knownNetworksButton}</div> 74 <div class="start">$i18n{knownNetworksButton}</div>
75 <button class="subpage-arrow" is="paper-icon-button-light" 75 <button class="subpage-arrow" is="paper-icon-button-light"
76 aria-label="$i18n{knownNetworksButton}"> 76 aria-label="$i18n{knownNetworksButton}">
77 </button> 77 </button>
78 </div> 78 </div>
79 </template> 79 </template>
80 80
81 <template is="dom-if" if="[[deviceIsEnabled_(deviceState)]]"> 81 <template is="dom-if" if="[[deviceIsEnabled_(deviceState)]]">
82 <div id="networkListDiv" class="layout vertical flex"> 82 <div id="networkListDiv" class="layout vertical flex">
83 <!-- VPN only header for built-in VPNs. --> 83 <!-- VPN only header for built-in VPNs. -->
84 <div class="vpn-header layout horizontal center" 84 <div class="vpn-header layout horizontal center"
85 hidden$="[[!isEqual_('VPN', deviceState.Type)]]"> 85 hidden$="[[!isEqual_('VPN', deviceState.Type)]]">
86 <div class="flex">$i18n{networkVpnBuiltin}</div> 86 <div class="flex">$i18n{networkVpnBuiltin}</div>
87 <paper-icon-button icon="settings:add-circle" 87 <button is="paper-icon-button-light" class="icon-add-circle"
88 aria-label="$i18n{internetAddVPN}" 88 aria-label="$i18n{internetAddVPN}"
89 on-tap="onAddButtonTap_" tabindex$="[[tabindex]]"> 89 on-tap="onAddButtonTap_" tabindex$="[[tabindex]]">
90 </paper-icon-button> 90 </button>
91 </div> 91 </div>
92 92
93 <!-- List of networks or 'None'. --> 93 <!-- List of networks or 'None'. -->
94 <cr-network-list id="networkList" show-buttons 94 <cr-network-list id="networkList" show-buttons
95 hidden$="[[!networkStateList_.length]]" 95 hidden$="[[!networkStateList_.length]]"
96 networks="[[networkStateList_]]" 96 networks="[[networkStateList_]]"
97 on-selected="onNetworkSelected_"> 97 on-selected="onNetworkSelected_">
98 </cr-network-list> 98 </cr-network-list>
99 <div hidden$="[[networkStateList_.length]]" class="no-networks"> 99 <div hidden$="[[networkStateList_.length]]" class="no-networks">
100 $i18n{internetNoNetworks} 100 $i18n{internetNoNetworks}
101 </div> 101 </div>
102 102
103 <!-- Third party VPNs. --> 103 <!-- Third party VPNs. -->
104 <template is="dom-if" if="[[isEqual_('VPN', deviceState.Type)]]"> 104 <template is="dom-if" if="[[isEqual_('VPN', deviceState.Type)]]">
105 <template is="dom-repeat" items="[[thirdPartyVpnProviders]]"> 105 <template is="dom-repeat" items="[[thirdPartyVpnProviders]]">
106 <div id="[[item.ProviderName]]" 106 <div id="[[item.ProviderName]]"
107 class="vpn-header layout horizontal center"> 107 class="vpn-header layout horizontal center">
108 <div class="flex">[[item.ProviderName]]</div> 108 <div class="flex">[[item.ProviderName]]</div>
109 <paper-icon-button icon="settings:add-circle" 109 <button is="paper-icon-button-light" class="icon-add-circle"
110 aria-label$="[[getAddThirdPartyVpnA11yString_(item)]]" 110 aria-label$="[[getAddThirdPartyVpnA11yString_(item)]]"
111 on-tap="onAddThirdPartyVpnTap_" tabindex$="[[tabindex]]"> 111 on-tap="onAddThirdPartyVpnTap_" tabindex$="[[tabindex]]">
112 </paper-icon-button> 112 </button>
113 </div> 113 </div>
114 <cr-network-list show-buttons 114 <cr-network-list show-buttons
115 hidden$="[[!haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]" 115 hidden$="[[!haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]"
116 networks="[[getThirdPartyVpnNetworks_(thirdPartyVpns_, item)]]" 116 networks="[[getThirdPartyVpnNetworks_(thirdPartyVpns_, item)]]"
117 on-selected="onNetworkSelected_"> 117 on-selected="onNetworkSelected_">
118 </cr-network-list> 118 </cr-network-list>
119 <div hidden$="[[haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]" 119 <div hidden$="[[haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]"
120 class="no-networks"> 120 class="no-networks">
121 $i18n{internetNoNetworks} 121 $i18n{internetNoNetworks}
122 </div> 122 </div>
(...skipping 18 matching lines...) Expand all
141 disabled="[[!tetherToggleIsEnabled_(deviceState, 141 disabled="[[!tetherToggleIsEnabled_(deviceState,
142 tetherDeviceState)]]"> 142 tetherDeviceState)]]">
143 </paper-toggle-button> 143 </paper-toggle-button>
144 </div> 144 </div>
145 </template> 145 </template>
146 </template> 146 </template>
147 147
148 </template> 148 </template>
149 <script src="internet_subpage.js"></script> 149 <script src="internet_subpage.js"></script>
150 </dom-module> 150 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698