Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix inconsistency between package list and package page copy icon opacities #8559

Merged
merged 2 commits into from
Feb 12, 2025
Merged

Fix inconsistency between package list and package page copy icon opacities #8559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9ed985
Cleanup after enabling experiments. (#8560)
isoos Feb 12, 2025
178893b
Fix inconsistency between package list and package page copy icon opa…
isoos Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions app/lib/frontend/handlers/experimental.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,7 @@ import '../../shared/cookie_utils.dart';
typedef PublicFlag = ({String name, String description});

const _publicFlags = <PublicFlag>{
(name: 'dark', description: 'Dark mode'),
(name: 'search-completion', description: 'Completions for the search bar'),
(name: 'search-topics', description: 'Show matching topics when searching'),
(
name: 'download-counts-version-chart',
description: 'Show downloads counts version chart'
),
};

final _allFlags = <String>{
Expand Down Expand Up @@ -92,14 +86,10 @@ class ExperimentalFlags {
return params;
}

bool get isSearchCompletionEnabled => true;
bool get isSearchTopicsEnabled => isEnabled('search-topics');

bool get isDarkModeEnabled => true;
bool get isDarkModeDefault => isEnabled('dark-as-default');

bool get showDownloadCountsVersionChart => true;

String encodedAsCookie() => _enabled.join(':');

@override
Expand Down
3 changes: 2 additions & 1 deletion app/lib/frontend/templates/views/pkg/package_list.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,8 @@ d.Node _item({
classes: ['packages-header'],
children: [
d.h3(classes: [
'packages-title'
'packages-title',
'pub-monochrome-icon-hoverable',
], children: [
d.a(href: url, text: name),
if (copyIcon != null) copyIcon,
Expand Down
4 changes: 1 addition & 3 deletions app/lib/frontend/templates/views/pkg/score_tab.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import 'package:pub_dev/shared/utils.dart';
import '../../../../scorecard/models.dart' hide ReportStatus;
import '../../../../shared/urls.dart' as urls;
import '../../../dom/dom.dart' as d;
import '../../../request_context.dart';
import '../../../static_files.dart';

/// Renders the score page content.
Expand Down Expand Up @@ -95,8 +94,7 @@ d.Node scoreTabNode({
d.text(' for details.'),
],
),
if (card.weeklyVersionDownloads != null &&
requestContext.experimentalFlags.showDownloadCountsVersionChart)
if (card.weeklyVersionDownloads != null)
_downloadsChart(card.weeklyVersionDownloads!),
]);
}
Expand Down
5 changes: 4 additions & 1 deletion app/lib/frontend/templates/views/shared/detail/header.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,10 @@ d.Node detailHeaderNode({
d.div(
classes: ['detail-header-content-block'],
children: [
d.h1(classes: ['title'], child: titleNode),
d.h1(
classes: ['title', 'pub-monochrome-icon-hoverable'],
child: titleNode,
),
d.div(classes: ['metadata'], child: metadataNode),
if (tagsNode != null || likeCount != null)
d.div(
Expand Down
4 changes: 1 addition & 3 deletions app/lib/frontend/templates/views/shared/search_banner.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import 'dart:convert';

import 'package:_pub_shared/data/completion.dart';
import 'package:pub_dev/frontend/request_context.dart';

import '../../../dom/dom.dart' as d;
import '../../../static_files.dart' show staticUrls;
Expand Down Expand Up @@ -36,8 +35,7 @@ d.Node searchBannerNode({
value: queryText,
attributes: {
'title': 'Search',
if (requestContext.experimentalFlags.isSearchCompletionEnabled)
'data-widget': 'completion',
'data-widget': 'completion',
'data-completion-src': '/api/search-input-completion-data',
'data-completion-class': 'search-completion',
},
Expand Down
23 changes: 7 additions & 16 deletions app/lib/frontend/templates/views/shared/site_header.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.

import 'package:pub_dev/frontend/request_context.dart';

import '../../../../account/models.dart' show SessionData;
import '../../../../shared/urls.dart' as urls;
import '../../../dom/dom.dart' as d;
Expand Down Expand Up @@ -116,24 +114,17 @@ d.Node siteHeaderNode({
_userBlock(userSession),
],
),
_themeSwitcher(),
// TODO: consider using Material symbols similar to dartdoc:
// <span id="dark-theme-button" class="material-symbols-outlined">dark_mode</span>
// <span id="light-theme-button" class="material-symbols-outlined">light_mode</span>
d.button(
classes: ['-pub-theme-toggle'],
ariaLabel: 'light/dark theme toggle',
),
],
);
}

d.Node _themeSwitcher() {
// <span id="dark-theme-button" class="material-symbols-outlined">dark_mode</span>
// <span id="light-theme-button" class="material-symbols-outlined">light_mode</span>
if (requestContext.experimentalFlags.isDarkModeEnabled) {
return d.fragment([
d.button(
classes: ['-pub-theme-toggle'], ariaLabel: 'light/dark theme toggle'),
]);
} else {
return d.fragment([]);
}
}

d.Node _userBlock(SessionData userSession) {
return d.div(
classes: ['nav-container', 'nav-profile-container', 'hoverable'],
Expand Down
2 changes: 1 addition & 1 deletion app/test/frontend/golden/my_activity_log_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ <h3 class="foldable-button">
<img class="detail-header-image" src="https://www.gravatar.com/avatar/92c525024f1911332fe1d0f7dd750977?d=retro&amp;s=200=s400" alt="user profile picture" width="200" height="200"/>
</div>
<div class="detail-header-content-block">
<h1 class="title">admin</h1>
<h1 class="title pub-monochrome-icon-hoverable">admin</h1>
<div class="metadata">
<p>[email protected]</p>
<p>
Expand Down
2 changes: 1 addition & 1 deletion app/test/frontend/golden/my_liked_packages.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ <h3 class="foldable-button">
<img class="detail-header-image" src="https://www.gravatar.com/avatar/f1983c9193966b63c29c141c02db9a34?d=retro&amp;s=200=s400" alt="user profile picture" width="200" height="200"/>
</div>
<div class="detail-header-content-block">
<h1 class="title">user</h1>
<h1 class="title pub-monochrome-icon-hoverable">user</h1>
<div class="metadata">
<p>[email protected]</p>
<p>
Expand Down
6 changes: 3 additions & 3 deletions app/test/frontend/golden/my_packages.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ <h3 class="foldable-button">
<img class="detail-header-image" src="https://www.gravatar.com/avatar/f1983c9193966b63c29c141c02db9a34?d=retro&amp;s=200=s400" alt="user profile picture" width="200" height="200"/>
</div>
<div class="detail-header-content-block">
<h1 class="title">user</h1>
<h1 class="title pub-monochrome-icon-hoverable">user</h1>
<div class="metadata">
<p>[email protected]</p>
<p>
Expand Down Expand Up @@ -183,7 +183,7 @@ <h1 class="title">user</h1>
<div class="packages">
<div class="packages-item">
<div class="packages-header">
<h3 class="packages-title">
<h3 class="packages-title pub-monochrome-icon-hoverable">
<a href="/packages/oxygen">oxygen</a>
<span class="pkg-page-title-copy">
<img class="pub-monochrome-icon pkg-page-title-copy-icon filter-invert-on-dark" src="/static/hash-%%etag%%/img/content-copy-icon.svg" alt="copy &quot;oxygen: ^1.2.0&quot; to clipboard" width="18" height="18" title="Copy &quot;oxygen: ^1.2.0&quot; to clipboard" data-copy-content="oxygen: ^1.2.0" data-ga-click-event="copy-package-version"/>
Expand Down Expand Up @@ -266,7 +266,7 @@ <h3 class="packages-title">
</div>
<div class="packages-item">
<div class="packages-header">
<h3 class="packages-title">
<h3 class="packages-title pub-monochrome-icon-hoverable">
<a href="/packages/neon">neon</a>
<span class="pkg-page-title-copy">
<img class="pub-monochrome-icon pkg-page-title-copy-icon filter-invert-on-dark" src="/static/hash-%%etag%%/img/content-copy-icon.svg" alt="copy &quot;neon: ^1.0.0&quot; to clipboard" width="18" height="18" title="Copy &quot;neon: ^1.0.0&quot; to clipboard" data-copy-content="neon: ^1.0.0" data-ga-click-event="copy-package-version"/>
Expand Down
2 changes: 1 addition & 1 deletion app/test/frontend/golden/my_publishers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ <h3 class="foldable-button">
<img class="detail-header-image" src="https://www.gravatar.com/avatar/f1983c9193966b63c29c141c02db9a34?d=retro&amp;s=200=s400" alt="user profile picture" width="200" height="200"/>
</div>
<div class="detail-header-content-block">
<h1 class="title">user</h1>
<h1 class="title pub-monochrome-icon-hoverable">user</h1>
<div class="metadata">
<p>[email protected]</p>
<p>
Expand Down
2 changes: 1 addition & 1 deletion app/test/frontend/golden/pkg_activity_log_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ <h3 class="foldable-button">
<div class="detail-container">
<div class="detail-header-outer-block">
<div class="detail-header-content-block">
<h1 class="title">
<h1 class="title pub-monochrome-icon-hoverable">
oxygen 1.2.0
<span class="pkg-page-title-copy">
<img class="pub-monochrome-icon pkg-page-title-copy-icon filter-invert-on-dark" src="/static/hash-%%etag%%/img/content-copy-icon.svg" alt="copy &quot;oxygen: ^1.2.0&quot; to clipboard" width="18" height="18" title="Copy &quot;oxygen: ^1.2.0&quot; to clipboard" data-copy-content="oxygen: ^1.2.0" data-ga-click-event="copy-package-version"/>
Expand Down
2 changes: 1 addition & 1 deletion app/test/frontend/golden/pkg_admin_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ <h3 class="foldable-button">
<div class="detail-container">
<div class="detail-header-outer-block">
<div class="detail-header-content-block">
<h1 class="title">
<h1 class="title pub-monochrome-icon-hoverable">
oxygen 1.2.0
<span class="pkg-page-title-copy">
<img class="pub-monochrome-icon pkg-page-title-copy-icon filter-invert-on-dark" src="/static/hash-%%etag%%/img/content-copy-icon.svg" alt="copy &quot;oxygen: ^1.2.0&quot; to clipboard" width="18" height="18" title="Copy &quot;oxygen: ^1.2.0&quot; to clipboard" data-copy-content="oxygen: ^1.2.0" data-ga-click-event="copy-package-version"/>
Expand Down
2 changes: 1 addition & 1 deletion app/test/frontend/golden/pkg_changelog_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ <h3 class="foldable-button">
<div class="detail-container">
<div class="detail-header-outer-block">
<div class="detail-header-content-block">
<h1 class="title">
<h1 class="title pub-monochrome-icon-hoverable">
oxygen 1.2.0
<span class="pkg-page-title-copy">
<img class="pub-monochrome-icon pkg-page-title-copy-icon filter-invert-on-dark" src="/static/hash-%%etag%%/img/content-copy-icon.svg" alt="copy &quot;oxygen: ^1.2.0&quot; to clipboard" width="18" height="18" title="Copy &quot;oxygen: ^1.2.0&quot; to clipboard" data-copy-content="oxygen: ^1.2.0" data-ga-click-event="copy-package-version"/>
Expand Down
2 changes: 1 addition & 1 deletion app/test/frontend/golden/pkg_example_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ <h3 class="foldable-button">
<div class="detail-container">
<div class="detail-header-outer-block">
<div class="detail-header-content-block">
<h1 class="title">
<h1 class="title pub-monochrome-icon-hoverable">
oxygen 1.2.0
<span class="pkg-page-title-copy">
<img class="pub-monochrome-icon pkg-page-title-copy-icon filter-invert-on-dark" src="/static/hash-%%etag%%/img/content-copy-icon.svg" alt="copy &quot;oxygen: ^1.2.0&quot; to clipboard" width="18" height="18" title="Copy &quot;oxygen: ^1.2.0&quot; to clipboard" data-copy-content="oxygen: ^1.2.0" data-ga-click-event="copy-package-version"/>
Expand Down
6 changes: 3 additions & 3 deletions app/test/frontend/golden/pkg_index_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ <h3 class="search-form-section-header foldable-button">
<div class="packages">
<div class="packages-item">
<div class="packages-header">
<h3 class="packages-title">
<h3 class="packages-title pub-monochrome-icon-hoverable">
<a href="https://api.dart.dev/library-page.html">dart:core</a>
</h3>
</div>
Expand All @@ -450,7 +450,7 @@ <h3 class="packages-title">
</div>
<div class="packages-item">
<div class="packages-header">
<h3 class="packages-title">
<h3 class="packages-title pub-monochrome-icon-hoverable">
<a href="/packages/oxygen">oxygen</a>
<span class="pkg-page-title-copy">
<img class="pub-monochrome-icon pkg-page-title-copy-icon filter-invert-on-dark" src="/static/hash-%%etag%%/img/content-copy-icon.svg" alt="copy &quot;oxygen: ^1.2.0&quot; to clipboard" width="18" height="18" title="Copy &quot;oxygen: ^1.2.0&quot; to clipboard" data-copy-content="oxygen: ^1.2.0" data-ga-click-event="copy-package-version"/>
Expand Down Expand Up @@ -533,7 +533,7 @@ <h3 class="packages-title">
</div>
<div class="packages-item">
<div class="packages-header">
<h3 class="packages-title">
<h3 class="packages-title pub-monochrome-icon-hoverable">
<a href="/packages/flutter_titanium">flutter_titanium</a>
<span class="pkg-page-title-copy">
<img class="pub-monochrome-icon pkg-page-title-copy-icon filter-invert-on-dark" src="/static/hash-%%etag%%/img/content-copy-icon.svg" alt="copy &quot;flutter_titanium: ^1.10.0&quot; to clipboard" width="18" height="18" title="Copy &quot;flutter_titanium: ^1.10.0&quot; to clipboard" data-copy-content="flutter_titanium: ^1.10.0" data-ga-click-event="copy-package-version"/>
Expand Down
2 changes: 1 addition & 1 deletion app/test/frontend/golden/pkg_install_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ <h3 class="foldable-button">
<div class="detail-container">
<div class="detail-header-outer-block">
<div class="detail-header-content-block">
<h1 class="title">
<h1 class="title pub-monochrome-icon-hoverable">
oxygen 1.2.0
<span class="pkg-page-title-copy">
<img class="pub-monochrome-icon pkg-page-title-copy-icon filter-invert-on-dark" src="/static/hash-%%etag%%/img/content-copy-icon.svg" alt="copy &quot;oxygen: ^1.2.0&quot; to clipboard" width="18" height="18" title="Copy &quot;oxygen: ^1.2.0&quot; to clipboard" data-copy-content="oxygen: ^1.2.0" data-ga-click-event="copy-package-version"/>
Expand Down
2 changes: 1 addition & 1 deletion app/test/frontend/golden/pkg_score_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ <h3 class="foldable-button">
<div class="detail-container">
<div class="detail-header-outer-block">
<div class="detail-header-content-block">
<h1 class="title">
<h1 class="title pub-monochrome-icon-hoverable">
oxygen 1.2.0
<span class="pkg-page-title-copy">
<img class="pub-monochrome-icon pkg-page-title-copy-icon filter-invert-on-dark" src="/static/hash-%%etag%%/img/content-copy-icon.svg" alt="copy &quot;oxygen: ^1.2.0&quot; to clipboard" width="18" height="18" title="Copy &quot;oxygen: ^1.2.0&quot; to clipboard" data-copy-content="oxygen: ^1.2.0" data-ga-click-event="copy-package-version"/>
Expand Down
2 changes: 1 addition & 1 deletion app/test/frontend/golden/pkg_score_page_with_downloads_chart.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ <h3 class="foldable-button">
<div class="detail-container">
<div class="detail-header-outer-block">
<div class="detail-header-content-block">
<h1 class="title">
<h1 class="title pub-monochrome-icon-hoverable">
oxygen 1.2.0
<span class="pkg-page-title-copy">
<img class="pub-monochrome-icon pkg-page-title-copy-icon filter-invert-on-dark" src="/static/hash-%%etag%%/img/content-copy-icon.svg" alt="copy &quot;oxygen: ^1.2.0&quot; to clipboard" width="18" height="18" title="Copy &quot;oxygen: ^1.2.0&quot; to clipboard" data-copy-content="oxygen: ^1.2.0" data-ga-click-event="copy-package-version"/>
Expand Down
2 changes: 1 addition & 1 deletion app/test/frontend/golden/pkg_show_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ <h3 class="foldable-button">
<div class="detail-container">
<div class="detail-header-outer-block">
<div class="detail-header-content-block">
<h1 class="title">
<h1 class="title pub-monochrome-icon-hoverable">
oxygen 1.2.0
<span class="pkg-page-title-copy">
<img class="pub-monochrome-icon pkg-page-title-copy-icon filter-invert-on-dark" src="/static/hash-%%etag%%/img/content-copy-icon.svg" alt="copy &quot;oxygen: ^1.2.0&quot; to clipboard" width="18" height="18" title="Copy &quot;oxygen: ^1.2.0&quot; to clipboard" data-copy-content="oxygen: ^1.2.0" data-ga-click-event="copy-package-version"/>
Expand Down
2 changes: 1 addition & 1 deletion app/test/frontend/golden/pkg_show_page_discontinued.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ <h3 class="foldable-button">
<div class="detail-container">
<div class="detail-header-outer-block">
<div class="detail-header-content-block">
<h1 class="title">
<h1 class="title pub-monochrome-icon-hoverable">
pkg 1.0.0
<span class="pkg-page-title-copy">
<img class="pub-monochrome-icon pkg-page-title-copy-icon filter-invert-on-dark" src="/static/hash-%%etag%%/img/content-copy-icon.svg" alt="copy &quot;pkg: ^1.0.0&quot; to clipboard" width="18" height="18" title="Copy &quot;pkg: ^1.0.0&quot; to clipboard" data-copy-content="pkg: ^1.0.0" data-ga-click-event="copy-package-version"/>
Expand Down
2 changes: 1 addition & 1 deletion app/test/frontend/golden/pkg_show_page_flutter_plugin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ <h3 class="foldable-button">
<div class="detail-container">
<div class="detail-header-outer-block">
<div class="detail-header-content-block">
<h1 class="title">
<h1 class="title pub-monochrome-icon-hoverable">
flutter_titanium 1.10.0
<span class="pkg-page-title-copy">
<img class="pub-monochrome-icon pkg-page-title-copy-icon filter-invert-on-dark" src="/static/hash-%%etag%%/img/content-copy-icon.svg" alt="copy &quot;flutter_titanium: ^1.10.0&quot; to clipboard" width="18" height="18" title="Copy &quot;flutter_titanium: ^1.10.0&quot; to clipboard" data-copy-content="flutter_titanium: ^1.10.0" data-ga-click-event="copy-package-version"/>
Expand Down
2 changes: 1 addition & 1 deletion app/test/frontend/golden/pkg_show_page_publisher.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ <h3 class="foldable-button">
<div class="detail-container">
<div class="detail-header-outer-block">
<div class="detail-header-content-block">
<h1 class="title">
<h1 class="title pub-monochrome-icon-hoverable">
neon 1.0.0
<span class="pkg-page-title-copy">
<img class="pub-monochrome-icon pkg-page-title-copy-icon filter-invert-on-dark" src="/static/hash-%%etag%%/img/content-copy-icon.svg" alt="copy &quot;neon: ^1.0.0&quot; to clipboard" width="18" height="18" title="Copy &quot;neon: ^1.0.0&quot; to clipboard" data-copy-content="neon: ^1.0.0" data-ga-click-event="copy-package-version"/>
Expand Down
2 changes: 1 addition & 1 deletion app/test/frontend/golden/pkg_show_page_retracted.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ <h3 class="foldable-button">
<div class="detail-container">
<div class="detail-header-outer-block">
<div class="detail-header-content-block">
<h1 class="title">
<h1 class="title pub-monochrome-icon-hoverable">
pkg 1.0.0
<span class="pkg-page-title-copy">
<img class="pub-monochrome-icon pkg-page-title-copy-icon filter-invert-on-dark" src="/static/hash-%%etag%%/img/content-copy-icon.svg" alt="copy &quot;pkg: ^1.0.0&quot; to clipboard" width="18" height="18" title="Copy &quot;pkg: ^1.0.0&quot; to clipboard" data-copy-content="pkg: ^1.0.0" data-ga-click-event="copy-package-version"/>
Expand Down
2 changes: 1 addition & 1 deletion app/test/frontend/golden/pkg_show_page_retracted_non_retracted_version.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ <h3 class="foldable-button">
<div class="detail-container">
<div class="detail-header-outer-block">
<div class="detail-header-content-block">
<h1 class="title">
<h1 class="title pub-monochrome-icon-hoverable">
pkg 2.0.0
<span class="pkg-page-title-copy">
<img class="pub-monochrome-icon pkg-page-title-copy-icon filter-invert-on-dark" src="/static/hash-%%etag%%/img/content-copy-icon.svg" alt="copy &quot;pkg: ^2.0.0&quot; to clipboard" width="18" height="18" title="Copy &quot;pkg: ^2.0.0&quot; to clipboard" data-copy-content="pkg: ^2.0.0" data-ga-click-event="copy-package-version"/>
Expand Down
Loading
Loading