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

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

Issue 2627353003: Settings/Oobe: Simplify cr-network-select and use flex (Closed)
Patch Set: Add comment Created 3 years, 11 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/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-a11y-keys-behavior /iron-a11y-keys-behavior.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/iron-collapse/iron-coll apse.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 7 <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-light.html"> 8 <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"> 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-toggle-button/pap er-toggle-button.html"> 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
(...skipping 11 matching lines...) Expand all
22 network-siminfo { 22 network-siminfo {
23 padding: 0 var(--settings-box-row-padding); 23 padding: 0 var(--settings-box-row-padding);
24 } 24 }
25 25
26 .button-row { 26 .button-row {
27 align-items: center; 27 align-items: center;
28 display: flex; 28 display: flex;
29 min-height: var(--settings-row-min-height); 29 min-height: var(--settings-row-min-height);
30 } 30 }
31 31
32 .padded {
33 @apply(--settings-list-frame-padding);
34 }
35
32 #buttons { 36 #buttons {
33 align-items: center; 37 align-items: center;
34 } 38 }
35 39
36 #details { 40 #details {
37 align-items: center; 41 align-items: center;
38 display: flex; 42 display: flex;
39 flex: auto; 43 flex: auto;
40 } 44 }
41 45
42 #details[no-flex] { 46 #details[no-flex] {
43 flex: none; 47 flex: none;
44 } 48 }
45 49
46 #deviceEnabledButton { 50 #deviceEnabledButton {
47 -webkit-margin-start: 10px; 51 -webkit-margin-start: 10px;
48 } 52 }
49 53
50 #networkList { 54 #networkList {
51 margin: 5px 0 10px; 55 margin: 5px 0 10px;
52 max-height: 400px; 56 max-height: 200px;
57 min-height: 50px;
53 } 58 }
54 </style> 59 </style>
55 <div class="settings-box two-line" actionable on-tap="onDetailsTap_"> 60 <div class="settings-box two-line" actionable on-tap="onDetailsTap_">
56 <div id="details" 61 <div id="details"
57 no-flex$="[[showSimInfo_(deviceState)]]"> 62 no-flex$="[[showSimInfo_(deviceState)]]">
58 <cr-network-list-item item="[[activeNetworkState]]"> 63 <cr-network-list-item item="[[activeNetworkState]]">
59 </cr-network-list-item> 64 </cr-network-list-item>
60 <paper-spinner active="[[scanningIsActive_(deviceState, expanded_)]]" 65 <paper-spinner active="[[scanningIsActive_(deviceState, expanded_)]]"
61 hidden$="[[!scanningIsVisible_(deviceState)]]"> 66 hidden$="[[!scanningIsVisible_(deviceState)]]">
62 </paper-spinner> 67 </paper-spinner>
(...skipping 28 matching lines...) Expand all
91 on-tap="onDeviceEnabledTap_"> 96 on-tap="onDeviceEnabledTap_">
92 </paper-toggle-button> 97 </paper-toggle-button>
93 </div> 98 </div>
94 </template> 99 </template>
95 100
96 </div> 101 </div>
97 <template is="dom-if" 102 <template is="dom-if"
98 if="[[networksDomIfIsTrue_(expanded_, wasExpanded_)]]"> 103 if="[[networksDomIfIsTrue_(expanded_, wasExpanded_)]]">
99 <iron-collapse 104 <iron-collapse
100 opened="[[networksIronCollapseIsOpened_(expanded_, wasExpanded_)]]"> 105 opened="[[networksIronCollapseIsOpened_(expanded_, wasExpanded_)]]">
101 <div class="list-frame"> 106 <div class="layout vertical padded">
102 <cr-network-list id="networkList" max-height="[[maxHeight]]" 107 <cr-network-list id="networkList" networks="[[networkStateList]]"
103 networks="[[networkStateList]]" show-buttons> 108 show-buttons>
104 </cr-network-list> 109 </cr-network-list>
105 <template is="dom-if" 110 <template is="dom-if"
106 if="[[knownNetworksIsVisible_(activeNetworkState)]]"> 111 if="[[knownNetworksIsVisible_(activeNetworkState)]]">
107 <div class="button-row" actionable on-tap="onKnownNetworksTap_"> 112 <div class="button-row" actionable on-tap="onKnownNetworksTap_">
108 <a is="action-link">$i18n{knownNetworksButton}</a> 113 <a is="action-link">$i18n{knownNetworksButton}</a>
109 </div> 114 </div>
110 </template> 115 </template>
111 </div> 116 </div>
112 </iron-collapse> 117 </iron-collapse>
113 </template> 118 </template>
114 </template> 119 </template>
115 <script src="network_summary_item.js"></script> 120 <script src="network_summary_item.js"></script>
116 </dom-module> 121 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698