Fixing footer bugs
All checks were successful
Build / Build (push) Successful in 13s
Publish Docker Image / Build UI Artifact (release) Successful in 13s
Publish Docker Image / Publish Docker Image (release) Successful in 59s

This commit is contained in:
Tara Wilson 2025-04-20 15:31:32 -04:00
parent 8fe17fb713
commit fa79cc5481
10 changed files with 189 additions and 176 deletions

View File

@ -1,6 +1,6 @@
<div [class]="{'footer': !mobileService.isMobile(), 'footer-mobile': mobileService.isMobile()}"> <div class="footer">
<footer class="pv4 ph3 ph5-ns tc bg-black"> <footer class="pv2 ph2 ph1-ns tc bg-black">
<a class="link dim gray dib h2 w2 br-100 mr3" <a class="link dim gray dib h1 w1 br-100 mr3"
href="https://www.facebook.com/share/1Sbdr1Ho2y/" href="https://www.facebook.com/share/1Sbdr1Ho2y/"
title="Troop 20 Facebook"> title="Troop 20 Facebook">
<svg data-icon="facebook" viewBox="0 0 32 32" style="fill:currentcolor"> <svg data-icon="facebook" viewBox="0 0 32 32" style="fill:currentcolor">
@ -9,7 +9,7 @@
d="M8 12 L13 12 L13 8 C13 2 17 1 24 2 L24 7 C20 7 19 7 19 10 L19 12 L24 12 L23 18 L19 18 L19 30 L13 30 L13 18 L8 18 z"></path> d="M8 12 L13 12 L13 8 C13 2 17 1 24 2 L24 7 C20 7 19 7 19 10 L19 12 L24 12 L23 18 L19 18 L19 30 L13 30 L13 18 L8 18 z"></path>
</svg> </svg>
</a> </a>
<a class="link dim gray dib h2 w2 br-100 mr3" <a class="link dim gray dib h1 w1 br-100 mr3"
href="mailto:troop2020g@gmail.com" href="mailto:troop2020g@gmail.com"
title="Email Us"> title="Email Us">
<svg data-icon="email" viewBox="0 0 8 6" style="fill:currentcolor"> <svg data-icon="email" viewBox="0 0 8 6" style="fill:currentcolor">
@ -18,7 +18,7 @@
d="m0 0h8v6h-8zm.75 .75v4.5h6.5v-4.5zM0 0l4 3 4-3v1l-4 3-4-3z"></path> d="m0 0h8v6h-8zm.75 .75v4.5h6.5v-4.5zM0 0l4 3 4-3v1l-4 3-4-3z"></path>
</svg> </svg>
</a> </a>
<div class="mt4"> <div class="mt2">
<a href="https://www.scouting.org" <a href="https://www.scouting.org"
target="_blank" target="_blank"
class="f6 link dim gray dib mr3 mr4-ns">Scouting America</a> class="f6 link dim gray dib mr3 mr4-ns">Scouting America</a>

View File

@ -4,10 +4,3 @@
bottom: 0; bottom: 0;
width: 100%; width: 100%;
} }
.footer-mobile {
position: static;
left: 0;
bottom: 0;
width: 100%;
}

View File

@ -1,5 +1,4 @@
import {Component, inject} from '@angular/core'; import {Component} from '@angular/core';
import {MobileService} from '../mobile.service';
@Component({ @Component({
selector: 'app-footer', selector: 'app-footer',
@ -9,5 +8,5 @@ import {MobileService} from '../mobile.service';
styleUrl: './footer.component.scss' styleUrl: './footer.component.scss'
}) })
export class FooterComponent { export class FooterComponent {
public mobileService = inject(MobileService);
} }

View File

