diff --git a/apps/fretonator-web/src/app/common/footer/footer.component.html b/apps/fretonator-web/src/app/common/footer/footer.component.html index 49a7425..4608c45 100644 --- a/apps/fretonator-web/src/app/common/footer/footer.component.html +++ b/apps/fretonator-web/src/app/common/footer/footer.component.html @@ -46,7 +46,7 @@
View on GitHub diff --git a/apps/fretonator-web/src/app/common/header/header.component.scss b/apps/fretonator-web/src/app/common/header/header.component.scss index 10a6e36..640c48e 100644 --- a/apps/fretonator-web/src/app/common/header/header.component.scss +++ b/apps/fretonator-web/src/app/common/header/header.component.scss @@ -9,6 +9,7 @@ flex-direction: column; justify-content: center; align-content: center; + border-top: pxToRem($grid-unit / 2) solid var(--header-border-color); } .header__topRow { diff --git a/apps/fretonator-web/src/app/common/stripe-banner/stripe-banner.component.html b/apps/fretonator-web/src/app/common/stripe-banner/stripe-banner.component.html deleted file mode 100644 index ab6f080..0000000 --- a/apps/fretonator-web/src/app/common/stripe-banner/stripe-banner.component.html +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/apps/fretonator-web/src/app/common/stripe-banner/stripe-banner.component.scss b/apps/fretonator-web/src/app/common/stripe-banner/stripe-banner.component.scss deleted file mode 100644 index bcc3d81..0000000 --- a/apps/fretonator-web/src/app/common/stripe-banner/stripe-banner.component.scss +++ /dev/null @@ -1,10 +0,0 @@ -@import '../../../styles/vars'; -@import '../../../styles/functions'; - -.stripeBanner { - display: block; - width: 100%; - position: relative; - height: pxToRem($grid-unit); - background-color: var(--stripe-banner-background); -} diff --git a/apps/fretonator-web/src/app/common/stripe-banner/stripe-banner.component.spec.ts b/apps/fretonator-web/src/app/common/stripe-banner/stripe-banner.component.spec.ts deleted file mode 100644 index efca127..0000000 --- a/apps/fretonator-web/src/app/common/stripe-banner/stripe-banner.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { StripeBannerComponent } from './stripe-banner.component'; - -describe('StripeBannerComponent', () => { - let component: StripeBannerComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ StripeBannerComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(StripeBannerComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/apps/fretonator-web/src/app/common/stripe-banner/stripe-banner.component.ts b/apps/fretonator-web/src/app/common/stripe-banner/stripe-banner.component.ts deleted file mode 100644 index d58f3a6..0000000 --- a/apps/fretonator-web/src/app/common/stripe-banner/stripe-banner.component.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-stripe-banner', - templateUrl: './stripe-banner.component.html', - styleUrls: ['./stripe-banner.component.scss'] -}) -export class StripeBannerComponent { -} diff --git a/apps/fretonator-web/src/app/common/stripe-banner/stripe-banner.module.ts b/apps/fretonator-web/src/app/common/stripe-banner/stripe-banner.module.ts deleted file mode 100644 index 130dd90..0000000 --- a/apps/fretonator-web/src/app/common/stripe-banner/stripe-banner.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { StripeBannerComponent } from './stripe-banner.component'; - - -@NgModule({ - declarations: [StripeBannerComponent], - imports: [ - CommonModule - ], - exports: [ - StripeBannerComponent - ] -}) -export class StripeBannerModule { } diff --git a/apps/fretonator-web/src/app/pages/about/about-index/about-index.component.html b/apps/fretonator-web/src/app/pages/about/about-index/about-index.component.html index cba59a4..904efed 100644 --- a/apps/fretonator-web/src/app/pages/about/about-index/about-index.component.html +++ b/apps/fretonator-web/src/app/pages/about/about-index/about-index.component.html @@ -1,5 +1,3 @@ - -

Hi there! 👋🏼

Thanks for checking out the Fretonator!

diff --git a/apps/fretonator-web/src/app/pages/about/about.module.ts b/apps/fretonator-web/src/app/pages/about/about.module.ts index 0d0db6d..bc2cd3d 100644 --- a/apps/fretonator-web/src/app/pages/about/about.module.ts +++ b/apps/fretonator-web/src/app/pages/about/about.module.ts @@ -3,14 +3,12 @@ import { CommonModule } from '@angular/common'; import { AboutRoutingModule } from './about-routing.module'; import { AboutIndexComponent } from './about-index/about-index.component'; -import { StripeBannerModule } from '../../common/stripe-banner/stripe-banner.module'; @NgModule({ declarations: [AboutIndexComponent], imports: [ CommonModule, - AboutRoutingModule, - StripeBannerModule + AboutRoutingModule ], exports: [AboutIndexComponent] }) diff --git a/apps/fretonator-web/src/app/pages/contact/contact-index/contact-index.component.html b/apps/fretonator-web/src/app/pages/contact/contact-index/contact-index.component.html index 4078fc6..ffe3258 100644 --- a/apps/fretonator-web/src/app/pages/contact/contact-index/contact-index.component.html +++ b/apps/fretonator-web/src/app/pages/contact/contact-index/contact-index.component.html @@ -1,4 +1,3 @@ -

Share the love ❤️

My goal with diff --git a/apps/fretonator-web/src/app/pages/contact/contact.module.ts b/apps/fretonator-web/src/app/pages/contact/contact.module.ts index f34f37b..f4ec08d 100644 --- a/apps/fretonator-web/src/app/pages/contact/contact.module.ts +++ b/apps/fretonator-web/src/app/pages/contact/contact.module.ts @@ -8,8 +8,6 @@ import { ContactSuccessComponent } from './contact-success/contact-success.compo import { HttpClientModule } from '@angular/common/http'; import { FormService } from './form.service'; import { TickModule } from '../../common/svgs/tick/tick.module'; -import { StripeBannerModule } from '../../common/stripe-banner/stripe-banner.module'; - @NgModule({ declarations: [ContactIndexComponent, ContactSuccessComponent], @@ -20,7 +18,6 @@ import { StripeBannerModule } from '../../common/stripe-banner/stripe-banner.mod FormsModule, HttpClientModule, TickModule, - StripeBannerModule ], providers: [ FormService diff --git a/apps/fretonator-web/src/app/pages/learn/learn-index/learn-index.component.html b/apps/fretonator-web/src/app/pages/learn/learn-index/learn-index.component.html index 5601b72..090572b 100644 --- a/apps/fretonator-web/src/app/pages/learn/learn-index/learn-index.component.html +++ b/apps/fretonator-web/src/app/pages/learn/learn-index/learn-index.component.html @@ -1,5 +1,3 @@ - -

Learn Guitar Theory

Fretonator Learning Hub

diff --git a/apps/fretonator-web/src/app/pages/learn/learn.module.ts b/apps/fretonator-web/src/app/pages/learn/learn.module.ts index a61975e..f8ee9e4 100644 --- a/apps/fretonator-web/src/app/pages/learn/learn.module.ts +++ b/apps/fretonator-web/src/app/pages/learn/learn.module.ts @@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common'; import { LearnRoutingModule } from './learn-routing.module'; import { LearnIndexComponent } from './learn-index/learn-index.component'; -import { StripeBannerModule } from '../../common/stripe-banner/stripe-banner.module'; import { PatternsIndexComponent } from './patterns-index/patterns-index.component'; import { FretboardModule } from '../../common/fretonator/fretboard/fretboard.module'; @@ -16,7 +15,6 @@ import { FretboardModule } from '../../common/fretonator/fretboard/fretboard.mod imports: [ CommonModule, LearnRoutingModule, - StripeBannerModule, FretboardModule, ], exports: [ diff --git a/apps/fretonator-web/src/app/pages/learn/patterns-index/patterns-index.component.html b/apps/fretonator-web/src/app/pages/learn/patterns-index/patterns-index.component.html index c2223c7..f7fa1bf 100644 --- a/apps/fretonator-web/src/app/pages/learn/patterns-index/patterns-index.component.html +++ b/apps/fretonator-web/src/app/pages/learn/patterns-index/patterns-index.component.html @@ -1,6 +1,3 @@ - - -
diff --git a/apps/fretonator-web/src/styles.scss b/apps/fretonator-web/src/styles.scss index f279064..d4489cc 100644 --- a/apps/fretonator-web/src/styles.scss +++ b/apps/fretonator-web/src/styles.scss @@ -6,6 +6,7 @@ --black: #202124; --white: #ffffff; --offwhite: #f9f9f9; + --offwhite-alt: #e1e1e1; --grey: #474350; --yellow: #fafac6; --peach: #fecdaa; @@ -37,27 +38,24 @@ --border-width-button: 2px; --header-background: var(--black); - --header-logo-color: #e1e1e1; - --theme-toggle-color: #e1e1e1; + --header-logo-color: var(--offwhite-alt); + --header-border-color: var(--peach); + --theme-toggle-color: var(--offwhite-alt); + --hamburger_layer-color: var(--peach); + --header-link-color: var(--peach); + --hero-background-color: var(--black); + --hero-title-color: var(--offwhite-alt); + --hero-block-box-shadow-color: var(--grey); + --hero-toggle-foreground-color: var(--offwhite-alt); + --hero-toggle-background-color: var(--black); --footer-background: var(--black); --footer-border-color: var(--peach); - --footer-copy-color: #e1e1e1; + --footer-copy-color: var(--offwhite-alt); --footer-link-color: var(--peach); --footer-title-color: var(--peach); --footer-list-link-color: var(--yellow); --footer-small-button-accent-color: var(--yellow); - - --hamburger_layer-color: var(--peach); - --header-link-color: var(--peach); - - --hero-background-color: var(--black); - --hero-title-color: #e1e1e1; - --hero-block-box-shadow-color: var(--grey); - --hero-toggle-foreground-color: #e1e1e1; - --hero-toggle-background-color: var(--black); - - } [color-mode="light"] { @@ -152,7 +150,7 @@ --background-color-base: var(--black); --background-color-light: var(--grey); - --foreground-color-base: #e1e1e1; + --foreground-color-base: var(--offwhite-alt); --text-link-color: var(--peach); --text-link-hover-color: #FD7C21; @@ -164,11 +162,11 @@ --hero-block-background-step-4: var(--coral); --hero-block-background-step-5: var(--peach); - --string-color: #e1e1e1; - --string-label-color: #e1e1e1; + --string-color: var(--offwhite-alt); + --string-label-color: var(--offwhite-alt); --nut-color: #d3d3d3; --fret-color: rgba(249, 249, 249, 0.2); - --fretboard-help-text-color: #e1e1e1; + --fretboard-help-text-color: var(--offwhite-alt); --fretboard-play-cta-color: #d3d3d3; --fret-marker-url: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3E%3Ccircle cx='15' cy='15' r='15' fill='%23474350'/%3E%3C/svg%3E"); @@ -189,7 +187,7 @@ --note-color-dominant: var(--black); --chip-background-color: var(--grey); - --chip-foreground-color: #e1e1e1; + --chip-foreground-color: var(--offwhite-alt); --chip-border-color: var(--grey); --chip-background-color-active: var(--peach); @@ -197,7 +195,7 @@ --chip-border-color-active: var(--peach); --chip-background-color-muted: var(--grey); - --chip-foreground-color-muted: #e1e1e1; + --chip-foreground-color-muted: var(--offwhite-alt); --chip-border-color-muted: var(--grey); --chip-foreground-color-muted-active: var(--peach); @@ -214,7 +212,7 @@ --form-input-autofill-color: var(--black); --video-loader-background-color: var(--grey); - --info-toggle-foreground-color: #e1e1e1; + --info-toggle-foreground-color: var(--offwhite-alt); --card-background-color: var(--grey); --card-border-color: var(--grey); --card-box-shadow-color: #0A0A0B; diff --git a/apps/fretonator-web/src/styles/content.scss b/apps/fretonator-web/src/styles/content.scss index d9be9d3..8923bdd 100644 --- a/apps/fretonator-web/src/styles/content.scss +++ b/apps/fretonator-web/src/styles/content.scss @@ -8,6 +8,7 @@ $top_block_max_width: $screen-med; @mixin content_container { @include content_wrapper(); max-width: $screen-med; + margin-top: pxToRem($grid-unit * 4); } @mixin content_title {