Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@fe4161a26a8629af62121b670040955b330f9af2
uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -44,7 +44,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@fe4161a26a8629af62121b670040955b330f9af2
uses: github/codeql-action/autobuild@fdbfb4d2750291e159f0156def62b853c2798ca2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -58,4 +58,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@fe4161a26a8629af62121b670040955b330f9af2
uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
experimental: true
continue-on-error: ${{ matrix.experimental }}
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
- uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046
with:
channel: ${{ matrix.branch }}
Expand All @@ -52,7 +52,7 @@ jobs:
runs-on: ubuntu-latest
if: github.repository == 'flutter/website'
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
- uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
with:
sdk: beta
Expand All @@ -67,7 +67,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
- uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
with:
sdk: beta
Expand All @@ -87,7 +87,7 @@ jobs:
runs-on: ubuntu-latest
if: github.repository == 'flutter/website'
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
- uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
with:
sdk: beta
Expand Down
1 change: 0 additions & 1 deletion firebase.json
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,6 @@
{ "source": "/go/dash-tooling-plugin-strategy", "destination": "https://docs.google.com/document/d/1Zc0AE8JTKfOSA-IFpEYcPFJ2eALbXE3AG4ZucWXeMig/", "type": 301 },
{ "source": "/go/data-sync", "destination": "https://docs.google.com/document/d/1yH96-p-SkMmt6hL5xHHDtMvCKRz2XGrMuw9ZY_nE954", "type": 301 },
{ "source": "/go/decouple-design", "destination": "https://docs.google.com/document/d/189AbzVGpxhQczTcdfJd13o_EL36t-M5jOEt1hgBIh7w/edit?usp=sharing", "type": 301 },
{ "source": "/go/decoupling-design-from-text", "destination": "https://docs.google.com/document/d/1oFezK5leJzTWA5lsw3BQGx7gLbhpSL8dMleU3HD7bNY/edit?usp=sharing", "type": 301},
{ "source": "/go/dds-daemon", "destination": "https://docs.google.com/document/d/18IgFakijiv9CLFGT5BckbwZuf2pqhOUeN27mB9XqvpQ/edit?usp=sharing&resourcekey=0-rBHvH9gLXLjGPWt5WE-XFg", "type": 301 },
{ "source": "/go/decoupling-framework-tests", "destination": "https://docs.google.com/document/d/1UHxALQqCbmgjnM1RNV9xE2pK3IGyx-UktGX1D7hYCjs/edit?pli=1&tab=t.0", "type": 301 },
{ "source": "/go/deep-link-flag-migration", "destination": "https://docs.google.com/document/d/1TUhaEhNdi2BUgKWQFEbOzJgmUAlLJwIAhnFfZraKgQs/edit?usp=sharing", "type": 301 },
Expand Down
6 changes: 2 additions & 4 deletions site/lib/_sass/base/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@ body {
color: var(--site-base-fgColor);

// The top TOC is not shown on narrow screens.
&:not(:has(#site-subheader.show-always)) {
@media (min-width: 1200px) {
--site-subheader-height: 0rem;
}
@media (min-width: 1200px) {
--site-subheader-height: 0rem;
}

// If the TOC is disabled, reduce the subheader height to
Expand Down
7 changes: 5 additions & 2 deletions site/lib/_sass/components/_code.scss
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,11 @@ pre {
}
}

span[aria-hidden="true"] {
user-select: none;
.terminal-command::before {
color: $margin-fgColor;
content: "$";
content: "$" / "";
padding-right: 0.5rem;
}
}

Expand Down
12 changes: 4 additions & 8 deletions site/lib/_sass/components/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
border-bottom: 0.1rem solid var(--site-outline-variant);

@media (min-width: 1200px) {
&:not(:has(~* #site-subheader.show-always)) {
box-shadow: 0 2px 4px rgba(0, 0, 0, .05);
border-bottom: none;
}
box-shadow: 0 2px 4px rgba(0, 0, 0, .05);
border-bottom: none;
}

.navbar {
Expand Down Expand Up @@ -188,9 +186,7 @@ body.open_menu #menu-toggle span.material-symbols {
border-bottom: 0.1rem solid var(--site-outline-variant);
box-shadow: 0 2px 4px rgba(0, 0, 0, .05);

&:not(.show-always) {
@media (width < 240px), (width >= 1200px) {
display: none;
}
@media (width < 240px), (width >= 1200px) {
display: none;
}
}
116 changes: 16 additions & 100 deletions site/lib/_sass/components/_pagenav.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#pagenav {
flex-grow: 1;
min-width: 0;
max-width: 100%;

>button.dropdown-button {
display: flex;
Expand All @@ -24,56 +23,29 @@
color: var(--site-base-fgColor-alt);
font-size: 20px;
}

>.material-symbols:first-child {
margin-right: 0.25rem;
}
}

.toc-breadcrumb {
flex-shrink: 2;
.toc-intro {
white-space: nowrap;
overflow: hidden;

&.toc-hide-medium {
@media (width < 576px) {
display: none;
}
}

&.toc-hide-small {
@media (width < 420px) {
display: none;
}
}

span:not(.material-symbols) {
overflow: hidden;
text-overflow: ellipsis;
.material-symbols {
margin-right: 0.25rem;
}
}

.page-number {
flex-shrink: 0;
height: 1.3rem;
width: 1.3rem;
.toc-current {
display: none;

margin-right: 0.4rem;
background-color: var(--site-primary-color);
color: var(--site-onPrimary-color-lightest);
@media (min-width: 320px) {
display: flex;
}
}

.toc-current {
flex-shrink: 1;
flex-wrap: nowrap;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;

color: var(--site-base-fgColor-alt);

span:last-child {
overflow: hidden;
text-overflow: ellipsis;
}
}

#pagenav-content {
Expand All @@ -92,13 +64,7 @@
scrollbar-width: thin;
overscroll-behavior: contain;

padding: 0.5rem;

>div {
display: flex;
flex-direction: column;
gap: 0.25rem;
}
padding: 0.2rem 0.4rem;

@media (min-width: 420px) {
border: none;
Expand All @@ -119,7 +85,6 @@
text-decoration: none;
display: flex;
align-items: center;
gap: 4px;
color: var(--site-base-fgColor-alt);
font-weight: 500;

Expand All @@ -128,6 +93,10 @@
user-select: none;
}

span:last-child {
margin-left: 3px;
}

&:hover {
color: var(--site-link-fgColor);
}
Expand All @@ -140,58 +109,5 @@
nav {
padding: 0.6rem 0 0.8rem;
}

.page-link {
display: flex;
align-items: center;
gap: 0.5rem;

padding: 0;
font-weight: 400;
text-decoration: none;
color: var(--site-base-fgColor);

&:hover {
color: var(--site-link-fgColor);
}

&.active .page-number {
background-color: var(--site-primary-color);
color: var(--site-onPrimary-color-lightest);
}

&:not(.active):has(~.page-link.active) .page-number {
background-color: var(--site-onPrimary-color-light);
color: var(--site-primary-color);
}

~nav {
padding: 0;
}
}

.page-divider {
padding: 0.25rem;
font-weight: 600;
color: var(--site-base-fgColor-alt);
}

.dropdown-divider:has(~.page-link) {
margin-top: 0.6rem;
}
}

.page-number {
width: 25px;
height: 25px;
border-radius: 50%;
background: var(--site-inset-borderColor);
color: var(--site-base-fgColor);
display: inline-flex;
align-items: center;
justify-content: center;
font-weight: 500;

transition: background-color 300ms ease, color 300ms ease;
}
}
}
2 changes: 1 addition & 1 deletion site/lib/_sass/components/_tooltip.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@
visibility: visible;
}
}
}
}
4 changes: 1 addition & 3 deletions site/lib/jaspr_options.dart
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,7 @@ Map<String, dynamic> _prefix10DartPadInjector(prefix10.DartPadInjector c) => {
'runAutomatically': c.runAutomatically,
};
Map<String, dynamic> _prefix11PageNav(prefix11.PageNav c) => {
'breadcrumbs': c.breadcrumbs,
'pageNumber': c.pageNumber,
'initialHeading': c.initialHeading,
'title': c.title,
'content': c.content.toId(),
};
Map<String, dynamic> _prefix15ArchiveTable(prefix15.ArchiveTable c) => {
Expand Down
15 changes: 2 additions & 13 deletions site/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,20 @@ import 'src/components/common/code_preview.dart';
import 'src/components/common/dash_image.dart';
import 'src/components/common/tabs.dart';
import 'src/components/common/youtube_embed.dart';
import 'src/components/pages/architecture_recommendations.dart';
import 'src/components/pages/archive_table.dart';
import 'src/components/pages/devtools_release_notes_index.dart';
import 'src/components/pages/expansion_list.dart';
import 'src/components/pages/learning_resource_index.dart';
import 'src/components/pages/widget_catalog.dart';
import 'src/components/tutorial/downloadable_snippet.dart';
import 'src/components/tutorial/progress_ring.dart';
import 'src/components/tutorial/quiz.dart';
import 'src/components/tutorial/stepper.dart';
import 'src/components/tutorial/summary_card.dart';
import 'src/components/tutorial/tutorial_outline.dart';
import 'src/components/util/component_ref.dart';
import 'src/extensions/registry.dart';
import 'src/layouts/catalog_page_layout.dart';
import 'src/layouts/doc_layout.dart';
import 'src/layouts/toc_layout.dart';
import 'src/layouts/tutorial_layout.dart';
import 'src/loaders/data_processor.dart';
import 'src/markdown/markdown_parser.dart';
import 'src/pages/custom_pages.dart';
Expand Down Expand Up @@ -73,11 +70,7 @@ Component get _docsFlutterDevSite => ContentApp.custom(
rawOutputPattern: _passThroughPattern,
extensions: allNodeProcessingExtensions,
components: _embeddableComponents,
layouts: const [
DocLayout(),
TocLayout(),
TutorialLayout(),
],
layouts: const [DocLayout(), TocLayout(), CatalogPageLayout()],
theme: const ContentTheme.none(),
secondaryOutputs: [
const RobotsTxtOutput(),
Expand Down Expand Up @@ -116,10 +109,6 @@ List<CustomComponent> get _embeddableComponents => [
const SummaryCard(),
const DownloadableSnippet(),
const Stepper(),
const WidgetCatalogCategories(),
const TutorialOutline(),
const WidgetCatalogGrid(),
const ArchitectureRecommendations(),
CustomComponent(
pattern: RegExp('OSSelector', caseSensitive: false),
builder: (_, _, _) => const OsSelector(),
Expand Down
Loading
Loading