Chromium Code Reviews| 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/network/cr_network_list. html"> | 2 <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_ item.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list_ item.html"> |
| 4 <link rel="import" href="chrome://resources/html/polymer.html"> | 4 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys-behavior /iron-a11y-keys-behavior.html"> | |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> | 9 <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"> | 10 <link rel="import" href="/settings_shared_css.html"> |
| 11 <link rel="import" href="network_siminfo.html"> | |
| 10 | 12 |
| 11 <dom-module name="network-summary-item"> | 13 <dom-module name="network-summary-item"> |
| 12 <template> | 14 <template> |
| 13 <style include="settings-shared"> | 15 <style include="settings-shared"> |
| 14 paper-spinner { | 16 paper-spinner { |
| 15 height: 20px; | 17 height: 20px; |
| 16 margin: 0 20px; | 18 margin: 0 20px; |
| 17 width: 20px; | 19 width: 20px; |
| 18 } | 20 } |
| 19 | 21 |
| 20 .button-row { | 22 .button-row { |
| 21 align-items: center; | 23 align-items: center; |
| 22 display: flex; | 24 display: flex; |
| 23 min-height: var(--settings-row-min-height); | 25 min-height: var(--settings-row-min-height); |
| 24 } | 26 } |
| 25 | 27 |
| 26 #buttons { | 28 #buttons { |
| 27 align-items: center; | 29 align-items: center; |
| 28 } | 30 } |
| 29 | 31 |
| 32 #details[noflex] { | |
|
michaelpg
2016/09/06 21:10:38
nit: no-flex (2 words)
stevenjb
2016/09/12 19:46:42
Done.
| |
| 33 flex: 0; | |
|
michaelpg
2016/09/06 21:10:38
should this be "flex: none" (for flex-shrink: 0)?
stevenjb
2016/09/12 19:46:42
flex: none. Done.
| |
| 34 } | |
| 35 | |
| 30 #deviceEnabledButton { | 36 #deviceEnabledButton { |
| 31 -webkit-margin-start: 10px; | 37 -webkit-margin-start: 10px; |
| 32 } | 38 } |
| 33 | 39 |
| 34 #networkList { | 40 #networkList { |
| 35 margin: 5px 0 10px; | 41 margin: 5px 0 10px; |
| 36 max-height: 400px; | 42 max-height: 400px; |
| 37 } | 43 } |
| 38 </style> | 44 </style> |
| 39 <div class="settings-box two-line"> | 45 <div class="settings-box two-line"> |
| 40 <div id="details" actionable class="start layout horizontal center" | 46 <div id="details" selectable class="start layout horizontal center" |
|
michaelpg
2016/09/06 21:10:38
This is confusing because some of these classes ar
stevenjb
2016/09/12 19:46:42
Yeah, the layout classes can be tricky to decode,
| |
| 41 on-tap="onDetailsTap_"> | 47 noflex$="[[showSimInfo_(deviceState)]]" |
| 42 <cr-network-list-item class="flex" item="[[activeNetworkState]]"> | 48 on-tap="onDetailsTap_" tabindex$="[[getTabIndex_(deviceState)]]"> |
| 49 <cr-network-list-item item="[[activeNetworkState]]"> | |
| 43 </cr-network-list-item> | 50 </cr-network-list-item> |
| 44 <paper-spinner active="[[showScanning_(deviceState, expanded_)]]"> | 51 <paper-spinner active="[[showScanning_(deviceState, expanded_)]]"> |
| 45 </paper-spinner> | 52 </paper-spinner> |
| 46 </div> | 53 </div> |
| 54 | |
| 55 <template is="dom-if" if="[[showSimInfo_(deviceState)]]"> | |
| 56 <network-siminfo editable class="flex" | |
| 57 network-properties="[[getCellularState_(deviceState)]]" | |
| 58 networking-private="[[networkingPrivate]]"> | |
| 59 </network-siminfo> | |
| 60 </template> | |
| 61 | |
| 47 <div> | 62 <div> |
| 48 <div id="buttons" class="layout horizontal"> | 63 <div id="buttons" class="layout horizontal"> |
| 49 <template is="dom-if" | 64 <template is="dom-if" |
| 65 if="[[showDetailsIsVisible_(deviceState, networkStateList)]]"> | |
| 66 <paper-icon-button icon="cr:settings" on-tap="onShowDetailsTap_"> | |
|
michaelpg
2016/09/06 21:10:38
import cr_elements/icons.html
stevenjb
2016/09/12 19:46:42
Done.
| |
| 67 </paper-icon-button> | |
| 68 </template> | |
| 69 <template is="dom-if" | |
| 50 if="[[expandIsVisible_(deviceState, networkStateList)]]"> | 70 if="[[expandIsVisible_(deviceState, networkStateList)]]"> |
| 51 <cr-expand-button id="expandListButton" expanded="{{expanded_}}"> | 71 <cr-expand-button id="expandListButton" expanded="{{expanded_}}"> |
| 52 </cr-expand-button> | 72 </cr-expand-button> |
| 53 </template> | 73 </template> |
| 54 <template is="dom-if" if="[[enableIsVisible_(deviceState)]]"> | 74 <template is="dom-if" if="[[enableIsVisible_(deviceState)]]"> |
| 55 <paper-toggle-button id="deviceEnabledButton" | 75 <paper-toggle-button id="deviceEnabledButton" |
| 56 checked="[[deviceIsEnabled_(deviceState)]]" | 76 checked="[[deviceIsEnabled_(deviceState)]]" |
| 57 on-tap="onDeviceEnabledTap_"> | 77 on-tap="onDeviceEnabledTap_"> |
| 58 </paper-toggle-button> | 78 </paper-toggle-button> |
| 59 </template> | 79 </template> |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 73 <div class="button-row" actionable on-tap="onKnownNetworksTap_"> | 93 <div class="button-row" actionable on-tap="onKnownNetworksTap_"> |
| 74 <a is="action-link">$i18n{knownNetworksButton}</a> | 94 <a is="action-link">$i18n{knownNetworksButton}</a> |
| 75 </div> | 95 </div> |
| 76 </template> | 96 </template> |
| 77 </div> | 97 </div> |
| 78 </iron-collapse> | 98 </iron-collapse> |
| 79 </template> | 99 </template> |
| 80 </template> | 100 </template> |
| 81 <script src="network_summary_item.js"></script> | 101 <script src="network_summary_item.js"></script> |
| 82 </dom-module> | 102 </dom-module> |
| OLD | NEW |