diff --git a/.vscode/settings.json b/.vscode/settings.json index ba68f1b50..9bf4d12b5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,4 @@ { "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true, - "vsicons.presets.angular": true + "editor.formatOnSave": true } diff --git a/apps/client/src/app/pages/resources/glossary/resources-glossary.component.scss b/apps/client/src/app/pages/resources/glossary/resources-glossary.component.scss index e2d265315..af53f894b 100644 --- a/apps/client/src/app/pages/resources/glossary/resources-glossary.component.scss +++ b/apps/client/src/app/pages/resources/glossary/resources-glossary.component.scss @@ -1,47 +1,5 @@ -:host { - display: block; - padding: 1rem; -} - -// Target the parent panel -:host-context(.mat-tab-nav-panel) { - -ms-overflow-style: none; /* IE and Edge */ - scrollbar-width: none; /* Firefox */ - - &::-webkit-scrollbar { - /* Chrome, Safari and Opera */ - display: none; - } -} - -.container { - max-width: 800px; - margin: 0 auto; -} +@import '../shared/resource-page'; -h1 { - margin-bottom: 2rem; -} - -.glossary-list { - .mb-4 { - margin-bottom: 2rem; - } - - h3 { - margin-bottom: 0.5rem; - } - - p { - margin-bottom: 0.5rem; - } - - a { - color: #007bff; - text-decoration: none; - - &:hover { - text-decoration: underline; - } - } +:host { + @include resource-page; } diff --git a/apps/client/src/app/pages/resources/glossary/resources-glossary.component.ts b/apps/client/src/app/pages/resources/glossary/resources-glossary.component.ts index 4360c3b23..8f0bded53 100644 --- a/apps/client/src/app/pages/resources/glossary/resources-glossary.component.ts +++ b/apps/client/src/app/pages/resources/glossary/resources-glossary.component.ts @@ -2,8 +2,8 @@ import { Component } from '@angular/core'; @Component({ selector: 'gf-resources-glossary', - templateUrl: './resources-glossary.component.html', - styleUrls: ['./resources-glossary.component.scss'] + styleUrls: ['./resources-glossary.component.scss'], + templateUrl: './resources-glossary.component.html' }) export class ResourcesGlossaryPageComponent { public glossaryItems = [ diff --git a/apps/client/src/app/pages/resources/guides/resources-guides.component.scss b/apps/client/src/app/pages/resources/guides/resources-guides.component.scss index 4e9a621c1..af53f894b 100644 --- a/apps/client/src/app/pages/resources/guides/resources-guides.component.scss +++ b/apps/client/src/app/pages/resources/guides/resources-guides.component.scss @@ -1,43 +1,5 @@ -:host { - display: block; - color: rgb(var(--dark-primary-text)); - - .container { - max-width: 800px; - margin: 0 auto; - } - - h1 { - margin-bottom: 2rem; - } - - .guides-list { - .mb-4 { - margin-bottom: 2rem; - } - - h3 { - margin-top: 0; - margin-bottom: 0.5rem; - } +@import '../shared/resource-page'; - p { - margin-bottom: 0.5rem; - } - - a { - color: rgba(var(--palette-primary-500), 1); - font-weight: 500; - text-decoration: none; - - &:hover { - color: rgba(var(--palette-primary-300), 1); - text-decoration: underline; - } - } - } -} - -:host-context(.theme-dark) { - color: rgb(var(--light-primary-text)); +:host { + @include resource-page; } diff --git a/apps/client/src/app/pages/resources/guides/resources-guides.component.ts b/apps/client/src/app/pages/resources/guides/resources-guides.component.ts index 06852b2fb..851f6e3e0 100644 --- a/apps/client/src/app/pages/resources/guides/resources-guides.component.ts +++ b/apps/client/src/app/pages/resources/guides/resources-guides.component.ts @@ -2,8 +2,8 @@ import { Component } from '@angular/core'; @Component({ selector: 'gf-resources-guides', - templateUrl: './resources-guides.component.html', - styleUrls: ['./resources-guides.component.scss'] + styleUrls: ['./resources-guides.component.scss'], + templateUrl: './resources-guides.component.html' }) export class ResourcesGuidesComponent { public guides = [ diff --git a/apps/client/src/app/pages/resources/markets/resources-markets.component.html b/apps/client/src/app/pages/resources/markets/resources-markets.component.html index e6aae43c2..a1a3788ac 100644 --- a/apps/client/src/app/pages/resources/markets/resources-markets.component.html +++ b/apps/client/src/app/pages/resources/markets/resources-markets.component.html @@ -1,16 +1,12 @@