Skip to content

Commit 6bb15b9

Browse files
committed
Merge branch 'main' into dev
2 parents 47eda74 + 69ac1d5 commit 6bb15b9

43 files changed

Lines changed: 842 additions & 304 deletions

File tree

Some content is hidden

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

‎MODULE.bazel‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ module(
66

77
bazel_dep(name = "rules_pkg", version = "1.2.0")
88
bazel_dep(name = "rules_nodejs", version = "6.7.4")
9-
bazel_dep(name = "aspect_rules_ts", version = "3.8.10")
10-
bazel_dep(name = "aspect_rules_js", version = "3.2.1")
9+
bazel_dep(name = "aspect_rules_ts", version = "3.8.11")
10+
bazel_dep(name = "aspect_rules_js", version = "3.2.2")
1111
bazel_dep(name = "aspect_rules_esbuild", version = "0.26.0")
1212
bazel_dep(name = "aspect_rules_jasmine", version = "2.0.4")
1313
bazel_dep(name = "aspect_rules_rollup", version = "2.0.1")
@@ -18,14 +18,14 @@ bazel_dep(name = "yq.bzl", version = "0.3.6")
1818
bazel_dep(name = "rules_angular")
1919
git_override(
2020
module_name = "rules_angular",
21-
commit = "30ecbe46b3c645264494abc3b2dc842cc5146be0",
21+
commit = "4025fae590e5c1a48eaa289e20ab54e401d0a396",
2222
remote = "https://github.com/angular/rules_angular.git",
2323
)
2424

2525
bazel_dep(name = "devinfra")
2626
git_override(
2727
module_name = "devinfra",
28-
commit = "a1b3577967af3711fe39cdfb605c2cd991e66add",
28+
commit = "ab0dc25e660b6704fb1144f0a62786776575b55d",
2929
remote = "https://github.com/angular/dev-infra.git",
3030
)
3131

@@ -39,7 +39,7 @@ git_override(
3939
bazel_dep(name = "rules_browsers")
4040
git_override(
4141
module_name = "rules_browsers",
42-
commit = "ce8977a1a50f929a19ab64859a5b7e7a59798d9f",
42+
commit = "f61cc5a47b3ec4891e644ffdfa3d7517b81d11dd",
4343
remote = "https://github.com/angular/rules_browsers.git",
4444
)
4545

@@ -71,8 +71,8 @@ use_repo(node, "nodejs_windows_amd64")
7171
pnpm = use_extension("@aspect_rules_js//npm:extensions.bzl", "pnpm")
7272
pnpm.pnpm(
7373
name = "pnpm",
74-
pnpm_version = "11.7.0",
75-
pnpm_version_integrity = "sha512-GcyFLBIMcSV2DyRD7mvgyltA+fUFmN4aCaHxd1A+AQ5Xwjx3ZG4B52HeWb+HT7IqM5jDOrlpH8E+uUa28PTWIA==",
74+
pnpm_version = "11.8.0",
75+
pnpm_version_integrity = "sha512-wfXnxMskHI8XS3Q4UdgvQrgCMkr8iw8Ra5atsVqgZmSUjd42lgo7oQebpbSyndAUATW5S1tfUmNZIknWjlVfJg==",
7676
)
7777
use_repo(pnpm, "pnpm")
7878

‎MODULE.bazel.lock‎

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎adev/shared-docs/styles/_resets.scss‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,13 +312,17 @@
312312
padding-inline: 15px !important;
313313
}
314314

315+
.mdc-tab__text-label {
316+
transition: none;
317+
}
318+
315319
.mdc-tab--active {
316320
border: 0;
317321
border-block-end-width: 2px;
318322
border-style: solid;
319323
border-image: var(--purple-to-blue-horizontal-gradient) 1;
320324

321-
span {
325+
.mdc-tab__text-label {
322326
background-image: var(--purple-to-blue-horizontal-gradient);
323327
background-clip: text;
324328
-webkit-background-clip: text;

‎adev/shared-docs/styles/docs/_table.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
border-block: 1px solid var(--senary-contrast);
2121
font-size: 0.75rem;
2222
font-weight: 600;
23+
24+
code {
25+
white-space: nowrap;
26+
}
2327
}
2428

2529
tr {

‎adev/src/content/examples/aria/menu/src/menu-context/app/app.css‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,34 @@
7676
font-size: 0.875rem;
7777
}
7878

79+
.last-action {
80+
display: flex;
81+
align-items: center;
82+
gap: 0.5rem;
83+
margin: 0;
84+
padding: 0.75rem 1rem;
85+
border-radius: 0.5rem;
86+
border: 1px solid var(--border-color);
87+
font-size: 0.875rem;
88+
animation: fade-in 0.2s ease;
89+
}
90+
91+
.last-action .material-symbols-outlined {
92+
font-size: 1.1rem;
93+
color: var(--vivid-pink);
94+
}
95+
96+
@keyframes fade-in {
97+
from {
98+
opacity: 0;
99+
transform: translateY(-4px);
100+
}
101+
to {
102+
opacity: 1;
103+
transform: translateY(0);
104+
}
105+
}
106+
79107
[ngMenu] .separator {
80108
border-top: 1px solid var(--border-color);
81109
margin: 0.25rem 0;

‎adev/src/content/examples/aria/menu/src/menu-context/app/app.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
Right-click inside this area to open the context menu.
44
</div>
55

6+
@if (lastAction()) {
7+
<p class="last-action">
8+
<span class="material-symbols-outlined" translate="no" aria-hidden="true">check_circle</span>
9+
Action performed: <strong>{{ lastAction() }}</strong>
10+
</p>
11+
}
12+
613
<!-- Hidden trigger positioned dynamically at cursor coordinates -->
714
<div
815
#triggerEl

‎adev/src/content/examples/aria/menu/src/menu-context/app/app.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ export class App {
2525
this.trigger().open();
2626
}
2727

28+
lastAction = signal<string | null>(null);
29+
2830
onItemSelected(value: string) {
29-
console.log(`Action selected: ${value}`);
31+
this.lastAction.set(value);
3032
}
3133

3234
onOverlayKeydown(event: KeyboardEvent) {

‎adev/src/content/introduction/installation.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ Open a terminal (if you're using [Visual Studio Code](https://code.visualstudio.
5555
>
5656
bun install -g @angular/cli
5757
</docs-code>
58-
5958
</docs-code-multifile>
6059

6160
If you are having issues running this command in Windows or Unix, check out the [CLI docs](/tools/cli/setup-local#install-the-angular-cli) for more info.

‎integration/animations/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@
3838
"ts-node": "^10.9.1",
3939
"typescript": "6.0.3"
4040
},
41-
"packageManager": "pnpm@11.7.0"
41+
"packageManager": "pnpm@11.8.0"
4242
}

‎integration/cli-hello-world-ivy-i18n/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@
4545
"ts-node": "^10.9.1",
4646
"typescript": "6.0.3"
4747
},
48-
"packageManager": "pnpm@11.7.0"
48+
"packageManager": "pnpm@11.8.0"
4949
}

0 commit comments

Comments
 (0)