@ -1,4 +1,5 @@
<article class="center mw5 mw6-ns hidden ba mv4"> <div [class]="{'': !mobileService.isMobile(), 'mb5': mobileService.isMobile()}">
<article class="center mw5 mw6-ns hidden ba mv4">
<h1 class="f4 bg-near-black white mv0 pv2 ph3">Youth Application</h1> <h1 class="f4 bg-near-black white mv0 pv2 ph3">Youth Application</h1>
<div class="pa3 bt bg-light-blue"> <div class="pa3 bt bg-light-blue">
<p class="f6 f5-ns lh-copy measure mv0"> <p class="f6 f5-ns lh-copy measure mv0">
@ -9,8 +10,8 @@
</a> </a>
</p> </p>
</div> </div>
</article> </article>
<article class="center mw5 mw6-ns hidden ba mv4"> <article class="center mw5 mw6-ns hidden ba mv4">
<h1 class="f4 bg-near-black white mv0 pv2 ph3">Adult Leader Application</h1> <h1 class="f4 bg-near-black white mv0 pv2 ph3">Adult Leader Application</h1>
<div class="pa3 bt bg-light-blue"> <div class="pa3 bt bg-light-blue">
<p class="f6 f5-ns lh-copy measure mv0"> <p class="f6 f5-ns lh-copy measure mv0">
@ -19,8 +20,8 @@
</a> </a>
</p> </p>
</div> </div>
</article> </article>
<article class="center mw5 mw6-ns hidden ba mv4"> <article class="center mw5 mw6-ns hidden ba mv4">
<h1 class="f4 bg-near-black white mv0 pv2 ph3">Merit Badge Councilor Application</h1> <h1 class="f4 bg-near-black white mv0 pv2 ph3">Merit Badge Councilor Application</h1>
<div class="pa3 bt bg-light-blue"> <div class="pa3 bt bg-light-blue">
<p class="f6 f5-ns lh-copy measure mv0"> <p class="f6 f5-ns lh-copy measure mv0">
@ -31,8 +32,8 @@
</a> </a>
</p> </p>
</div> </div>
</article> </article>
<article class="center mw5 mw6-ns hidden ba mv4"> <article class="center mw5 mw6-ns hidden ba mv4">
<h1 class="f4 bg-near-black white mv0 pv2 ph3">BSA Medical Form</h1> <h1 class="f4 bg-near-black white mv0 pv2 ph3">BSA Medical Form</h1>
<div class="pa3 bt bg-light-blue"> <div class="pa3 bt bg-light-blue">
<p class="f6 f5-ns lh-copy measure mv0"> <p class="f6 f5-ns lh-copy measure mv0">
@ -43,4 +44,5 @@
Forms A, B, and C are required for Summer Camp Forms A, B, and C are required for Summer Camp
</p> </p>
</div> </div>
</article> </article>
</div>

View File

@ -1,4 +1,5 @@
import { Component } from '@angular/core'; import {Component, inject} from '@angular/core';
import {MobileService} from '../mobile.service';
@Component({ @Component({
selector: 'app-forms', selector: 'app-forms',
@ -7,5 +8,5 @@ import { Component } from '@angular/core';
styleUrl: './forms.component.scss' styleUrl: './forms.component.scss'
}) })
export class FormsComponent { export class FormsComponent {
public mobileService = inject(MobileService);
} }

View File

@ -1,4 +1,5 @@
<div class="row row-center"> <div [class]="{'': !mobileService.isMobile(), 'mb5': mobileService.isMobile()}">
<div class="row row-center">
<article class="bg-light-blue center mw5 ba b--black-10 mv4"> <article class="bg-light-blue center mw5 ba b--black-10 mv4">
<div class="pv2 ph3"> <div class="pv2 ph3">
<h1 class="f6 ttu tracked">Summer Cheese Steak Fundraiser</h1> <h1 class="f6 ttu tracked">Summer Cheese Steak Fundraiser</h1>
@ -9,7 +10,7 @@
class="w-100 db" alt="Flowers"> class="w-100 db" alt="Flowers">
</a> </a>
</article> </article>
<article style="padding-bottom: 5px;" class="bg-light-blue center mw5 ba b--black-10 mv4"> <article class="bg-light-blue center mw5 ba b--black-10 mv4">
<div class="pv2 ph3"> <div class="pv2 ph3">
<h1 class="f6 ttu tracked">Spring Flower Fundraiser</h1> <h1 class="f6 ttu tracked">Spring Flower Fundraiser</h1>
</div> </div>
@ -26,4 +27,5 @@
</p> </p>
</div> </div>
</article> </article>
</div>
</div> </div>

View File

