Skip to content

Commit 9ab9ba0

Browse files
parloughparlough
authored
Migrate remaining styles to use sass nesting (#4024)
After landing incremental PRs to do so for other files, migrates the remaining scss files to utilize sass nesting. Closes #3942
1 parent aaea637 commit 9ab9ba0

File tree

10 files changed

+1950
-2047
lines changed

10 files changed

+1950
-2047
lines changed

‎lib/resources/docs.dart.js‎

Lines changed: 1732 additions & 1783 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/resources/docs.dart.js.map‎

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

‎lib/resources/styles.css‎

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

‎lib/src/generator/templates.runtime_renderers.dart‎

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1347,13 +1347,6 @@ class _Renderer_Category extends RendererBase<Category> {
13471347
..._Renderer_MarkdownFileDocumentation.propertyMap<CT_>(),
13481348
..._Renderer_LibraryContainer.propertyMap<CT_>(),
13491349
..._Renderer_TopLevelContainer.propertyMap<CT_>(),
1350-
..._Renderer_Nameable.propertyMap<CT_>(),
1351-
..._Renderer_Warnable.propertyMap<CT_>(),
1352-
..._Renderer_CommentReferable.propertyMap<CT_>(),
1353-
..._Renderer_Locatable.propertyMap<CT_>(),
1354-
..._Renderer_MarkdownFileDocumentation.propertyMap<CT_>(),
1355-
..._Renderer_LibraryContainer.propertyMap<CT_>(),
1356-
..._Renderer_TopLevelContainer.propertyMap<CT_>(),
13571350
'aboveSidebarPath': Property(
13581351
getValue: (CT_ c) => c.aboveSidebarPath,
13591352
renderVariable: (
@@ -3289,8 +3282,6 @@ class _Renderer_Constructor extends RendererBase<Constructor> {
32893282
..._Renderer_ModelElement.propertyMap<CT_>(),
32903283
..._Renderer_ContainerMember.propertyMap<CT_>(),
32913284
..._Renderer_TypeParameters.propertyMap<CT_>(),
3292-
..._Renderer_ContainerMember.propertyMap<CT_>(),
3293-
..._Renderer_TypeParameters.propertyMap<CT_>(),
32943285
'aboveSidebarPath': Property(
32953286
getValue: (CT_ c) => c.aboveSidebarPath,
32963287
renderVariable: (
@@ -4285,8 +4276,6 @@ class _Renderer_Container extends RendererBase<Container> {
42854276
..._Renderer_ModelElement.propertyMap<CT_>(),
42864277
..._Renderer_Categorization.propertyMap<CT_>(),
42874278
..._Renderer_TypeParameters.propertyMap<CT_>(),
4288-
..._Renderer_Categorization.propertyMap<CT_>(),
4289-
..._Renderer_TypeParameters.propertyMap<CT_>(),
42904279
'aboveSidebarPath': Property(
42914280
getValue: (CT_ c) => c.aboveSidebarPath,
42924281
renderVariable: (
@@ -5924,7 +5913,6 @@ class _Renderer_Documentable extends RendererBase<Documentable> {
59245913
() => {
59255914
..._Renderer_Object.propertyMap<CT_>(),
59265915
..._Renderer_Nameable.propertyMap<CT_>(),
5927-
..._Renderer_Nameable.propertyMap<CT_>(),
59285916
'aboveSidebarPath': Property(
59295917
getValue: (CT_ c) => c.aboveSidebarPath,
59305918
renderVariable: (
@@ -8300,7 +8288,6 @@ class _Renderer_ExtensionType extends RendererBase<ExtensionType> {
83008288
() => {
83018289
..._Renderer_InheritingContainer.propertyMap<CT_>(),
83028290
..._Renderer_Constructable.propertyMap<CT_>(),
8303-
..._Renderer_Constructable.propertyMap<CT_>(),
83048291
'allModelElements': Property(
83058292
getValue: (CT_ c) => c.allModelElements,
83068293
renderVariable:
@@ -9315,9 +9302,6 @@ class _Renderer_Field extends RendererBase<Field> {
93159302
..._Renderer_GetterSetterCombo.propertyMap<CT_>(),
93169303
..._Renderer_ContainerMember.propertyMap<CT_>(),
93179304
..._Renderer_Inheritable.propertyMap<CT_>(),
9318-
..._Renderer_GetterSetterCombo.propertyMap<CT_>(),
9319-
..._Renderer_ContainerMember.propertyMap<CT_>(),
9320-
..._Renderer_Inheritable.propertyMap<CT_>(),
93219305
'aboveSidebarPath': Property(
93229306
getValue: (CT_ c) => c.aboveSidebarPath,
93239307
renderVariable: (
@@ -12917,9 +12901,6 @@ class _Renderer_Library extends RendererBase<Library> {
1291712901
..._Renderer_Categorization.propertyMap<CT_>(),
1291812902
..._Renderer_TopLevelContainer.propertyMap<CT_>(),
1291912903
..._Renderer_CanonicalFor.propertyMap<CT_>(),
12920-
..._Renderer_Categorization.propertyMap<CT_>(),
12921-
..._Renderer_TopLevelContainer.propertyMap<CT_>(),
12922-
..._Renderer_CanonicalFor.propertyMap<CT_>(),
1292312904
'aboveSidebarPath': Property(
1292412905
getValue: (CT_ c) => c.aboveSidebarPath,
1292512906
renderVariable: (
@@ -14858,9 +14839,6 @@ class _Renderer_Method extends RendererBase<Method> {
1485814839
..._Renderer_ContainerMember.propertyMap<CT_>(),
1485914840
..._Renderer_Inheritable.propertyMap<CT_>(),
1486014841
..._Renderer_TypeParameters.propertyMap<CT_>(),
14861-
..._Renderer_ContainerMember.propertyMap<CT_>(),
14862-
..._Renderer_Inheritable.propertyMap<CT_>(),
14863-
..._Renderer_TypeParameters.propertyMap<CT_>(),
1486414842
'aboveSidebarPath': Property(
1486514843
getValue: (CT_ c) => c.aboveSidebarPath,
1486614844
renderVariable: (
@@ -16322,13 +16300,6 @@ class _Renderer_ModelElement extends RendererBase<ModelElement> {
1632216300
..._Renderer_SourceCode.propertyMap<CT_>(),
1632316301
..._Renderer_FeatureSet.propertyMap<CT_>(),
1632416302
..._Renderer_DocumentationComment.propertyMap<CT_>(),
16325-
..._Renderer_CommentReferable.propertyMap<CT_>(),
16326-
..._Renderer_Warnable.propertyMap<CT_>(),
16327-
..._Renderer_Locatable.propertyMap<CT_>(),
16328-
..._Renderer_Nameable.propertyMap<CT_>(),
16329-
..._Renderer_SourceCode.propertyMap<CT_>(),
16330-
..._Renderer_FeatureSet.propertyMap<CT_>(),
16331-
..._Renderer_DocumentationComment.propertyMap<CT_>(),
1633216303
'annotations': Property(
1633316304
getValue: (CT_ c) => c.annotations,
1633416305
renderVariable:
@@ -17731,7 +17702,6 @@ class _Renderer_ModelFunction extends RendererBase<ModelFunction> {
1773117702
() => {
1773217703
..._Renderer_ModelFunctionTyped.propertyMap<CT_>(),
1773317704
..._Renderer_Categorization.propertyMap<CT_>(),
17734-
..._Renderer_Categorization.propertyMap<CT_>(),
1773517705
'element': Property(
1773617706
getValue: (CT_ c) => c.element,
1773717707
renderVariable:
@@ -17849,7 +17819,6 @@ class _Renderer_ModelFunctionTyped extends RendererBase<ModelFunctionTyped> {
1784917819
() => {
1785017820
..._Renderer_ModelElement.propertyMap<CT_>(),
1785117821
..._Renderer_TypeParameters.propertyMap<CT_>(),
17852-
..._Renderer_TypeParameters.propertyMap<CT_>(),
1785317822
'aboveSidebarPath': Property(
1785417823
getValue: (CT_ c) => c.aboveSidebarPath,
1785517824
renderVariable: (
@@ -23605,8 +23574,6 @@ class _Renderer_TopLevelVariable extends RendererBase<TopLevelVariable> {
2360523574
..._Renderer_ModelElement.propertyMap<CT_>(),
2360623575
..._Renderer_GetterSetterCombo.propertyMap<CT_>(),
2360723576
..._Renderer_Categorization.propertyMap<CT_>(),
23608-
..._Renderer_GetterSetterCombo.propertyMap<CT_>(),
23609-
..._Renderer_Categorization.propertyMap<CT_>(),
2361023577
'aboveSidebarPath': Property(
2361123578
getValue: (CT_ c) => c.aboveSidebarPath,
2361223579
renderVariable: (
@@ -24727,8 +24694,6 @@ class _Renderer_Typedef extends RendererBase<Typedef> {
2472724694
..._Renderer_ModelElement.propertyMap<CT_>(),
2472824695
..._Renderer_TypeParameters.propertyMap<CT_>(),
2472924696
..._Renderer_Categorization.propertyMap<CT_>(),
24730-
..._Renderer_TypeParameters.propertyMap<CT_>(),
24731-
..._Renderer_Categorization.propertyMap<CT_>(),
2473224697
'aboveSidebarPath': Property(
2473324698
getValue: (CT_ c) => c.aboveSidebarPath,
2473424699
renderVariable: (
@@ -25808,7 +25773,7 @@ const _invisibleGetters = {
2580825773
'runtimeType',
2580925774
},
2581025775
'ExecutableMember': {
25811-
'augmentationSubstitution',
25776+
'baseElement',
2581225777
'children',
2581325778
'children2',
2581425779
'context',
@@ -26018,6 +25983,9 @@ const _invisibleGetters = {
2601825983
'firstFragment',
2601925984
'fragments',
2602025985
'hashCode',
25986+
'inheritedConcreteMembers',
25987+
'inheritedMembers',
25988+
'interfaceMembers',
2602125989
'interfaces',
2602225990
'mixins',
2602325991
'runtimeType',
@@ -26086,6 +26054,7 @@ const _invisibleGetters = {
2608626054
'lineInfo',
2608726055
'mixins2',
2608826056
'nextFragment',
26057+
'offset',
2608926058
'partIncludes',
2609026059
'prefixes',
2609126060
'previousFragment',
@@ -26116,7 +26085,7 @@ const _invisibleGetters = {
2611626085
'values',
2611726086
},
2611826087
'Member': {
26119-
'augmentationSubstitution',
26088+
'baseElement',
2612026089
'children',
2612126090
'context',
2612226091
'declaration',
@@ -26243,7 +26212,6 @@ const _invisibleGetters = {
2624326212
'version',
2624426213
},
2624526214
'ParameterMember': {
26246-
'augmentationSubstitution',
2624726215
'baseElement',
2624826216
'children',
2624926217
'children2',

‎pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dev_dependencies:
2727
dart_style: ^3.0.0
2828
lints: ^5.0.0
2929
matcher: ^0.12.15
30-
sass: ^1.85.1
30+
sass: ^1.87.0
3131
test: ^1.24.2
3232
test_descriptor: ^2.0.1
3333
test_process: ^2.0.3

‎web/sig.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
77FD7967080D3865482753638F7833E7
1+
76460F3B17D947F654BCE4B231EBE30F

‎web/styles/_breadcrumbs.scss‎

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,59 +6,58 @@
66
list-style: none;
77
padding: 0;
88
margin: 0;
9-
}
10-
11-
.gt-separated li {
12-
display: inline-block;
13-
}
14-
15-
.gt-separated li:before {
16-
background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'><path fill='%23DDDDDD' d='M6.7,4L5.7,4.9L8.8,8l-3.1,3.1L6.7,12l4-4L6.7,4z'/></svg>");
17-
background-position: center;
18-
content: "\00a0";
19-
margin: 0 6px 0 4px;
20-
padding: 0 3px 0 0;
21-
}
229

23-
.gt-separated.dark li:before {
24-
background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'><path fill='%23727272' d='M6.7,4L5.7,4.9L8.8,8l-3.1,3.1L6.7,12l4-4L6.7,4z'/></svg>");
25-
}
10+
&.dark {
11+
li:before {
12+
background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'><path fill='%23727272' d='M6.7,4L5.7,4.9L8.8,8l-3.1,3.1L6.7,12l4-4L6.7,4z'/></svg>");
13+
}
14+
}
2615

27-
.gt-separated li:first-child:before {
28-
background-image: none;
29-
content: "";
30-
margin: 0;
31-
padding: 0;
16+
li {
17+
display: inline-block;
18+
19+
&:before {
20+
background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'><path fill='%23DDDDDD' d='M6.7,4L5.7,4.9L8.8,8l-3.1,3.1L6.7,12l4-4L6.7,4z'/></svg>");
21+
background-position: center;
22+
content: "\00a0";
23+
margin: 0 6px 0 4px;
24+
padding: 0 3px 0 0;
25+
}
26+
27+
&:first-child:before {
28+
background-image: none;
29+
content: "";
30+
margin: 0;
31+
padding: 0;
32+
}
33+
}
3234
}
3335

3436
.breadcrumbs {
3537
padding: 0;
3638
margin: 8px 0 8px 0;
3739
white-space: nowrap;
3840
line-height: 1;
39-
}
4041

41-
@media screen and (min-width: 840px) {
42-
nav ol.breadcrumbs {
43-
float: left;
42+
.gt-separated .dark .hidden-xs li + li:before {
43+
color: var(--main-h-text);
4444
}
45-
}
4645

47-
@media screen and (max-width: 840px) {
48-
.breadcrumbs {
46+
li a {
47+
color: var(--main-hyperlinks-color);
48+
}
49+
50+
@media screen and (max-width: 840px) {
4951
margin: 0 0 24px 0;
5052
overflow-x: hidden;
5153
}
52-
}
5354

54-
.breadcrumbs .gt-separated .dark .hidden-xs li + li:before {
55-
color: var(--main-h-text);
56-
}
57-
58-
ol.breadcrumbs li a {
59-
color: var(--main-hyperlinks-color);
60-
}
55+
.self-crumb {
56+
color: var(--main-h-text);
57+
}
6158

62-
.self-crumb {
63-
color: var(--main-h-text);
59+
.self-name {
60+
color: #555;
61+
display: none;
62+
}
6463
}

‎web/styles/_code.scss‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -27,40 +27,40 @@ code {
2727
border-radius: 3px;
2828
}
2929

30-
// Syntax highlighting, for highlightjs rendered code:
31-
32-
.hljs-string, .hljs-doctag {
33-
color: var(--main-string-color);
34-
}
35-
36-
.hljs-number, .hljs-literal, .hljs-variable, .hljs-template-variable, .hljs-tag .hljs-attr {
37-
color: var(--main-var-color);
38-
}
39-
40-
.hljs-comment, .hljs-quote {
41-
color: var(--main-comment-color);
42-
font-style: italic;
43-
}
44-
45-
.hljs-title, .hljs-section, .hljs-selector-id {
46-
color: var(--main-section-color);
47-
font-weight: bold;
48-
}
49-
50-
.hljs-tag, .hljs-name, .hljs-attribute {
51-
color: var(--main-tag-color);
52-
font-weight: normal;
53-
}
54-
55-
.hljs-keyword, .hljs-selector-tag, .hljs-subst {
56-
color: var(--main-keyword-color);
57-
font-weight: bold;
58-
}
59-
30+
// Syntax highlighting, for highlightjs rendered code.
6031
.hljs {
6132
display: block;
6233
overflow-x: auto;
6334
padding: 0.5em;
6435
color: var(--main-text-color);
6536
background: var(--main-code-bg);
37+
38+
.hljs-string, .hljs-doctag {
39+
color: var(--main-string-color);
40+
}
41+
42+
.hljs-number, .hljs-literal, .hljs-variable,
43+
.hljs-template-variable, .hljs-tag .hljs-attr {
44+
color: var(--main-var-color);
45+
}
46+
47+
.hljs-comment, .hljs-quote {
48+
color: var(--main-comment-color);
49+
font-style: italic;
50+
}
51+
52+
.hljs-title, .hljs-section, .hljs-selector-id {
53+
color: var(--main-section-color);
54+
font-weight: bold;
55+
}
56+
57+
.hljs-tag, .hljs-name, .hljs-attribute {
58+
color: var(--main-tag-color);
59+
font-weight: normal;
60+
}
61+
62+
.hljs-keyword, .hljs-selector-tag, .hljs-subst {
63+
color: var(--main-keyword-color);
64+
font-weight: bold;
65+
}
6666
}

‎web/styles/_header.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ header {
1717
padding-right: 30px;
1818
background-color: var(--main-header-color);
1919

20+
@media (max-width: 840px) {
21+
padding-left: 0;
22+
}
23+
2024
ol {
2125
list-style: none;
2226
margin: 0;

0 commit comments

Comments
 (0)