Skip to content

Commit

Permalink
feat: swap in Footer component from @frequency-chain/style-guide (#43)
Browse files Browse the repository at this point in the history
- also fix tailwindow.config.js to use 'extend' property, else Tailwind
classes from the package don't come through always


- Closes #36 

## Screenshot(s)

Desktop:

![image](https://github.com/user-attachments/assets/0cf2479b-0ab0-4dc9-a463-9858ed115259)

Mobile/small screen:

![image](https://github.com/user-attachments/assets/b6637fef-97be-422a-88cc-b00c59e00783)

Please delete options that are not relevant.

- [X] Content Change (Required approval in Slack: `#frequency-xyz` and
remember that changes along the way trigger
      re-approval.)
  - [ ] Approved HE (Required for technical wording)
  - [ ] Approved CM
  - [ ] Approved UO

# How to Test?
1. Pull branch
2. Run `npm run dev -- --open`
3. Visually verify that the footer matches the screenshots
4. 
# Checklist:

- [x] I have performed a self-review of my code
- [x] I have commented my code & PR, particularly in hard-to-understand
areas
- [x] I have checked at all the breakpoints to make sure it works on all
screen sizes
  • Loading branch information
JoeCap08055 authored Oct 30, 2024
1 parent eae17aa commit bc23068
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 50 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:
with:
node-version: 20
cache: 'npm'

- name: Install Dependencies
run: npm ci

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
cache: npm

- name: Install dependencies
run: npm install
run: npm ci

- name: Build
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
cache: npm

- name: Install dependencies
run: npm install
run: npm ci

- name: Build
env:
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodejs 20.10.0
nodejs 20.18.0
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions src/components/Footer.svelte

This file was deleted.

2 changes: 1 addition & 1 deletion src/routes/(home)/+layout.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script>
import Footer from '../../components/Footer.svelte';
import { Footer } from '@frequency-chain/style-guide';
import GetNotified from '../../components/GetNotified/GetNotified.svelte';
import SideTag from '../../components/SideTag.svelte';
</script>
Expand Down
2 changes: 1 addition & 1 deletion src/routes/docs/+layout.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import Header from '../../components/Header/Header.svelte';
import Footer from '../../components/Footer.svelte';
import { Footer } from '@frequency-chain/style-guide';
const logoHex = '#5E69FF';
const navColor = 'navy';
Expand Down
2 changes: 1 addition & 1 deletion src/routes/privacy/+layout.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import Header from '../../components/Header/Header.svelte';
import Footer from '../../components/Footer.svelte';
import { Footer } from '@frequency-chain/style-guide';
const logoHex = '#5E69FF';
const navColor = 'navy';
Expand Down
62 changes: 32 additions & 30 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,39 @@ import frequencyConfig from '@frequency-chain/style-guide/tailwind.config';
import { MAX_PAGE_WIDTH } from './src/lib/consts';

export default {
content: ['./src/**/*.{html,js,svelte,ts}'],
content: ['./src/**/*.{html,js,svelte,ts}', './node_modules/@frequency-chain/style-guide/**/*.{html,js,svelte,ts}'],
theme: {
fontFamily: {
title: ['Newake', 'sans-serif'],
sans: ['Poppins', 'sans-serif'],
},
colors: {
darkIndigo: '#445BC3',
tealBright: '#00B6AF',
},
width: {
page: `${MAX_PAGE_WIDTH}px`,
full: '100%',
},
maxWidth: {
page: `${MAX_PAGE_WIDTH}px`,
full: '100%',
},
minWidth: {
page: `${MAX_PAGE_WIDTH}px`,
full: '100%',
},
screens: {
sm: '0px',
md: '900px',
lg: '1300px',
xl: `${MAX_PAGE_WIDTH}px`,
'vertical-lg': { raw: '(max-height: 700px) and (min-width: 1300px)' },
'vertical-md': { raw: '(max-height: 700px) and (min-width: 900px)' },
vertical: { raw: '(max-height: 700px) or (min-width: 0px)' },
horizontal: { raw: '(min-height: 700px) and (min-width: 1300px)' },
extend: {
fontFamily: {
title: ['Newake', 'sans-serif'],
sans: ['Poppins', 'sans-serif'],
},
colors: {
darkIndigo: '#445BC3',
tealBright: '#00B6AF',
},
width: {
page: `${MAX_PAGE_WIDTH}px`,
full: '100%',
},
maxWidth: {
page: `${MAX_PAGE_WIDTH}px`,
full: '100%',
},
minWidth: {
page: `${MAX_PAGE_WIDTH}px`,
full: '100%',
},
screens: {
sm: '0px',
md: '900px',
lg: '1300px',
xl: `${MAX_PAGE_WIDTH}px`,
'vertical-lg': { raw: '(max-height: 700px) and (min-width: 1300px)' },
'vertical-md': { raw: '(max-height: 700px) and (min-width: 900px)' },
vertical: { raw: '(max-height: 700px) or (min-width: 0px)' },
horizontal: { raw: '(min-height: 700px) and (min-width: 1300px)' },
},
},
},
safelist: ['after:bg-navy', 'after:bg-cream', 'invalid:border-red'],
Expand Down

0 comments on commit bc23068

Please sign in to comment.