summaryrefslogtreecommitdiff
path: root/chromium/ui/webui/resources/cr_elements/network/cr_network_list_item.html
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-04-05 14:08:31 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-04-11 07:46:53 +0000
commit6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (patch)
treeab00f70a5e89278d6a0d16ff0c42578dc4d84a2d /chromium/ui/webui/resources/cr_elements/network/cr_network_list_item.html
parente733310db58160074f574c429d48f8308c0afe17 (diff)
downloadqtwebengine-chromium-6a4cabb866f66d4128a97cdc6d9d08ce074f1247.tar.gz
BASELINE: Update Chromium to 57.0.2987.144
Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/ui/webui/resources/cr_elements/network/cr_network_list_item.html')
-rw-r--r--chromium/ui/webui/resources/cr_elements/network/cr_network_list_item.html70
1 files changed, 35 insertions, 35 deletions
diff --git a/chromium/ui/webui/resources/cr_elements/network/cr_network_list_item.html b/chromium/ui/webui/resources/cr_elements/network/cr_network_list_item.html
index c5d4e0ed6f8..88a6d9cc638 100644
--- a/chromium/ui/webui/resources/cr_elements/network/cr_network_list_item.html
+++ b/chromium/ui/webui/resources/cr_elements/network/cr_network_list_item.html
@@ -1,11 +1,12 @@
<link rel="import" href="chrome://resources/cr_elements/icons.html">
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button-light.html">
<link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon.html">
<link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.html">
+<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_behavior.html">
+<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_indicator.html">
<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
-<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<dom-module id="cr-network-list-item">
<template>
@@ -15,33 +16,22 @@
outline: none;
}
- #divButtons {
- align-items: center;
- display: flex;
- flex-direction: row;
- }
-
#divDetail {
display: flex;
flex: 1 0 auto;
flex-direction: row;
}
- #divIcon {
- display: flex;
- flex-direction: column;
- flex: 0 0 auto;
- justify-content: center;
- width: 32px;
- }
-
#divOuter {
+ -webkit-margin-after: 4px;
+ -webkit-margin-before: 4px;
+ -webkit-margin-end: 12px;
+ -webkit-margin-start: 4px;
+ align-items: center;
border-style: none;
display: flex;
flex-direction: row;
- margin: 0;
height: 32px;
- padding: 4px;
}
#divOuter[first-custom-item] {
@@ -49,6 +39,7 @@
}
#divText {
+ -webkit-padding-end: 8px;
display: flex;
flex: 1 0 auto;
flex-direction: column;
@@ -75,24 +66,30 @@
color: var(--google-green-500);
}
- cr-network-icon,
iron-icon {
height: 24px;
width: 24px;
}
+
+ cr-network-icon,
+ iron-icon {
+ -webkit-padding-end: 8px;
+ }
+
+ cr-policy-network-indicator {
+ padding: 0 var(--cr-icon-padding);
+ }
</style>
<div id="divOuter" actionable$="[[isListItem]]"
first-custom-item$="[[item.isFirstCustomItem]]">
- <div id="divIcon">
- <template is="dom-if" if="[[networkState]]">
- <cr-network-icon is-list-item="[[isListItem]]"
- network-state="[[networkState]]">
- </cr-network-icon>
- </template>
- <template is="dom-if" if="[[item.polymerIcon]]">
- <iron-icon icon="[[item.polymerIcon]]"></iron-icon>
- </template>
- </div>
+ <template is="dom-if" if="[[networkState]]">
+ <cr-network-icon is-list-item="[[isListItem]]"
+ network-state="[[networkState]]">
+ </cr-network-icon>
+ </template>
+ <template is="dom-if" if="[[item.polymerIcon]]">
+ <iron-icon icon="[[item.polymerIcon]]"></iron-icon>
+ </template>
<div id="divText" class="layout horizontal flex">
<div id="itemName" connected$="[[isConnected_(networkState)]]">
[[getItemName_(item, isListItem)]]
@@ -103,13 +100,16 @@
[[getNetworkStateText_(networkState, isListItem)]]
</div>
</div>
+ <template is="dom-if" if="[[isPolicySource(networkState.Source)]]">
+ <cr-policy-network-indicator
+ indicator-type="[[getIndicatorTypeForSource(networkState.Source)]]">
+ </cr-policy-network-indicator>
+ </template>
<template is="dom-if"
- if="[[isSettingsButtonVisible_(networkState, showButtons)]]">
- <div id="divButtons">
- <paper-icon-button icon="cr:settings" on-tap="fireShowDetails_"
- tabindex$="[[tabindex]]">
- </paper-icon-button>
- </div>
+ if="[[isSubpageButtonVisible_(networkState, showButtons)]]">
+ <button class="subpage-arrow" is="paper-icon-button-light"
+ on-tap="fireShowDetails_" tabindex$="[[tabindex]]">
+ </button>
</template>
</div>
</template>