Skip to content

Migrate remaining styles to use sass nesting #4024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 23, 2025
Merged

Migrate remaining styles to use sass nesting #4024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3acc82d
Migrate remaining styles to use sass nesting
parlough Mar 26, 2025
3581723
Update sass constraint again
parlough Apr 3, 2025
a990c06
Merge branch 'main' into misc/sass-nesting-final
parlough Apr 23, 2025
2204ccf
Update sass and rebuild
parlough Apr 23, 2025
2063bed
Fix build by regenerating renderers
parlough Apr 23, 2025
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
3,515 changes: 1,732 additions & 1,783 deletions lib/resources/docs.dart.js
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions lib/resources/docs.dart.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/resources/styles.css
View file
Open in desktop

Large diffs are not rendered by default.

44 changes: 6 additions & 38 deletions lib/src/generator/templates.runtime_renderers.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1347,13 +1347,6 @@ class _Renderer_Category extends RendererBase<Category> {
..._Renderer_MarkdownFileDocumentation.propertyMap<CT_>(),
..._Renderer_LibraryContainer.propertyMap<CT_>(),
..._Renderer_TopLevelContainer.propertyMap<CT_>(),
..._Renderer_Nameable.propertyMap<CT_>(),
..._Renderer_Warnable.propertyMap<CT_>(),
..._Renderer_CommentReferable.propertyMap<CT_>(),
..._Renderer_Locatable.propertyMap<CT_>(),
..._Renderer_MarkdownFileDocumentation.propertyMap<CT_>(),
..._Renderer_LibraryContainer.propertyMap<CT_>(),
..._Renderer_TopLevelContainer.propertyMap<CT_>(),
'aboveSidebarPath': Property(
getValue: (CT_ c) => c.aboveSidebarPath,
renderVariable: (
Expand Down Expand Up @@ -3289,8 +3282,6 @@ class _Renderer_Constructor extends RendererBase<Constructor> {
..._Renderer_ModelElement.propertyMap<CT_>(),
..._Renderer_ContainerMember.propertyMap<CT_>(),
..._Renderer_TypeParameters.propertyMap<CT_>(),
..._Renderer_ContainerMember.propertyMap<CT_>(),
..._Renderer_TypeParameters.propertyMap<CT_>(),
'aboveSidebarPath': Property(
getValue: (CT_ c) => c.aboveSidebarPath,
renderVariable: (
Expand Down Expand Up @@ -4285,8 +4276,6 @@ class _Renderer_Container extends RendererBase<Container> {
..._Renderer_ModelElement.propertyMap<CT_>(),
..._Renderer_Categorization.propertyMap<CT_>(),
..._Renderer_TypeParameters.propertyMap<CT_>(),
..._Renderer_Categorization.propertyMap<CT_>(),
..._Renderer_TypeParameters.propertyMap<CT_>(),
'aboveSidebarPath': Property(
getValue: (CT_ c) => c.aboveSidebarPath,
renderVariable: (
Expand Down Expand Up @@ -5924,7 +5913,6 @@ class _Renderer_Documentable extends RendererBase<Documentable> {
() => {
..._Renderer_Object.propertyMap<CT_>(),
..._Renderer_Nameable.propertyMap<CT_>(),
..._Renderer_Nameable.propertyMap<CT_>(),
'aboveSidebarPath': Property(
getValue: (CT_ c) => c.aboveSidebarPath,
renderVariable: (
Expand Down Expand Up @@ -8300,7 +8288,6 @@ class _Renderer_ExtensionType extends RendererBase<ExtensionType> {
() => {
..._Renderer_InheritingContainer.propertyMap<CT_>(),
..._Renderer_Constructable.propertyMap<CT_>(),
..._Renderer_Constructable.propertyMap<CT_>(),
'allModelElements': Property(
getValue: (CT_ c) => c.allModelElements,
renderVariable:
Expand Down Expand Up @@ -9315,9 +9302,6 @@ class _Renderer_Field extends RendererBase<Field> {
..._Renderer_GetterSetterCombo.propertyMap<CT_>(),
..._Renderer_ContainerMember.propertyMap<CT_>(),
..._Renderer_Inheritable.propertyMap<CT_>(),
..._Renderer_GetterSetterCombo.propertyMap<CT_>(),
..._Renderer_ContainerMember.propertyMap<CT_>(),
..._Renderer_Inheritable.propertyMap<CT_>(),
'aboveSidebarPath': Property(
getValue: (CT_ c) => c.aboveSidebarPath,
renderVariable: (
Expand Down Expand Up @@ -12917,9 +12901,6 @@ class _Renderer_Library extends RendererBase<Library> {
..._Renderer_Categorization.propertyMap<CT_>(),
..._Renderer_TopLevelContainer.propertyMap<CT_>(),
..._Renderer_CanonicalFor.propertyMap<CT_>(),
..._Renderer_Categorization.propertyMap<CT_>(),
..._Renderer_TopLevelContainer.propertyMap<CT_>(),
..._Renderer_CanonicalFor.propertyMap<CT_>(),
'aboveSidebarPath': Property(
getValue: (CT_ c) => c.aboveSidebarPath,
renderVariable: (
Expand Down Expand Up @@ -14858,9 +14839,6 @@ class _Renderer_Method extends RendererBase<Method> {
..._Renderer_ContainerMember.propertyMap<CT_>(),
..._Renderer_Inheritable.propertyMap<CT_>(),
..._Renderer_TypeParameters.propertyMap<CT_>(),
..._Renderer_ContainerMember.propertyMap<CT_>(),
..._Renderer_Inheritable.propertyMap<CT_>(),
..._Renderer_TypeParameters.propertyMap<CT_>(),
'aboveSidebarPath': Property(
getValue: (CT_ c) => c.aboveSidebarPath,
renderVariable: (
Expand Down Expand Up @@ -16322,13 +16300,6 @@ class _Renderer_ModelElement extends RendererBase<ModelElement> {
..._Renderer_SourceCode.propertyMap<CT_>(),
..._Renderer_FeatureSet.propertyMap<CT_>(),
..._Renderer_DocumentationComment.propertyMap<CT_>(),
..._Renderer_CommentReferable.propertyMap<CT_>(),
..._Renderer_Warnable.propertyMap<CT_>(),
..._Renderer_Locatable.propertyMap<CT_>(),
..._Renderer_Nameable.propertyMap<CT_>(),
..._Renderer_SourceCode.propertyMap<CT_>(),
..._Renderer_FeatureSet.propertyMap<CT_>(),
..._Renderer_DocumentationComment.propertyMap<CT_>(),
'annotations': Property(
getValue: (CT_ c) => c.annotations,
renderVariable:
Expand Down Expand Up @@ -17731,7 +17702,6 @@ class _Renderer_ModelFunction extends RendererBase<ModelFunction> {
() => {
..._Renderer_ModelFunctionTyped.propertyMap<CT_>(),
..._Renderer_Categorization.propertyMap<CT_>(),
..._Renderer_Categorization.propertyMap<CT_>(),
'element': Property(
getValue: (CT_ c) => c.element,
renderVariable:
Expand Down Expand Up @@ -17849,7 +17819,6 @@ class _Renderer_ModelFunctionTyped extends RendererBase<ModelFunctionTyped> {
() => {
..._Renderer_ModelElement.propertyMap<CT_>(),
..._Renderer_TypeParameters.propertyMap<CT_>(),
..._Renderer_TypeParameters.propertyMap<CT_>(),
'aboveSidebarPath': Property(
getValue: (CT_ c) => c.aboveSidebarPath,
renderVariable: (
Expand Down Expand Up @@ -23605,8 +23574,6 @@ class _Renderer_TopLevelVariable extends RendererBase<TopLevelVariable> {
..._Renderer_ModelElement.propertyMap<CT_>(),
..._Renderer_GetterSetterCombo.propertyMap<CT_>(),
..._Renderer_Categorization.propertyMap<CT_>(),
..._Renderer_GetterSetterCombo.propertyMap<CT_>(),
..._Renderer_Categorization.propertyMap<CT_>(),
'aboveSidebarPath': Property(
getValue: (CT_ c) => c.aboveSidebarPath,
renderVariable: (
Expand Down Expand Up @@ -24727,8 +24694,6 @@ class _Renderer_Typedef extends RendererBase<Typedef> {
..._Renderer_ModelElement.propertyMap<CT_>(),
..._Renderer_TypeParameters.propertyMap<CT_>(),
..._Renderer_Categorization.propertyMap<CT_>(),
..._Renderer_TypeParameters.propertyMap<CT_>(),
..._Renderer_Categorization.propertyMap<CT_>(),
'aboveSidebarPath': Property(
getValue: (CT_ c) => c.aboveSidebarPath,
renderVariable: (
Expand Down Expand Up @@ -25808,7 +25773,7 @@ const _invisibleGetters = {
'runtimeType',
},
'ExecutableMember': {
'augmentationSubstitution',
'baseElement',
'children',
'children2',
'context',
Expand Down Expand Up @@ -26018,6 +25983,9 @@ const _invisibleGetters = {
'firstFragment',
'fragments',
'hashCode',
'inheritedConcreteMembers',
'inheritedMembers',
'interfaceMembers',
'interfaces',
'mixins',
'runtimeType',
Expand Down Expand Up @@ -26086,6 +26054,7 @@ const _invisibleGetters = {
'lineInfo',
'mixins2',
'nextFragment',
'offset',
'partIncludes',
'prefixes',
'previousFragment',
Expand Down Expand Up @@ -26116,7 +26085,7 @@ const _invisibleGetters = {
'values',
},
'Member': {
'augmentationSubstitution',
'baseElement',
'children',
'context',
'declaration',
Expand Down Expand Up @@ -26243,7 +26212,6 @@ const _invisibleGetters = {
'version',
},
'ParameterMember': {
'augmentationSubstitution',
'baseElement',
'children',
'children2',
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dev_dependencies:
dart_style: ^3.0.0
lints: ^5.0.0
matcher: ^0.12.15
sass: ^1.85.1
sass: ^1.87.0
test: ^1.24.2
test_descriptor: ^2.0.1
test_process: ^2.0.3
Expand Down
2 changes: 1 addition & 1 deletion web/sig.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
77FD7967080D3865482753638F7833E7
76460F3B17D947F654BCE4B231EBE30F
75 changes: 37 additions & 38 deletions web/styles/_breadcrumbs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,59 +6,58 @@
list-style: none;
padding: 0;
margin: 0;
}

.gt-separated li {
display: inline-block;
}

.gt-separated li:before {
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>");
background-position: center;
content: "\00a0";
margin: 0 6px 0 4px;
padding: 0 3px 0 0;
}

.gt-separated.dark li:before {
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>");
}
&.dark {
li:before {
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>");
}
}

.gt-separated li:first-child:before {
background-image: none;
content: "";
margin: 0;
padding: 0;
li {
display: inline-block;

&:before {
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>");
background-position: center;
content: "\00a0";
margin: 0 6px 0 4px;
padding: 0 3px 0 0;
}

&:first-child:before {
background-image: none;
content: "";
margin: 0;
padding: 0;
}
}
}

.breadcrumbs {
padding: 0;
margin: 8px 0 8px 0;
white-space: nowrap;
line-height: 1;
}

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

@media screen and (max-width: 840px) {
.breadcrumbs {
li a {
color: var(--main-hyperlinks-color);
}

@media screen and (max-width: 840px) {
margin: 0 0 24px 0;
overflow-x: hidden;
}
}

.breadcrumbs .gt-separated .dark .hidden-xs li + li:before {
color: var(--main-h-text);
}

ol.breadcrumbs li a {
color: var(--main-hyperlinks-color);
}
.self-crumb {
color: var(--main-h-text);
}

.self-crumb {
color: var(--main-h-text);
.self-name {
color: #555;
display: none;
}
}
60 changes: 30 additions & 30 deletions web/styles/_code.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,40 +27,40 @@ code {
border-radius: 3px;
}

// Syntax highlighting, for highlightjs rendered code:

.hljs-string, .hljs-doctag {
color: var(--main-string-color);
}

.hljs-number, .hljs-literal, .hljs-variable, .hljs-template-variable, .hljs-tag .hljs-attr {
color: var(--main-var-color);
}

.hljs-comment, .hljs-quote {
color: var(--main-comment-color);
font-style: italic;
}

.hljs-title, .hljs-section, .hljs-selector-id {
color: var(--main-section-color);
font-weight: bold;
}

.hljs-tag, .hljs-name, .hljs-attribute {
color: var(--main-tag-color);
font-weight: normal;
}

.hljs-keyword, .hljs-selector-tag, .hljs-subst {
color: var(--main-keyword-color);
font-weight: bold;
}

// Syntax highlighting, for highlightjs rendered code.
.hljs {
display: block;
overflow-x: auto;
padding: 0.5em;
color: var(--main-text-color);
background: var(--main-code-bg);

.hljs-string, .hljs-doctag {
color: var(--main-string-color);
}

.hljs-number, .hljs-literal, .hljs-variable,
.hljs-template-variable, .hljs-tag .hljs-attr {
color: var(--main-var-color);
}

.hljs-comment, .hljs-quote {
color: var(--main-comment-color);
font-style: italic;
}

.hljs-title, .hljs-section, .hljs-selector-id {
color: var(--main-section-color);
font-weight: bold;
}

.hljs-tag, .hljs-name, .hljs-attribute {
color: var(--main-tag-color);
font-weight: normal;
}

.hljs-keyword, .hljs-selector-tag, .hljs-subst {
color: var(--main-keyword-color);
font-weight: bold;
}
}
4 changes: 4 additions & 0 deletions web/styles/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ header {
padding-right: 30px;
background-color: var(--main-header-color);

@media (max-width: 840px) {
padding-left: 0;
}

ol {
list-style: none;
margin: 0;
Expand Down
Loading