Skip to content

Commit

Permalink
feature: feeds language filter (#412)
Browse files Browse the repository at this point in the history
* fix(deps): update dependency @aws-amplify/auth to v4 (#352)

Co-authored-by: Renovate Bot <[email protected]>

* Feature: Added Dark theme (#365)

* Theme provider to Syllabus & context to containers

* Add context on components in Syllabus which may require fix for dark mode

* feat: replace @reach/router to react-router v6

* feat: update header for all apps

* fix: reinstall react-router-dom v6 and history after rebase

* feat: add new themes

* fix: lock files

* feat: install TailwindCSS on Campus

* feat: install TailwindCSS on Syllabus

* feat: change theme-toggle color according to current theme

* fix: change locations of tailwind import; remove unused log

* feat: dark theme on Timetable

* Feat: Added new sidebar icons from material ui icons

* Feat: Separated icons into different component

* fix: added package json and pnpm lock updates

* feat: pass isDark property to styled components

* feat: dark theme on Syllabus (CourseItem not yet)

* fix: wrap ThemeProvider on Nav; use new theme colors

* fix: use className instead of passing theme as props

* feat: dark theme on CourseInfo (not completed)

* fix: Made theme types exportable

* fix: created sidebar wrapper locally instead of bit

* fix: Fixed styling of icon group button

* feat: added user profile icon

* feat: Added dark mode styling to other links

* fix: moved browser router wrapper outside to fix navigation

* fix: used const instead of let for navigation hook

* fix: fixed import order

* feat: CourseInfo dark mode

* feat: Made title logo svg into a component

* fix: made title logo text colour change when theme toggle

* fix: fixed extra stylings when dark mode

* fix: updated package versions and pnpm lock file

* feat: update loading-spinner & solve background color flicker while loading page in dark mode

* feat: added dark mode styling to about us pages

* feat: added dark mode styling to extra pages

* feat: dark theme to mobile bottom nav

* feat: update header & loading-spinner & body tag background color

* feat: added dark mode background

* fix: fixed title logo on sidebar not changing colours when switching modes

* fix: added tab colours when dark mode

* fix: added dark mode colours to partner page text

* feat: dark mode for Labs

* fix: related courses width

* feat: update spinner in Syllabus; dark mode for Campus

* fix: timetable course item scrollable space height

* feat: make timetable course item darker in dark mode

* feat: install tailwind in feeds (not used yet)

* feat: redirecting page styling

* feat: update sign in modal

* feat: updated header component and pnpm lock file accordingly

* fix: updated colors and header dependencies

* fix: eslint fixes for campus folder

* feat: added dark mode styling to campus folder

* fix: eslint fixes in syllabus folder

* fix: updated dark mode styling

* fix: updated dark mode syllabus

* fix: updated dark mode styling root folder

* fix: syllabus border & step arrow color

* fix: fixed styling for social media icons in partners

* fix: removed unused imports

* fix: Or-button dark mode color

* fix: remove FilterWarningsPlugin

* fix: update lock files

* fix: remove -y option

* fix: update lock files

* fix: update @aws-amplify/auth in syllabus

* fix: update loading spinner in Feeds

* fix: add theme prop to LoadingSpinner in Feeds

Co-authored-by: YHhaoareyou <[email protected]>

* fix: clear search keywords when onclick related courses

* Debug: mobile dark mode debug (#373)

* feat: dark mode & new messages on welcome modal

* fix: dark mode on sign in modal & user login icon

* chore(deps): update dependency eslint-plugin-react to v7.29.4 (#361)

Co-authored-by: Renovate Bot <[email protected]>

* chore(deps): update dependency ts-loader to v9.2.8 (#359)

Co-authored-by: Renovate Bot <[email protected]>

* feat: remove unused dependencies (#377)

* Feature/darktheme colors (#378)

* feat: added quarterColors for both light and dark mode

* feat: Added google analytics to theme changes

* fix: fixed user profile icon to make it consistent

* fix: code refactoring

* fix: code refactoring in syllabus

* feat: added dark semantic colors

* fix: added colors based on numbers too

* fix: added a todo comment

* fix: fix semantic text colors dark mode

* feat: update quarter switch colors & icons

* feat: update timetable course items and color selector with new theme colors

Co-authored-by: Nicholas Narmada <[email protected]>

* Feature: Timetable dark theme (#379)

* feat: Dark mode for pro tips and colors selector popup in Timetable

* feat: update theme colors dependency for all apps

* feat: add the hovering effect to the member cards (#381)

* feat: update the hovering effect for member cards

* fix: remove unused libraries; fix html background color in dark mode; disable card's hyperlink

* fix: makes the code shorter and neater

* fix: syllabus pnpm lock file

* fix: syllabus pnpm lock file

Co-authored-by: YHhaoareyou <[email protected]>

* Migrate from Webpack to Vite (#382)

* feat: vite tested by career folder

* feat: replace systemjs import with dynamic import to import vite project

* feat: ignore dynamic import problem caused by webpack

* feat: Migrate Campus from Webpack to Vite

* fix: restore career

* feat: register vite app campus by single-spa-layout

* feat: migrate Syllabus to vite (error unsolved)

* fix: fix lockfile

* fix: solve "exportStar not a function", "undefined global" and use Vite envvar

* feat: migrate syllabus to vite (done)

* remove webpack from all apps except root

* feat: migrate root to vite

* feat: remove webpack related scripts & solve import-map not supported problem in Safari

* feat: import static assets; solve errors of custom props passed to dom

* fix: run eslint fix

* fix: build script & config

* feat: build config & debug global var

* fix: output asset files path

* feat: disable css code split in build

* fix: run eslint fix

* feat: preload css from mf apps to root; replace react-s-alert with react-toastify

* feat: configure public path & env var for each app

* fix: run eslint fix

* feat: service-worker

* fix: eslint fix

* update lock files

* fix: missing package

* fix: externalize styles from other mf app

* fix: campus room badge styles

Co-authored-by: AustinZhu <[email protected]>

* fix: env without using dotenv explicitly (#385)

* fix: packages version

* fix: change env var name

* fix: remove systemjs package; add peer dependencies

* fix: feeds domain on staging/prod

* Feature: About Us page link from Home page & split Home from Root-config (#387)

* fix: remove custom sw

* feat: add link to aboutus page from home

* fix: eslint

* Feature/fix card padding (#388)

* fix: fixing the responsive design for members card

* fix: fixing the responsive design for members card

* fix: font color, repeated className, figure tag

* fix: install missing dependency: @aws-amplify/core

* fix: remove course function

* feat: alert translation

* fix: eslint

* feat: add workbox runtimeCaching config

* Fix service worker to enable it to replace old one (#389)

* fix: add cleanupOutdatedCaches option

* use custom sw & force update

* skipWaiting and claim before cleanupOutdatedCaches

* add ts files to NetworkFirst cache

* remove ts from cache

* register sw on index.html

* change sw from ts to js

* test updates to trigger build

* registerSW in index.html

* remove unused code and comment of registering sw

* update files to trigger build

* feat: add a profile card component; add hover & click effect; add a closing tab on cards (#390)

* feat: add a profile card component;
add hover & click effect;
add closing tab on cards

* fix: rename profile card & prop; type for useState

* fix: syllabus minor styling issues

* Update README.md

* Migrate from Webpack to Vite (#386)

* fix(deps): update dependency @aws-amplify/auth to v4 (#352)

Co-authored-by: Renovate Bot <[email protected]>

* Feature: Added Dark theme (#365)

* Theme provider to Syllabus & context to containers

* Add context on components in Syllabus which may require fix for dark mode

* feat: replace @reach/router to react-router v6

* feat: update header for all apps

* fix: reinstall react-router-dom v6 and history after rebase

* feat: add new themes

* fix: lock files

* feat: install TailwindCSS on Campus

* feat: install TailwindCSS on Syllabus

* feat: change theme-toggle color according to current theme

* fix: change locations of tailwind import; remove unused log

* feat: dark theme on Timetable

* Feat: Added new sidebar icons from material ui icons

* Feat: Separated icons into different component

* fix: added package json and pnpm lock updates

* feat: pass isDark property to styled components

* feat: dark theme on Syllabus (CourseItem not yet)

* fix: wrap ThemeProvider on Nav; use new theme colors

* fix: use className instead of passing theme as props

* feat: dark theme on CourseInfo (not completed)

* fix: Made theme types exportable

* fix: created sidebar wrapper locally instead of bit

* fix: Fixed styling of icon group button

* feat: added user profile icon

* feat: Added dark mode styling to other links

* fix: moved browser router wrapper outside to fix navigation

* fix: used const instead of let for navigation hook

* fix: fixed import order

* feat: CourseInfo dark mode

* feat: Made title logo svg into a component

* fix: made title logo text colour change when theme toggle

* fix: fixed extra stylings when dark mode

* fix: updated package versions and pnpm lock file

* feat: update loading-spinner & solve background color flicker while loading page in dark mode

* feat: added dark mode styling to about us pages

* feat: added dark mode styling to extra pages

* feat: dark theme to mobile bottom nav

* feat: update header & loading-spinner & body tag background color

* feat: added dark mode background

* fix: fixed title logo on sidebar not changing colours when switching modes

* fix: added tab colours when dark mode

* fix: added dark mode colours to partner page text

* feat: dark mode for Labs

* fix: related courses width

* feat: update spinner in Syllabus; dark mode for Campus

* fix: timetable course item scrollable space height

* feat: make timetable course item darker in dark mode

* feat: install tailwind in feeds (not used yet)

* feat: redirecting page styling

* feat: update sign in modal

* feat: updated header component and pnpm lock file accordingly

* fix: updated colors and header dependencies

* fix: eslint fixes for campus folder

* feat: added dark mode styling to campus folder

* fix: eslint fixes in syllabus folder

* fix: updated dark mode styling

* fix: updated dark mode syllabus

* fix: updated dark mode styling root folder

* fix: syllabus border & step arrow color

* fix: fixed styling for social media icons in partners

* fix: removed unused imports

* fix: Or-button dark mode color

* fix: remove FilterWarningsPlugin

* fix: update lock files

* fix: remove -y option

* fix: update lock files

* fix: update @aws-amplify/auth in syllabus

* fix: update loading spinner in Feeds

* fix: add theme prop to LoadingSpinner in Feeds

Co-authored-by: YHhaoareyou <[email protected]>

* fix: clear search keywords when onclick related courses

* Debug: mobile dark mode debug (#373)

* feat: dark mode & new messages on welcome modal

* fix: dark mode on sign in modal & user login icon

* chore(deps): update dependency eslint-plugin-react to v7.29.4 (#361)

Co-authored-by: Renovate Bot <[email protected]>

* chore(deps): update dependency ts-loader to v9.2.8 (#359)

Co-authored-by: Renovate Bot <[email protected]>

* feat: remove unused dependencies (#377)

* Feature/darktheme colors (#378)

* feat: added quarterColors for both light and dark mode

* feat: Added google analytics to theme changes

* fix: fixed user profile icon to make it consistent

* fix: code refactoring

* fix: code refactoring in syllabus

* feat: added dark semantic colors

* fix: added colors based on numbers too

* fix: added a todo comment

* fix: fix semantic text colors dark mode

* feat: update quarter switch colors & icons

* feat: update timetable course items and color selector with new theme colors

Co-authored-by: Nicholas Narmada <[email protected]>

* Feature: Timetable dark theme (#379)

* feat: Dark mode for pro tips and colors selector popup in Timetable

* feat: update theme colors dependency for all apps

* feat: add the hovering effect to the member cards (#381)

* feat: update the hovering effect for member cards

* fix: remove unused libraries; fix html background color in dark mode; disable card's hyperlink

* fix: makes the code shorter and neater

* fix: syllabus pnpm lock file

* fix: syllabus pnpm lock file

Co-authored-by: YHhaoareyou <[email protected]>

* Migrate from Webpack to Vite (#382)

* feat: vite tested by career folder

* feat: replace systemjs import with dynamic import to import vite project

* feat: ignore dynamic import problem caused by webpack

* feat: Migrate Campus from Webpack to Vite

* fix: restore career

* feat: register vite app campus by single-spa-layout

* feat: migrate Syllabus to vite (error unsolved)

* fix: fix lockfile

* fix: solve "exportStar not a function", "undefined global" and use Vite envvar

* feat: migrate syllabus to vite (done)

* remove webpack from all apps except root

* feat: migrate root to vite

* feat: remove webpack related scripts & solve import-map not supported problem in Safari

* feat: import static assets; solve errors of custom props passed to dom

* fix: run eslint fix

* fix: build script & config

* feat: build config & debug global var

* fix: output asset files path

* feat: disable css code split in build

* fix: run eslint fix

* feat: preload css from mf apps to root; replace react-s-alert with react-toastify

* feat: configure public path & env var for each app

* fix: run eslint fix

* feat: service-worker

* fix: eslint fix

* update lock files

* fix: missing package

* fix: externalize styles from other mf app

* fix: campus room badge styles

Co-authored-by: AustinZhu <[email protected]>

* fix: env without using dotenv explicitly (#385)

* fix: packages version

* fix: change env var name

* fix: remove systemjs package; add peer dependencies

* fix: feeds domain on staging/prod

* Feature: About Us page link from Home page & split Home from Root-config (#387)

* fix: remove custom sw

* feat: add link to aboutus page from home

* fix: eslint

* Feature/fix card padding (#388)

* fix: fixing the responsive design for members card

* fix: fixing the responsive design for members card

* fix: font color, repeated className, figure tag

* fix: install missing dependency: @aws-amplify/core

* fix: remove course function

* feat: alert translation

* fix: eslint

* feat: add workbox runtimeCaching config

* Fix service worker to enable it to replace old one (#389)

* fix: add cleanupOutdatedCaches option

* use custom sw & force update

* skipWaiting and claim before cleanupOutdatedCaches

* add ts files to NetworkFirst cache

* remove ts from cache

* register sw on index.html

* change sw from ts to js

* test updates to trigger build

* registerSW in index.html

* remove unused code and comment of registering sw

* update files to trigger build

* feat: add a profile card component; add hover & click effect; add a closing tab on cards (#390)

* feat: add a profile card component;
add hover & click effect;
add closing tab on cards

* fix: rename profile card & prop; type for useState

* fix: syllabus minor styling issues

* Update README.md

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Nicholas Narmada <[email protected]>
Co-authored-by: Nicholas Narmada <[email protected]>
Co-authored-by: Xinyue Tao <[email protected]>
Co-authored-by: AustinZhu <[email protected]>

* add script-src-elem to Content Security Policy (#391)

* Hotfix (#392)

* add script-src-elem to Content Security Policy

* fix csp

* Hotfix (#393)

* add script-src-elem to Content Security Policy

* fix csp

* add blob:https: to csp

* fix blob in csp

* fix: remove csp

* fix: remove all webpack-related packages & setting

* Allow all in CSP

* Fix: preload style, csp allow all, refactor index html & env var (#404)

* fix style prelload link

* refactor index.html & add env variables

* remove slash from the end of base path env var

* import other mf's css files as external

* run eslint fix

* run eslint fix

* Update README.md (#397)

Github -> GitHub

* chore(deps): update dependency esbuild to v0.14.43 (#384)

Co-authored-by: Renovate Bot <[email protected]>

* chore(deps): update dependencies

* chore(deps): update dependencies

* chore(deps): update dependencies

* fix: preload & enable styles from other mf app

* fix: packages version (fix React to v17)

* Language filter for Feeds (#409)

* filter feeds by language

* feat: styling lang filter button

* feat: Back button to Feeds list page

* Remove using @apply in css file due to amp style problem

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Nicholas Narmada <[email protected]>
Co-authored-by: Nicholas Narmada <[email protected]>
Co-authored-by: Xinyue Tao <[email protected]>
Co-authored-by: AustinZhu <[email protected]>
Co-authored-by: Ikko Ashimine <[email protected]>
  • Loading branch information
8 people authored Oct 10, 2022
1 parent 41c2250 commit a6c663e
Show file tree
Hide file tree
Showing 8 changed files with 103 additions and 158 deletions.
39 changes: 15 additions & 24 deletions feeds/components/FeedLink.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@ import CardContent from "@material-ui/core/CardContent";
import CardMedia from "@material-ui/core/CardMedia";
import Hidden from "@material-ui/core/Hidden";
import { useEffect, useState } from "react";
import { FeedInfo } from "../constants/types";
import { Lang, LangMap } from "../constants/langs";

const useStyles = makeStyles({
card: {
display: "flex",
padding: '0px 10px !important'
padding: 0
},
cardContent: {
padding: '0px !important'
padding: 20
},
cardDetails: {
flex: 1,
Expand All @@ -25,6 +27,7 @@ const useStyles = makeStyles({
width: 200,
},
title: {
fontSize: 20,
fontFamily: "Lato, Yu Gothic Medium, Segoe UI"
},
text: {
Expand All @@ -40,29 +43,16 @@ const useStyles = makeStyles({
}
});

const LangMap : {
[key: string]: string;
} = {
EN: 'English',
JA: '日本語',
zhCN: '简中',
zhTW: '繁中'
type Props = {
name: string;
feed: FeedInfo;
locale: string;
}

type LangMap = typeof LangMap[keyof typeof LangMap];

const FeedLink = ({ name, locale }: { name: string; locale: string; }) => {
const FeedLink = ({ name, feed, locale }: Props) => {
const classes = useStyles();
const [cover, setCover] = useState('');

const feedInfo = {
date: name.split('-')[0].replace(/_/g, '-'),
partner: name.split('-')[1].replace(/_/g, '-'),
title: name.split('-')[2].replace(/_/g, ' ').replace(/\[/g, '【').replace(/\]/g, '】').replace(/\</g, '(').replace(/\>/g, ')'),
lang: name.split('-')[3],
authors: name.split('-').slice(4).map(author => author.replace(/_/g, ' ').replace(/\</g, '(').replace(/\>/g, ')'))
};

useEffect(() => {
var coverImg;
try {
Expand Down Expand Up @@ -93,14 +83,15 @@ const FeedLink = ({ name, locale }: { name: string; locale: string; }) => {
<div className={classes.cardDetails}>
<CardContent className={classes.cardContent}>
<h3 className={classes.title}>
{feedInfo.title}
{feed.title}
</h3>
<br />
<p className={classes.text}>
<b>{feedInfo.partner}</b> {feedInfo.authors.map((author, i) => i === 0 ? author : ' & ' + author)}
<b>{feed.partner}</b> {feed.authors.map((author, i) => i === 0 ? author : ' & ' + author)}
</p>
<p className={classes.text}>
{feedInfo.date}
<span className={classes.lang}>{LangMap[feedInfo.lang]}</span>
{feed.date}
<span className={classes.lang}>{LangMap[feed.lang as Lang]}</span>
</p>
</CardContent>
</div>
Expand Down
17 changes: 17 additions & 0 deletions feeds/constants/langs.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
export enum Lang {
EN = "EN",
JA = "JA",
zhCN = "zhCN",
zhTW = "zhTW",
KR = "KR"
};

export const LangMap : {
[key in Lang]: string;
} = {
EN: 'English',
JA: '日本語',
zhCN: '简中',
zhTW: '繁中',
KR: '한국어'
};
7 changes: 7 additions & 0 deletions feeds/constants/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export type FeedInfo = {
date: string;
partner: string;
title: string;
lang: string;
authors: string[];
};
8 changes: 6 additions & 2 deletions feeds/pages/[lang]/[feed].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,17 @@ const Feed = ({ feed, lang, filename, updatedAt }: Props) => {
</div>
}

<div className="mx-4 md:mx-20 my-4">
<button className="w-[32px] h-[32px] rounded-full text-bold text-light-main border-2 border-light-main hover:text-white hover:bg-light-main" onClick={() => router.back()}></button>
</div>

<div className="feedWrapper">
<h1 className='title'>{feedInfo.title}</h1>
<h1 className='text-3xl mb-8 title'>{feedInfo.title}</h1>
<p className='info'>
<b>{feedInfo.partner}</b> {feedInfo.authors.map((author, i) => i === 0 ? author : ' & ' + author)}
</p>
<p className='info'>{feedInfo.date} (Last updated: {updatedAt})</p>
<hr />
<hr className="mb-8" />
<div className='markdownWrapper'>
<ReactMarkdown components={{ img: Img }} children={feed} />
</div>
Expand Down
62 changes: 50 additions & 12 deletions feeds/pages/[lang]/index.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { useState } from 'react';
import type { NextPage } from 'next'
import Head from 'next/head'
import styles from '../../styles/Home.module.css'
import fs from "fs";
import path from "path";
import FeedLink from '../../components/FeedLink';
import Grid from "@material-ui/core/Grid";
import { useLocale } from '../../hooks/useLocale';
import { languages } from '../../i18n.config';
import { FeedInfo } from '../../constants/types';
import { Lang, LangMap } from '../../constants/langs';

interface StaticProps {
params: { lang: string; }
Expand All @@ -19,29 +21,65 @@ interface HomeProps {

const Home: NextPage<HomeProps> = ({ feedNames, lang }) => {
const { locale, t } = useLocale(lang);
const [ filteredLang, setFilteredLang ] = useState("");

const feeds: FeedInfo[] = feedNames.map(name => ({
date: name.split('-')[0].replace(/_/g, '-'),
partner: name.split('-')[1].replace(/_/g, '-'),
title: name.split('-')[2].replace(/_/g, ' ').replace(/\[/g, '【').replace(/\]/g, '】').replace(/\</g, '(').replace(/\>/g, ')'),
lang: name.split('-')[3],
authors: name.split('-').slice(4).map(author => author.replace(/_/g, ' ').replace(/\</g, '(').replace(/\>/g, ')'))
}));

return (
<div className={styles.container}>
<div className="px-4 sm:px-8 md:px-20 py-1">
<Head>
<title>WasedaTime - Feeds</title>
<meta name="description" content="Welcome to WasedaTime Feeds! Here we offer you articles that may be helpful for your student life & future career." />
<link rel="icon" href="/favicon.ico" />
</Head>

<main className={styles.main}>
<h2 style={{ color: "#555" }}>{t.index.welcome}</h2>
<hr style={{ width: "50%", color: "#555" }} />
<div className={styles.description}>
<p>{t.index['top message']}</p>
<p>
{t.index['looking for more blogs']}
<a href="mailto:[email protected]" style={{ color: '#3366ff' }}>[email protected]</a>
</p>
<main className="flex flex-1 flex-col">
<div className="flex flex-col my-8 text-center">
<h2 className="text-3xl text-gray-600">{t.index.welcome}</h2>
<hr className="w-1/2 text-gray-600 my-4 mx-auto" />
<div className="text-center">
<p>{t.index['top message']}</p>
<p>
{t.index['looking for more blogs']}
<a href="mailto:[email protected]" style={{ color: '#3366ff' }}>[email protected]</a>
</p>
</div>
</div>

<div id="filterButtonGroup" className="mb-8 inline-flex rounded-md" role="group">
<button
type="button"
className={"py-2 px-2 md:px-4 text-sm font-medium border border-x-0 border-y-2 border-light-main border-l-2 rounded-l-lg " + (filteredLang === "" ? "bg-light-main text-white" : "text-light-main hover:bg-light-main hover:text-white")}
style={{ borderLeftWidth: 2 }}
onClick={() => setFilteredLang("")}
>
All
</button>
{
Object.values(Lang).map((lang, i) => (
<button
type="button"
className={"py-2 px-2 md:px-4 text-sm font-medium border border-x-0 border-y-2 border-light-main " + (i === Object.values(Lang).length - 1 ? "rounded-r-lg " : " ") + (lang.toString() === filteredLang ? "bg-light-main text-white dark:text-white dark:bg-dark-main" : "text-light-main hover:bg-light-main hover:text-white")}
style={i === Object.values(Lang).length - 1 ? { borderRightWidth: 2 } : {}}
onClick={() => setFilteredLang(lang)}
>
{LangMap[lang]}
</button>
))
}
</div>

<Grid container spacing={4}>
{
feedNames.map((name, i) => <FeedLink key={'feed_link' + i} name={name} locale={locale || 'en'} />)
feeds.filter(feed => !filteredLang || feed.lang === filteredLang).map((feed, i) => (
<FeedLink key={'feed_link' + i} name={feedNames[i]} feed={feed} locale={locale || 'en'} />
))
}
</Grid>
</main>
Expand Down
116 changes: 0 additions & 116 deletions feeds/styles/Home.module.css

This file was deleted.

4 changes: 2 additions & 2 deletions feeds/styles/feed.css
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

.feedWrapper {
padding: 0px 20vw;
padding-top: 70px;
padding-top: 0px;
}

.feedWrapper .title {
Expand Down Expand Up @@ -114,7 +114,7 @@
@media (max-width: 768px) {
.feedWrapper {
padding: 0px 5vw;
padding-top: 70px;
padding-top: 0px;
}

.feedWrapper .markdownWrapper p {
Expand Down
8 changes: 6 additions & 2 deletions feeds/styles/globals.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* @tailwind base;
@tailwind base;
@tailwind components;
@tailwind utilities; */
@tailwind utilities;

@font-face {
font-family: "Segoe UI";
Expand Down Expand Up @@ -38,3 +38,7 @@ a {
* {
box-sizing: border-box;
}

h1, h2, h3, h4, h5, h6 {
font-family: Lato, Yu Gothic Medium, Segoe UI;
}

0 comments on commit a6c663e

Please sign in to comment.