Skip to content

Commit 83f7ca5

Browse files
authored
[sync] 2025/12/10 (#1591)
2 parents 4729713 + d662845 commit 83f7ca5

File tree

179 files changed

+8954
-4133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+8954
-4133
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
experimental: true
2929
continue-on-error: ${{ matrix.experimental }}
3030
steps:
31-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
31+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
3232
- uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046
3333
with:
3434
channel: ${{ matrix.branch }}
@@ -50,7 +50,7 @@ jobs:
5050
runs-on: ubuntu-latest
5151
if: github.repository == 'cfug/flutter.cn'
5252
steps:
53-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
53+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
5454
- uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
5555
with:
5656
sdk: beta
@@ -66,7 +66,7 @@ jobs:
6666
timeout-minutes: 30
6767
if: github.repository == 'cfug/flutter.cn'
6868
steps:
69-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
69+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
7070
- uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
7171
with:
7272
sdk: beta
@@ -92,7 +92,7 @@ jobs:
9292
runs-on: ubuntu-latest
9393
if: github.repository == 'cfug/flutter.cn'
9494
steps:
95-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
95+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
9696
- uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
9797
with:
9898
sdk: beta
@@ -110,7 +110,7 @@ jobs:
110110
github.ref == 'refs/heads/main' &&
111111
github.repository == 'cfug/flutter.cn'
112112
steps:
113-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
113+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
114114
with:
115115
# docs.flutter.cn | https://github.com/cfug/flutter.cn/pull/1518
116116
fetch-depth: 0

.github/workflows/compile_host_redirect_js.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
github.repository == 'cfug/flutter.cn' }}
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: actions/checkout@v5
25+
- uses: actions/checkout@v6
2626
- uses: actions/setup-node@v6
2727
with:
2828
node-version: ${{ env.NODE_VERSION }}

.github/workflows/stage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
if: ${{ github.event.pull_request.head.repo.full_name == 'cfug/flutter.cn' }}
1919
steps:
20-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
20+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
2121
with:
2222
# docs.flutter.cn | https://github.com/cfug/flutter.cn/pull/1518
2323
fetch-depth: 0

