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

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

Issue 2556253007: MD Settings: Fix internet focus and styling (Closed)
Patch Set: Restore cr:settings Created 4 years 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/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_list. html"> 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list. html">
4 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list_ item.html"> 4 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list_ item.html">
5 <link rel="import" href="chrome://resources/html/polymer.html"> 5 <link rel="import" href="chrome://resources/html/polymer.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys-behavior /iron-a11y-keys-behavior.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys-behavior /iron-a11y-keys-behavior.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html">
10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> 11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
11 <link rel="import" href="/settings_shared_css.html"> 12 <link rel="import" href="/settings_shared_css.html">
12 <link rel="import" href="network_siminfo.html"> 13 <link rel="import" href="network_siminfo.html">
13 14
14 <dom-module name="network-summary-item"> 15 <dom-module name="network-summary-item">
15 <template> 16 <template>
16 <style include="settings-shared"> 17 <style include="settings-shared">
17 paper-spinner { 18 paper-spinner {
18 @apply(--cr-icon-size); 19 @apply(--cr-icon-size);
(...skipping 26 matching lines...) Expand all
45 46
46 #deviceEnabledButton { 47 #deviceEnabledButton {
47 -webkit-margin-start: 10px; 48 -webkit-margin-start: 10px;
48 } 49 }
49 50
50 #networkList { 51 #networkList {
51 margin: 5px 0 10px; 52 margin: 5px 0 10px;
52 max-height: 400px; 53 max-height: 400px;
53 } 54 }
54 </style> 55 </style>
55 <div class="settings-box two-line"> 56 <div class="settings-box two-line" actionable on-tap="onDetailsTap_">
56 <div id="details" selectable 57 <div id="details"
57 no-flex$="[[showSimInfo_(deviceState)]]" 58 no-flex$="[[showSimInfo_(deviceState)]]">
58 on-tap="onDetailsTap_" tabindex$="[[getTabIndex_(deviceState)]]">
59 <cr-network-list-item item="[[activeNetworkState]]" class="flex"> 59 <cr-network-list-item item="[[activeNetworkState]]" class="flex">
60 </cr-network-list-item> 60 </cr-network-list-item>
61 <paper-spinner active="[[scanningIsActive_(deviceState, expanded_)]]" 61 <paper-spinner active="[[scanningIsActive_(deviceState, expanded_)]]"
62 hidden$="[[!scanningIsVisible_(deviceState)]]"> 62 hidden$="[[!scanningIsVisible_(deviceState)]]">
63 </paper-spinner> 63 </paper-spinner>
64 </div> 64 </div>
65 65
66 <template is="dom-if" if="[[showSimInfo_(deviceState)]]"> 66 <template is="dom-if" if="[[showSimInfo_(deviceState)]]">
67 <network-siminfo editable class="flex" 67 <network-siminfo editable class="flex"
68 network-properties="[[getCellularState_(deviceState)]]" 68 network-properties="[[getCellularState_(deviceState)]]"
69 networking-private="[[networkingPrivate]]"> 69 networking-private="[[networkingPrivate]]">
70 </network-siminfo> 70 </network-siminfo>
71 </template> 71 </template>
72 72
73 <div> 73 <div id="buttons" class="layout horizontal">
74 <div id="buttons" class="layout horizontal"> 74 <template is="dom-if"
75 <template is="dom-if" 75 if="[[expandIsVisible_(deviceState, networkStateList)]]">
76 if="[[showDetailsIsVisible_(deviceState, networkStateList)]]"> 76 <cr-expand-button id="expandListButton" expanded="{{expanded_}}">
77 <paper-icon-button icon="cr:settings" on-tap="onShowDetailsTap_"> 77 </cr-expand-button>
78 </paper-icon-button> 78 </template>
79 </template> 79 <template is="dom-if"
80 <template is="dom-if" 80 if="[[!expandIsVisible_(deviceState, networkStateList)]]">
81 if="[[expandIsVisible_(deviceState, networkStateList)]]"> 81 <button class="subpage-arrow" is="paper-icon-button-light"
82 <cr-expand-button id="expandListButton" expanded="{{expanded_}}"> 82 on-tap="onShowDetailsTap_">
83 </cr-expand-button> 83 </button>
84 </template> 84 </template>
85 <template is="dom-if" if="[[enableIsVisible_(deviceState)]]"> 85 </div>
86 <paper-toggle-button id="deviceEnabledButton" 86
87 checked="[[deviceIsEnabled_(deviceState)]]" 87 <template is="dom-if" if="[[enableIsVisible_(deviceState)]]">
88 on-tap="onDeviceEnabledTap_"> 88 <div class="secondary-action">
89 </paper-toggle-button> 89 <paper-toggle-button id="deviceEnabledButton"
90 </template> 90 checked="[[deviceIsEnabled_(deviceState)]]"
91 on-tap="onDeviceEnabledTap_">
92 </paper-toggle-button>
91 </div> 93 </div>
92 </div> 94 </template>
95
93 </div> 96 </div>
94 <template is="dom-if" 97 <template is="dom-if"
95 if="[[networksDomIfIsTrue_(expanded_, wasExpanded_)]]"> 98 if="[[networksDomIfIsTrue_(expanded_, wasExpanded_)]]">
96 <iron-collapse 99 <iron-collapse
97 opened="[[networksIronCollapseIsOpened_(expanded_, wasExpanded_)]]"> 100 opened="[[networksIronCollapseIsOpened_(expanded_, wasExpanded_)]]">
98 <div class="list-frame"> 101 <div class="list-frame">
99 <cr-network-list id="networkList" max-height="[[maxHeight]]" 102 <cr-network-list id="networkList" max-height="[[maxHeight]]"
100 networks="[[networkStateList]]" show-buttons> 103 networks="[[networkStateList]]" show-buttons>
101 </cr-network-list> 104 </cr-network-list>
102 <template is="dom-if" 105 <template is="dom-if"
103 if="[[knownNetworksIsVisible_(activeNetworkState)]]"> 106 if="[[knownNetworksIsVisible_(activeNetworkState)]]">
104 <div class="button-row" actionable on-tap="onKnownNetworksTap_"> 107 <div class="button-row" actionable on-tap="onKnownNetworksTap_">
105 <a is="action-link">$i18n{knownNetworksButton}</a> 108 <a is="action-link">$i18n{knownNetworksButton}</a>
106 </div> 109 </div>
107 </template> 110 </template>
108 </div> 111 </div>
109 </iron-collapse> 112 </iron-collapse>
110 </template> 113 </template>
111 </template> 114 </template>
112 <script src="network_summary_item.js"></script> 115 <script src="network_summary_item.js"></script>
113 </dom-module> 116 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698