@ -1,4 +1,5 @@
import { Component } from '@angular/core'; import {Component, inject} from '@angular/core';
import {MobileService} from '../mobile.service';
@Component({ @Component({
selector: 'app-fundraising', selector: 'app-fundraising',
@ -7,5 +8,5 @@ import { Component } from '@angular/core';
styleUrl: './fundraising.component.scss' styleUrl: './fundraising.component.scss'
}) })
export class FundraisingComponent { export class FundraisingComponent {
public mobileService = inject(MobileService);
} }

View File

@ -1,4 +1,4 @@
import { Component } from '@angular/core'; import {Component} from '@angular/core';
@Component({ @Component({
selector: 'app-merit-badge-library', selector: 'app-merit-badge-library',

View File

@ -1,82 +1,85 @@
@if (mobileService.isMobile()) { @if (mobileService.isMobile()) {
<div class="mb5">
<ul class="list pl0 mt0 measure center"> <ul class="list pl0 mt0 measure center">
<li <li
class="flex items-center lh-copy pa3 ph0-l bb b--black-10 bg-light-blue"> class="flex items-center lh-copy pa3 ph0-l bb b--black-10 bg-light-blue">
<img class="w2 h2 w3-ns h3-ns br-100" src="titles/spl.png"/> <img class="w2 h2 w3-ns h3-ns br-100" src="titles/spl.png" alt="Senior Patrol Leader"/>
<div class="pl3 flex-auto"> <div class="pl3 flex-auto">
<span class="f6 db black-70">Juliahna Seidler</span> <span class="f6 db black-70">Juliahna Seidler</span>
</div> </div>
</li> </li>
<li <li
class="flex items-center lh-copy pa3 ph0-l bb b--black-10 bg-light-blue"> class="flex items-center lh-copy pa3 ph0-l bb b--black-10 bg-light-blue">
<img class="w2 h2 w3-ns h3-ns br-100" src="titles/aspl.png"/> <img class="w2 h2 w3-ns h3-ns br-100" src="titles/aspl.png" alt="Assistant Senior Patrol Leader"/>
<div class="pl3 flex-auto"> <div class="pl3 flex-auto">
<span class="f6 db black-70">Kenzie Witherow</span> <span class="f6 db black-70">Kenzie Witherow</span>
</div> </div>
</li> </li>
<li <li
class="flex items-center lh-copy pa3 ph0-l bb b--black-10 bg-light-blue"> class="flex items-center lh-copy pa3 ph0-l bb b--black-10 bg-light-blue">
<img class="w2 h2 w3-ns h3-ns br-100" src="titles/aspl.png"/> <img class="w2 h2 w3-ns h3-ns br-100" src="titles/oeg.png" alt="Outdoor Ethics Guide"/>
<div class="pl3 flex-auto"> <div class="pl3 flex-auto">
<span class="f6 db black-70">Carlie Sorrell</span> <span class="f6 db black-70">Carlie Sorrell</span>
</div> </div>
</li> </li>
<li <li
class="flex items-center lh-copy pa3 ph0-l bb b--black-10 bg-light-blue"> class="flex items-center lh-copy pa3 ph0-l bb b--black-10 bg-light-blue">
<img class="w2 h2 w3-ns h3-ns br-100" src="titles/qm.png"/> <img class="w2 h2 w3-ns h3-ns br-100" src="titles/qm.png" alt="Quartermaster"/>
<div class="pl3 flex-auto"> <div class="pl3 flex-auto">
<span class="f6 db black-70">Ella Mercer</span> <span class="f6 db black-70">Ella Mercer</span>
</div> </div>
</li> </li>
<li <li
class="flex items-center lh-copy pa3 ph0-l bb b--black-10 bg-light-blue"> class="flex items-center lh-copy pa3 ph0-l bb b--black-10 bg-light-blue">
<img class="w2 h2 w3-ns h3-ns br-100" src="titles/scribe.png"/> <img class="w2 h2 w3-ns h3-ns br-100" src="titles/scribe.png" alt="Scribe"/>
<div class="pl3 flex-auto"> <div class="pl3 flex-auto">
<span class="f6 db black-70">Nora Wilson</span> <span class="f6 db black-70">Nora Wilson</span>
</div> </div>
</li> </li>
<li <li
class="flex items-center lh-copy pa3 ph0-l bb b--black-10 bg-light-blue"> class="flex items-center lh-copy pa3 ph0-l bb b--black-10 bg-light-blue">
<img class="w2 h2 w3-ns h3-ns br-100" src="titles/pl.png"/> <img class="w2 h2 w3-ns h3-ns br-100" src="titles/pl.png" alt="Patrol Leader"/>
<div class="pl3 flex-auto"> <div class="pl3 flex-auto">
<span class="f6 db black-70">Avery Elliot</span> <span class="f6 db black-70">Avery Elliot</span>
</div> </div>
</li> </li>
<li <li
class="flex items-center lh-copy pa3 ph0-l bb b--black-10 bg-light-blue"> class="flex items-center lh-copy pa3 ph0-l bb b--black-10 bg-light-blue">
<img class="w2 h2 w3-ns h3-ns br-100" src="titles/pl.png"/> <img class="w2 h2 w3-ns h3-ns br-100" src="titles/pl.png" alt="Patrol Leader"/>
<div class="pl3 flex-auto"> <div class="pl3 flex-auto">
<span class="f6 db black-70">Locklyn Linebaugh</span> <span class="f6 db black-70">Locklyn Linebaugh</span>
</div> </div>
</li> </li>
<li <li
class="flex items-center lh-copy pa3 ph0-l bb b--black-10 bg-light-blue"> class="flex items-center lh-copy pa3 ph0-l bb b--black-10 bg-light-blue">
<img class="w2 h2 w3-ns h3-ns br-100" src="titles/historian.png"/> <img class="w2 h2 w3-ns h3-ns br-100" src="titles/historian.png" alt="Historian"/>
<div class="pl3 flex-auto"> <div class="pl3 flex-auto">
<span class="f6 db black-70">Natalie Sorrell</span> <span class="f6 db black-70">Natalie Sorrell</span>
</div> </div>
</li> </li>
<li <li
class="flex items-center lh-copy pa3 ph0-l bb b--black-10 bg-light-blue"> class="flex items-center lh-copy pa3 ph0-l bb b--black-10 bg-light-blue">
<img class="w2 h2 w3-ns h3-ns br-100" src="titles/librarian.png"/> <img class="w2 h2 w3-ns h3-ns br-100" src="titles/librarian.png" alt="Librarian"/>
<div class="pl3 flex-auto"> <div class="pl3 flex-auto">
<span class="f6 db black-70">Kenzie Elliot</span> <span class="f6 db black-70">Kenzie Elliot</span>
</div> </div>
</li> </li>
<li <li
class="flex items-center lh-copy pa3 ph0-l bb b--black-10 bg-light-blue"> class="flex items-center lh-copy pa3 ph0-l bb b--black-10 bg-light-blue">
<img class="w2 h2 w3-ns h3-ns br-100" src="titles/dc.png"/> <img class="w2 h2 w3-ns h3-ns br-100" src="titles/dc.png" alt="Den Chief"/>
<div class="pl3 flex-auto"> <div class="pl3 flex-auto">
<span class="f6 db black-70">Locklyn Linebaugh</span> <span class="f6 db black-70">Locklyn Linebaugh</span>
</div> </div>
</li> </li>
</ul> </ul>
</div>
} @else { } @else {
<div class="cf"> <div class="cf">
<div class="fl w-20 tc pv1 bg-transparent"> <div class="fl w-20 tc pv1 bg-transparent">
<article class="mw5 center bg-light-blue br3 pa3 pa4-ns mv3 ba b--black-10"> <article class="mw5 center bg-light-blue br3 pa3 pa4-ns mv3 ba b--black-10">
<div class="tc"> <div class="tc">
<img src="titles/spl.png" class="br-100 h4 w4 dib ba b--black-05 pa2" title="Senior Patrol Leader"> <img src="titles/spl.png" class="br-100 h4 w4 dib ba b--black-05 pa2" title="Senior Patrol Leader"
alt="Senior Patrol Leader">
<h1 class="f3 mb2">Juliahna Seidler</h1> <h1 class="f3 mb2">Juliahna Seidler</h1>
</div> </div>
</article> </article>
@ -85,7 +88,7 @@
<article class="mw5 center bg-light-blue br3 pa3 pa4-ns mv3 ba b--black-10"> <article class="mw5 center bg-light-blue br3 pa3 pa4-ns mv3 ba b--black-10">
<div class="tc"> <div class="tc">
<img src="titles/aspl.png" class="br-100 h4 w4 dib ba b--black-05 pa2" <img src="titles/aspl.png" class="br-100 h4 w4 dib ba b--black-05 pa2"
title="Assistant Senior Patrol Leader"> title="Assistant Senior Patrol Leader" alt="Assistant Senior Patrol Leader">
<h1 class="f3 mb2">Kenzie Witherow</h1> <h1 class="f3 mb2">Kenzie Witherow</h1>
</div> </div>
</article> </article>
@ -93,7 +96,8 @@
<div class="fl w-20 tc pv1 bg-transparent"> <div class="fl w-20 tc pv1 bg-transparent">
<article class="mw5 center bg-light-blue br3 pa3 pa4-ns mv3 ba b--black-10"> <article class="mw5 center bg-light-blue br3 pa3 pa4-ns mv3 ba b--black-10">
<div class="tc"> <div class="tc">
<img src="titles/oeg.png" class="br-100 h4 w4 dib ba b--black-05 pa2" title="Outdoor Ethics Guide"> <img src="titles/oeg.png" class="br-100 h4 w4 dib ba b--black-05 pa2" title="Outdoor Ethics Guide"
alt="Outdoor Ethics Guide">
<h1 class="f3 mb2">Carlie Sorrell</h1> <h1 class="f3 mb2">Carlie Sorrell</h1>
</div> </div>
</article> </article>
@ -101,7 +105,8 @@
<div class="fl w-20 tc pv1 bg-transparent"> <div class="fl w-20 tc pv1 bg-transparent">
<article class="mw5 center bg-light-blue br3 pa3 pa4-ns mv3 ba b--black-10"> <article class="mw5 center bg-light-blue br3 pa3 pa4-ns mv3 ba b--black-10">
<div class="tc"> <div class="tc">
<img src="titles/qm.png" class="br-100 h4 w4 dib ba b--black-05 pa2" title="Quarter Master"> <img src="titles/qm.png" class="br-100 h4 w4 dib ba b--black-05 pa2" title="Quarter Master"
alt="Quartermaster">
<h1 class="f3 mb2">Ella Mercer</h1> <h1 class="f3 mb2">Ella Mercer</h1>
</div> </div>
</article> </article>
@ -109,7 +114,7 @@
<div class="fl w-20 tc pv1 bg-transparent"> <div class="fl w-20 tc pv1 bg-transparent">
<article class="mw5 center bg-light-blue br3 pa3 pa4-ns mv3 ba b--black-10"> <article class="mw5 center bg-light-blue br3 pa3 pa4-ns mv3 ba b--black-10">
<div class="tc"> <div class="tc">
<img src="titles/scribe.png" class="br-100 h4 w4 dib ba b--black-05 pa2" title="Scribe"> <img src="titles/scribe.png" class="br-100 h4 w4 dib ba b--black-05 pa2" title="Scribe" alt="Scribe">
<h1 class="f3 mb2">Nora Wilson</h1> <h1 class="f3 mb2">Nora Wilson</h1>
</div> </div>
</article> </article>
@ -119,7 +124,8 @@
<div class="fl w-20 tc pv1 bg-transparent"> <div class="fl w-20 tc pv1 bg-transparent">
<article class="mw5 center bg-light-blue br3 pa3 pa4-ns mv3 ba b--black-10"> <article class="mw5 center bg-light-blue br3 pa3 pa4-ns mv3 ba b--black-10">
<div class="tc"> <div class="tc">
<img src="titles/pl.png" class="br-100 h4 w4 dib ba b--black-05 pa2" title="Patrol Leader"> <img src="titles/pl.png" class="br-100 h4 w4 dib ba b--black-05 pa2" title="Patrol Leader"
alt="Patrol Leader">
<h1 class="f3 mb2">Avery Elliot</h1> <h1 class="f3 mb2">Avery Elliot</h1>
</div> </div>
</article> </article>
@ -127,7 +133,8 @@
<div class="fl w-20 tc pv1 bg-transparent"> <div class="fl w-20 tc pv1 bg-transparent">
<article class="mw5 center bg-light-blue br3 pa3 pa4-ns mv3 ba b--black-10"> <article class="mw5 center bg-light-blue br3 pa3 pa4-ns mv3 ba b--black-10">
<div class="tc"> <div class="tc">
<img src="titles/pl.png" class="br-100 h4 w4 dib ba b--black-05 pa2" title="Patrol Leader"> <img src="titles/pl.png" class="br-100 h4 w4 dib ba b--black-05 pa2" title="Patrol Leader"
alt="Patrol Leader">
<h1 class="f3 mb2">Locklyn Linebaugh</h1> <h1 class="f3 mb2">Locklyn Linebaugh</h1>
</div> </div>
</article> </article>
@ -135,7 +142,7 @@
<div class="fl w-20 tc pv1 bg-transparent"> <div class="fl w-20 tc pv1 bg-transparent">
<article class="mw5 center bg-light-blue br3 pa3 pa4-ns mv3 ba b--black-10"> <article class="mw5 center bg-light-blue br3 pa3 pa4-ns mv3 ba b--black-10">
<div class="tc"> <div class="tc">
<img src="titles/historian.png" class="br-100 h4 w4 dib ba b--black-05 pa2" title="Historian"> <img src="titles/historian.png" class="br-100 h4 w4 dib ba b--black-05 pa2" title="Historian" alt="Historian">
<h1 class="f3 mb2">Natalie Sorrell</h1> <h1 class="f3 mb2">Natalie Sorrell</h1>
</div> </div>
</article> </article>
@ -143,7 +150,7 @@
<div class="fl w-20 tc pv1 bg-transparent"> <div class="fl w-20 tc pv1 bg-transparent">
<article class="mw5 center bg-light-blue br3 pa3 pa4-ns mv3 ba b--black-10"> <article class="mw5 center bg-light-blue br3 pa3 pa4-ns mv3 ba b--black-10">
<div class="tc"> <div class="tc">
<img src="titles/librarian.png" class="br-100 h4 w4 dib ba b--black-05 pa2" title="Librarian"> <img src="titles/librarian.png" class="br-100 h4 w4 dib ba b--black-05 pa2" title="Librarian" alt="Librarian">
<h1 class="f3 mb2">Kenzie Elliot</h1> <h1 class="f3 mb2">Kenzie Elliot</h1>
</div> </div>
</article> </article>
@ -151,7 +158,7 @@
<div class="fl w-20 tc pv1 bg-transparent"> <div class="fl w-20 tc pv1 bg-transparent">
<article class="mw5 center bg-light-blue br3 pa3 pa4-ns mv3 ba b--black-10"> <article class="mw5 center bg-light-blue br3 pa3 pa4-ns mv3 ba b--black-10">
<div class="tc"> <div class="tc">
<img src="titles/dc.png" class="br-100 h4 w4 dib ba b--black-05 pa2" title="Den Chief"> <img src="titles/dc.png" class="br-100 h4 w4 dib ba b--black-05 pa2" title="Den Chief" alt="Den Chief">
<h1 class="f3 mb2">Locklyn Linebaugh</h1> <h1 class="f3 mb2">Locklyn Linebaugh</h1>
</div> </div>
</article> </article>

View File

@ -3,6 +3,7 @@
body, html { body, html {
height: 100%; height: 100%;
margin: 0; margin: 0;
overflow: scroll;
background-image: url('https://images.unsplash.com/photo-1505490096310-204ef067fe6b?q=80&w=3270&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D'); background-image: url('https://images.unsplash.com/photo-1505490096310-204ef067fe6b?q=80&w=3270&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D');
background-color: black; background-color: black;
} }
@ -15,3 +16,10 @@ body, html {
justify-content: center; justify-content: center;
} }
} }
.container {
min-height: 70%;
min-height: -webkit-calc(100% - 186px);
min-height: -moz-calc(100% - 186px);
min-height: calc(100% - 186px);
}