firebase.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
{ "source": "/development", "destination": "/", "type": 301 },
5151
{ "source": "/development/:rest*", "destination": "/:rest*", "type": 301 },
5252
{ "source": "/devtools/:rest*", "destination": "/tools/devtools/:rest*", "type": 301 },
53+
{ "source": "/download", "destination": "/install", "type": 301 },
5354
{ "source": "/downloads/:resource*", "destination": "/resources/:resource*", "type": 301 },
5455
{ "source": "/f/dart-devtools-survey-metadata.json", "destination": "https://storage.googleapis.com/flutter-uxr/surveys/devtools-survey-metadata.json", "type": 301 },
5556
{ "source": "/f/flutter-survey-metadata.json", "destination": "https://storage.googleapis.com/flutter-uxr/surveys/flutter-survey-metadata.json", "type": 301 },
@@ -360,6 +361,7 @@
360361
{ "source": "/go/dash-tooling-plugin-strategy", "destination": "https://docs.google.com/document/d/1Zc0AE8JTKfOSA-IFpEYcPFJ2eALbXE3AG4ZucWXeMig/", "type": 301 },
361362
{ "source": "/go/data-sync", "destination": "https://docs.google.com/document/d/1yH96-p-SkMmt6hL5xHHDtMvCKRz2XGrMuw9ZY_nE954", "type": 301 },
362363
{ "source": "/go/decouple-design", "destination": "https://docs.google.com/document/d/189AbzVGpxhQczTcdfJd13o_EL36t-M5jOEt1hgBIh7w/edit?usp=sharing", "type": 301 },
364+
{ "source": "/go/decoupling-design-from-text", "destination": "https://docs.google.com/document/d/1oFezK5leJzTWA5lsw3BQGx7gLbhpSL8dMleU3HD7bNY/edit?usp=sharing", "type": 301},
363365
{ "source": "/go/dds-daemon", "destination": "https://docs.google.com/document/d/18IgFakijiv9CLFGT5BckbwZuf2pqhOUeN27mB9XqvpQ/edit?usp=sharing&resourcekey=0-rBHvH9gLXLjGPWt5WE-XFg", "type": 301 },
364366
{ "source": "/go/decoupling-framework-tests", "destination": "https://docs.google.com/document/d/1UHxALQqCbmgjnM1RNV9xE2pK3IGyx-UktGX1D7hYCjs/edit?pli=1&tab=t.0", "type": 301 },
365367
{ "source": "/go/deep-link-flag-migration", "destination": "https://docs.google.com/document/d/1TUhaEhNdi2BUgKWQFEbOzJgmUAlLJwIAhnFfZraKgQs/edit?usp=sharing", "type": 301 },
@@ -436,6 +438,7 @@
436438
{ "source": "/go/flutter-drop-win7-2024", "destination": "https://docs.google.com/document/d/18gfRT8klo0zEvn6fIpders7ghoWIBKO22cNYS22WLhc/edit?resourcekey=0-SFkxdqfyM6KNNkG4zS6aaA", "type": 301 },
437439
{ "source": "/go/flutter-engine-clocks", "destination": "https://docs.google.com/document/d/1Sx8QA1qXgJGw5r4ESviDnU2LSShNHiq_LjbRWPgSvXQ/edit?usp=sharing&resourcekey=0-BoBvLxgqf_nc_rwLc0zmTw", "type": 301 },
438440
{ "source": "/go/flutter-engine-extensions", "destination": "https://docs.google.com/document/d/1xG7jR4FserdW7TdwnklF3_lXUGmt4myPQjDGF3LFtCQ/edit?resourcekey=0-Iug4D2mWuyQI6suvC_2itw#", "type": 301 },
441+
{ "source": "/go/flutter-file-system", "destination": "https://docs.google.com/document/d/150KFR6WRSqpxbUcvQriBgrv6P5DMcq6dORikf_cOgZo/edit?usp=sharing", "type": 301 },
439442
{ "source": "/go/flutter-for-embedded-linux", "destination": "https://docs.google.com/document/d/1n4NXCk0QlGz16gUCtywR79H0Z1fzPqB2iNL8oxuexuk/edit?usp=sharing", "type": 301 },
440443
{ "source": "/go/flutter-gradle-plugin-apply", "destination": "/release/breaking-changes/flutter-gradle-plugin-apply", "type": 301 },
441444
{ "source": "/go/flutter-iap-migrate-pblv2", "destination": "https://docs.google.com/document/d/1XM16UsLE_aPWoZnheE9waO06mhxLkkWjpPf9jtI1AdY/edit", "type": 301 },

site/lib/_sass/_site.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
@use 'components/alert';
1515
@use 'components/banner';
1616
@use 'components/books';
17+
@use 'components/breadcrumbs';
1718
@use 'components/button';
1819
@use 'components/card';
1920
@use 'components/code';
@@ -29,14 +30,17 @@
2930
@use 'components/misc';
3031
@use 'components/next-prev-nav';
3132
@use 'components/os-selector';
33+
@use 'components/pagenav';
34+
@use 'components/platform-cards';
3235
@use 'components/pill';
3336
@use 'components/quiz';
3437
@use 'components/sidebar';
3538
@use 'components/side-menu';
3639
@use 'components/site-switcher';
40+
@use 'components/summary-card';
41+
@use 'components/stepper';
3742
@use 'components/tabs';
3843
@use 'components/theming';
39-
@use 'components/toc';
4044
@use 'components/tooltip';
4145
@use 'components/trailing';
4246

site/lib/_sass/base/_base.scss

