Skip to content

GitLab

T
tangled
Commit 5bc97131 authored by rbpotter's avatar rbpotter Committed by Chromium LUCI CQ
Browse files
Options

Print Preview cleanup: fix indentation in destination_list_item.html 

R=dpapad@chromium.org

Bug: None
Change-Id: I6e20db96c8c8a831ff6c624765a6a078a06e22fe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2578704
Commit-Queue: dpapad <dpapad@chromium.org>
Auto-Submit: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: default avatardpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835143}
parent e8b63823
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 100 deletions
chrome/browser/resources/print_preview/ui/destination_list_item.html
View file @ 5bc97131
<style include="cr-hidden-style">
:host {
align-items: center;
cursor: default;
display: flex;
font-size: calc(12/13 * 1em);
min-height: var(--destination-item-height);
opacity: .87;
padding-inline-end: 2px;
padding-inline-start: 14px;
vertical-align: middle;
}
<style include="cr-hidden-style"> :host > * {
:host { align-items: center;
align-items: center; color: var(--cr-secondary-text-color);
cursor: default; font-size: calc(10/12 * 1em);
display: flex; margin-inline-start: 1em;
font-size: calc(12/13 * 1em); overflow: hidden;
min-height: var(--destination-item-height); text-overflow: ellipsis;
opacity: .87; vertical-align: middle;
padding-inline-end: 2px; white-space: nowrap;
padding-inline-start: 14px; }
vertical-align: middle;
}
:host > * { iron-icon {
align-items: center; fill: var(--google-grey-600);
color: var(--cr-secondary-text-color); flex: 0;
font-size: calc(10/12 * 1em); height: 20px;
margin-inline-start: 1em; margin-inline-end: 12px;
overflow: hidden; min-width: 20px;
text-overflow: ellipsis; transition: opacity 150ms;
vertical-align: middle; }
white-space: nowrap;
}
iron-icon { @media (prefers-color-scheme: dark) {
fill: var(--google-grey-600); iron-icon {
flex: 0; fill: var(--google-grey-refresh-500);
height: 20px; }
margin-inline-end: 12px; }
min-width: 20px;
transition: opacity 150ms;
}
@media (prefers-color-scheme: dark) { .name {
iron-icon { color: var(--cr-primary-text-color);
fill: var(--google-grey-refresh-500); font-size: 1em;
} margin-inline-start: 0;
} }
.name { .extension-controlled-indicator {
color: var(--cr-primary-text-color); display: flex;
font-size: 1em; flex: 1;
margin-inline-start: 0; justify-content: flex-end;
} min-width: 150px;
}
.extension-controlled-indicator { .extension-icon {
display: flex; height: 24px;
flex: 1; margin-inline-start: 1em;
justify-content: flex-end; width: 24px;
min-width: 150px; }
}
.extension-icon { .configuring-failed-text {
height: 24px; color: var(--google-red-600);
margin-inline-start: 1em; font-style: italic;
width: 24px; }
}
.configuring-failed-text { :host([stale_]) :-webkit-any(iron-icon, .name, .connection-status) {
color: var(--google-red-600); opacity: 0.4;
font-style: italic; }
}
:host([stale_]) :-webkit-any(iron-icon, .name, .connection-status) {
opacity: 0.4;
}
<if expr="chromeos"> <if expr="chromeos">
:host([is-destination-cros-local_]) .connection-status { :host([is-destination-cros-local_]) .connection-status {
color: var(--google-red-600); color: var(--google-red-600);
} }
</if> </if>
</style> </style>
<iron-icon icon="[[destinationIcon_]]"></iron-icon> <iron-icon icon="[[destinationIcon_]]"></iron-icon>
<span class="name searchable">[[destination.displayName]]</span> <span class="name searchable">[[destination.displayName]]</span>
<span class="search-hint searchable" hidden="[[!searchHint_]]"> <span class="search-hint searchable" hidden="[[!searchHint_]]">
[[searchHint_]] [[searchHint_]]
</span> </span>
<span class="connection-status" hidden="[[!statusText_]]"> <span class="connection-status" hidden="[[!statusText_]]">
[[statusText_]] [[statusText_]]
</span> </span>
<a href="$i18n{gcpCertificateErrorLearnMoreURL}" <a href="$i18n{gcpCertificateErrorLearnMoreURL}"
target="_blank" class="learn-more-link" target="_blank" class="learn-more-link"
hidden$="[[!destination.shouldShowInvalidCertificateError]]"> hidden$="[[!destination.shouldShowInvalidCertificateError]]">
$i18n{learnMore} $i18n{learnMore}
</a> </a>
<span class="extension-controlled-indicator" <span class="extension-controlled-indicator"
hidden$="[[!destination.isExtension]]"> hidden$="[[!destination.isExtension]]">
<span class="extension-name searchable"> <span class="extension-name searchable">
[[destination.extensionName]] [[destination.extensionName]]
</span> </span>
<span class="extension-icon" role="button" tabindex="0" <span class="extension-icon" role="button" tabindex="0"
title="[[getExtensionPrinterTooltip_(destination)]]"></span> title="[[getExtensionPrinterTooltip_(destination)]]"></span>
</span> </span>
<if expr="chromeos"> <if expr="chromeos">
<span class="configuring-in-progress-text" <span class="configuring-in-progress-text"
hidden$="[[!checkConfigurationStatus_(statusEnum_.IN_PROGRESS, hidden$="[[!checkConfigurationStatus_(statusEnum_.IN_PROGRESS,
configurationStatus_)]]"> configurationStatus_)]]">
$i18n{configuringInProgressText} $i18n{configuringInProgressText}
<span class="configuring-text-jumping-dots"> <span class="configuring-text-jumping-dots">
<span>.</span><span>.</span><span>.</span> <span>.</span><span>.</span><span>.</span>
</span> </span>
</span> </span>
<span class="configuring-failed-text" <span class="configuring-failed-text"
hidden$="[[!checkConfigurationStatus_(statusEnum_.FAILED, hidden$="[[!checkConfigurationStatus_(statusEnum_.FAILED,
configurationStatus_)]]"> configurationStatus_)]]">
$i18n{configuringFailedText} $i18n{configuringFailedText}
</span> </span>
</if> </if>
chrome/test/data/webui/print_preview/destination_item_test.js
View file @ 5bc97131
...@@ -139,9 +139,8 @@ suite(destination_item_test.suiteName, function() { ...@@ -139,9 +139,8 @@ suite(destination_item_test.suiteName, function() {
// Search hint should be have the description and be highlighted. // Search hint should be have the description and be highlighted.
const hint = item.$$('.search-hint'); const hint = item.$$('.search-hint');
assertEquals( assertTrue(hint.textContent.includes(params.description));
params.description + '\n \n ' + params.description, assertFalse(hint.textContent.includes(params.location));
hint.textContent.trim());
const searchHits = hint.querySelectorAll('.search-highlight-hit'); const searchHits = hint.querySelectorAll('.search-highlight-hit');
assertEquals(1, searchHits.length); assertEquals(1, searchHits.length);
assertEquals('ABC', searchHits[0].textContent); assertEquals('ABC', searchHits[0].textContent);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment