Skip to content

Commit f838726

Browse files
hawkgspkozlowski-opensource
authored andcommitted
refactor(devtools): typography (angular#60531)
Introduce typography placeholder classes and employ them across the app where applicable. PR Close angular#60531
1 parent 2e87130 commit f838726

Some content is hidden

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

45 files changed

+255
-149
lines changed

devtools/projects/demo-standalone/src/BUILD.bazel

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,17 @@ copy_to_directory(
2727
},
2828
)
2929

30+
copy_to_directory(
31+
name = "assets",
32+
srcs = [
33+
"//devtools/projects/ng-devtools/src/assets",
34+
],
35+
out = "assets",
36+
replace_prefixes = {
37+
"devtools/projects/ng-devtools/src/assets": "",
38+
},
39+
)
40+
3041
ng_module(
3142
name = "demo",
3243
srcs = ["main.ts"],
@@ -59,6 +70,7 @@ exports_files(["index.html"])
5970
filegroup(
6071
name = "dev_app_static_files",
6172
srcs = [
73+
":assets",
6274
":browser_specific_styles",
6375
":demo_styles",
6476
":index.html",
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package(default_visibility = ["//devtools:__subpackages__"])
2+
3+
filegroup(
4+
name = "assets",
5+
srcs = glob(["*"]),
6+
)

devtools/projects/ng-devtools/src/lib/BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ package(default_visibility = ["//visibility:public"])
88
sass_binary(
99
name = "devtools_component_styles",
1010
src = "devtools.component.scss",
11+
deps = [
12+
"//devtools/projects/ng-devtools/src/styles:typography",
13+
],
1114
)
1215

1316
ng_module(

devtools/projects/ng-devtools/src/lib/devtools-tabs/BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ package(default_visibility = ["//visibility:public"])
88
sass_binary(
99
name = "devtools_tabs_component_styles",
1010
src = "devtools-tabs.component.scss",
11+
deps = [
12+
"//devtools/projects/ng-devtools/src/styles:typography",
13+
],
1114
)
1215

1316
ng_module(

devtools/projects/ng-devtools/src/lib/devtools-tabs/dependency-injection/resolution-path/BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ sass_binary(
99
name = "resolution_path_styles",
1010
src = "resolution-path.component.scss",
1111
visibility = ["//visibility:private"],
12+
deps = [
13+
"//devtools/projects/ng-devtools/src/styles:typography",
14+
],
1215
)
1316

1417
ng_module(

devtools/projects/ng-devtools/src/lib/devtools-tabs/dependency-injection/resolution-path/resolution-path.component.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use '../../../../styles/typography';
2+
13
:host {
24
display: flex;
35
flex-wrap: wrap;
@@ -6,15 +8,17 @@
68
border-top: 1px solid var(--senary-contrast);
79

810
.node {
11+
@extend %body-01;
912
position: relative;
1013
border-radius: 5px;
1114
background: var(--octonary-contrast);
1215
color: black;
1316
padding: 4px 25px 4px 15px;
1417
margin-bottom: 0.25rem;
15-
font-size: 0.75rem;
1618
height: 28px;
1719
box-sizing: border-box;
20+
display: flex;
21+
align-items: center;
1822

1923
&.type-env {
2024
background: var(--red-06);

devtools/projects/ng-devtools/src/lib/devtools-tabs/devtools-tabs.component.scss

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use '../../styles/typography';
2+
13
:host {
24
position: relative;
35
width: 100%;
@@ -49,8 +51,6 @@ nav {
4951
align-self: center;
5052
margin-left: auto;
5153
margin-right: 8px;
52-
font-size: 0.8em;
53-
font-weight: bold;
5454
white-space: nowrap;
5555
text-overflow: ellipsis;
5656
overflow: hidden;
@@ -78,13 +78,11 @@ mat-icon {
7878
}
7979

8080
.mat-mdc-tab-link {
81+
@extend %body-medium-01;
8182
min-width: unset;
82-
line-height: 30px;
8383
height: 30px;
84-
font-size: 13px;
8584
padding: 0px 10px;
8685
opacity: 1;
87-
font-weight: 400;
8886
}
8987

9088
@media only screen and (max-width: 700px) {
@@ -118,5 +116,4 @@ mat-icon {
118116
padding: 2px;
119117
outline-offset: -2px;
120118
width: 100px;
121-
font-size: 12px;
122119
}

devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ package(default_visibility = ["//visibility:public"])
66
sass_binary(
77
name = "directive_forest_component_styles",
88
src = "directive-forest.component.scss",
9+
deps = [
10+
"//devtools/projects/ng-devtools/src/styles:typography",
11+
],
912
)
1013

1114
ng_module(

devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/breadcrumbs/BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ package(default_visibility = ["//visibility:public"])
66
sass_binary(
77
name = "breadcrumbs_component_styles",
88
src = "breadcrumbs.component.scss",
9+
deps = [
10+
"//devtools/projects/ng-devtools/src/styles:typography",
11+
],
912
)
1013

1114
ng_module(

devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/breadcrumbs/breadcrumbs.component.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use '../../../../../styles/typography';
2+
13
.mdc-card.breadcrumb-card {
24
padding: 0;
35
width: 100%;
@@ -31,6 +33,7 @@
3133
}
3234

3335
button {
36+
@extend %monospaced;
3437
height: 24px;
3538

3639
&.selected {
@@ -42,7 +45,6 @@
4245
.mdc-button {
4346
height: 20px;
4447
line-height: 20px;
45-
font-size: 11px;
4648
margin-right: 5px;
4749
width: fit-content;
4850
color: var(--color-tree-node-element-name);

devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/directive-forest.component.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use '../../../../styles/typography';
2+
13
:host {
24
width: 100%;
35
height: 100%;
@@ -8,9 +10,7 @@
810
color: var(--color-tree-node-element-name);
911

1012
cursor: default;
11-
font-family: Menlo, monospace;
12-
font-size: 11px;
13-
line-height: 18px;
13+
@extend %monospaced;
1414

1515
white-space: nowrap;
1616
text-overflow: ellipsis;

devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/filter/filter.component.scss

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
border: none;
2626
padding-left: 5px;
2727
width: 100%;
28-
font-size: 11px;
29-
font-family: inherit;
30-
font-weight: inherit;
3128
height: 30px;
3229
outline: none;
3330
background: var(--color-background);

devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ _STYLE_LABELS = [
1818
sass_binary(
1919
name = label,
2020
src = src,
21+
deps = [
22+
"//devtools/projects/ng-devtools/src/styles:typography",
23+
],
2124
)
2225
for label, src in zip(_STYLE_LABELS, _STYLE_SRCS)
2326
]
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
.meta-data-container {
22
display: flex;
33
flex-direction: column;
4+
padding: 0.75rem;
45
}
56

67
.meta-data-container a {
7-
width: 100%;
8-
font-size: 11px;
9-
height: 22px;
10-
line-height: 22px;
11-
}
8+
display: block;
129

13-
.meta-data {
14-
font-weight: 400;
10+
&:not(:last-child) {
11+
margin-bottom: 0.25rem;
12+
}
1513
}

devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-tab-header.component.scss

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
1+
@use '../../../../styles/typography';
2+
13
.element-header {
24
display: flex;
35
justify-content: space-between;
46
width: 100%;
57
align-items: center;
6-
font-size: 11px;
7-
8-
.component-name {
9-
margin-left: 10px;
10-
font-weight: 700;
11-
line-height: 25px;
12-
}
8+
padding: 0.375rem 0;
9+
@extend %body-bold-01;
1310

11+
.component-name,
1412
.element-name {
1513
margin-left: 10px;
16-
line-height: 25px;
17-
font-weight: 700;
1814
}
1915
}
2016

devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ _STYLE_LABELS = [
2222
sass_binary(
2323
name = label,
2424
src = src,
25+
deps = [
26+
"//devtools/projects/ng-devtools/src/styles:typography",
27+
],
2528
)
2629
for label, src in zip(_STYLE_LABELS, _STYLE_SRCS)
2730
]

devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-editor.component.scss

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use '../../../../../styles/typography';
2+
13
.editor {
24
cursor: text;
35
border: none;
@@ -12,10 +14,10 @@
1214
}
1315

1416
input {
17+
@extend %monospaced;
18+
line-height: 1rem;
19+
letter-spacing: normal;
1520
width: fit-content;
16-
font-family: Menlo, monospace;
17-
font-weight: 500;
18-
font-size: 1em;
1921
border: none;
2022
outline: none;
2123
}

devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-view-body.component.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use '../../../../../styles/typography';
2+
13
:host {
24
::ng-deep {
35
mat-expansion-panel {
@@ -40,8 +42,7 @@
4042
}
4143

4244
.mat-expansion-panel-header-title {
43-
font-size: 0.8em;
44-
font-family: Menlo, monospace;
45+
@extend %body-medium-01;
4546
}
4647

4748
.mat-expansion-indicator {

devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-view-header.component.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
@use '../../../../../styles/typography';
2+
13
mat-toolbar {
4+
@extend %body-medium-01;
25
padding-left: 10px;
36
justify-content: space-between;
47
text-overflow: ellipsis;
58
overflow: hidden;
69
line-height: 25px;
7-
font-size: 11px;
8-
font-weight: 500;
910
height: auto;
1011
}
1112

devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-view-tree.component.scss

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use '../../../../../styles/typography';
2+
13
:host {
24
width: 100%;
35
display: block;
@@ -8,10 +10,14 @@
810
}
911

1012
::ng-deep {
13+
.mat-tree-node,
14+
.mat-nested-tree-node {
15+
@extend %monospaced;
16+
}
17+
1118
.mat-tree-node {
1219
min-height: 20px !important;
1320
cursor: default;
14-
font-family: Menlo, monospace;
1521

1622
.mat-icon {
1723
font-size: 11px;
@@ -37,7 +43,6 @@
3743
mat-tree-node {
3844
.name {
3945
color: var(--color-tree-node-element-name);
40-
font-weight: 500;
4146
}
4247
}
4348
}
@@ -46,14 +51,3 @@
4651
.disabled {
4752
color: var(--secondary-contrast);
4853
}
49-
50-
.arrow {
51-
font-family: monospace;
52-
font-size: 0.5em;
53-
color: var(--quaternary-contrast);
54-
}
55-
56-
:host ::ng-deep .mat-tree-node,
57-
.mat-nested-tree-node {
58-
font-size: 0.8em;
59-
}

devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ package(default_visibility = ["//:__subpackages__"])
88
sass_binary(
99
name = "injector_tree_styles",
1010
src = "injector-tree.component.scss",
11+
deps = [
12+
"//devtools/projects/ng-devtools/src/styles:typography",
13+
],
1114
)
1215

1316
ng_module(

devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-providers/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ package(default_visibility = ["//visibility:public"])
66
sass_binary(
77
name = "injector_providers_component_styles",
88
src = "injector-providers.component.scss",
9+
include_paths = ["external/npm/node_modules"],
10+
deps = ["//devtools/projects/ng-devtools/src/styles:typography"],
911
)
1012

1113
ng_module(

0 commit comments

Comments
 (0)