Lines changed: 18 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ body {
88
color: var(--site-base-fgColor);
99

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

1517
// If the TOC is disabled, reduce the subheader height to
@@ -46,8 +48,13 @@ h2 {
4648
}
4749

4850
dd {
49-
margin-bottom: .75rem;
51+
margin-block-end: .75rem;
5052
margin-left: 1rem;
53+
54+
>p:only-child {
55+
margin-block-start: 1rem;
56+
margin-block-end: 1rem;
57+
}
5158
}
5259

5360
img {
@@ -153,43 +160,6 @@ main figure {
153160
font-style: italic;
154161
text-align: center;
155162
}
156-
157-
&.code-and-image {
158-
gap: 0.25rem;
159-
justify-content: space-between;
160-
flex-direction: row;
161-
flex-wrap: wrap;
162-
163-
>div {
164-
width: 100%;
165-
166-
&:last-child {
167-
text-align: center;
168-
}
169-
}
170-
171-
@media(min-width: 769px) {
172-
>div {
173-
&:first-child {
174-
flex: 0 0 58%;
175-
max-width: 58%;
176-
}
177-
178-
&:last-child {
179-
flex: 0 0 40%;
180-
max-width: 40%;
181-
}
182-
}
183-
184-
figcaption {
185-
text-align: left;
186-
}
187-
188-
img {
189-
max-width: 100%;
190-
}
191-
}
192-
}
193163
}
194164

195165
.text-icon {
@@ -353,14 +323,19 @@ ol.steps {
353323
margin-block-end: 0.75rem;
354324
}
355325

326+
>h3:first-child,
327+
>p:first-child {
328+
height: $step-indicator-height;
329+
margin-block-end: 0.5rem;
330+
font-weight: 500;
331+
}
332+
356333
>h3:first-child {
357334
display: flex;
358335
align-items: center;
359-
height: $step-indicator-height;
360336
font-size: 1.125rem;
361337
font-weight: 500;
362338
color: var(--site-base-fgColor-lighter);
363-
margin-block-end: 0.5rem;
364339
}
365340

366341
padding-block-end: 0.75rem;
@@ -429,6 +404,7 @@ p+dl {
429404
}
430405

431406
.figure-caption {
407+
margin-top: 0.25rem;
432408
font-size: .875rem;
433409
font-style: italic;
434410
color: var(--site-base-fgColor-lighter);
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
nav.breadcrumbs {
2+
align-items: center;
3+
4+
ol.breadcrumb-list {
5+
margin: 0;
6+
padding: 0;
7+
border-radius: var(--site-radius);
8+
font-size: 0.925rem;
9+
10+
align-items: center;
11+
list-style: none;
12+
13+
font-family: var(--site-ui-fontFamily);
14+
15+
display: flex;
16+
flex-wrap: wrap;
17+
flex-direction: row;
18+
19+
li.breadcrumb-item {
20+
display: flex;
21+
flex-direction: row;
22+
align-items: center;
23+
padding: 0;
24+
25+
& a {
26+
padding: 0.125rem;
27+
border-radius: 0.125rem;
28+
}
29+
30+
&.active a {
31+
color: var(--site-base-fgColor-lighter);
32+
cursor: default;
33+
text-decoration: none;
34+
}
35+
36+
&:before {
37+
display: none;
38+
}
39+
}
40+
41+
.material-symbols {
42+
user-select: none;
43+
font-size: 1.25rem;
44+
color: var(--site-base-fgColor-lighter);
45+
}
46+
}
47+
}

site/lib/_sass/components/_button.scss

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,22 @@ button {
9494
}
9595
}
9696
}
97+
98+
.segmented-button {
99+
display: inline-flex;
100+
101+
a,
102+
button {
103+
&:not(:last-child) {
104+
border-top-right-radius: 0;
105+
border-bottom-right-radius: 0;
106+
107+
border-right: 1px solid var(--site-outline-variant);
108+
}
109+
110+
&:not(:first-child) {
111+
border-top-left-radius: 0;
112+
border-bottom-left-radius: 0;
113+
}
114+
}
115+
}

0 commit comments

Comments
 (0)