diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx index 9b4e29d..c585064 100644 --- a/src/components/Footer.tsx +++ b/src/components/Footer.tsx @@ -1,11 +1,12 @@ import React from 'react' -import styled from '@emotion/styled'; -import i18n from './../i18n'; +import styled from '@emotion/styled' +import i18n from './../i18n' import {Link, useLocation, useNavigate} from 'react-router-dom' -import {SectionT} from '../pages/section/components/Section'; -import client from '../client'; -import FooterSvg from './FooterSvg'; -import PbsLogoSvg from './PbsLogoSvg'; +import {SectionT} from '../pages/section/components/Section' +import client from '../client' +import FooterSvg from './FooterSvg' +import PbsLogoSvg from './PbsLogoSvg' +import './footer.less' const Button = styled.button` diff --git a/src/components/Loading.tsx b/src/components/Loading.tsx index d904314..dd09929 100644 --- a/src/components/Loading.tsx +++ b/src/components/Loading.tsx @@ -1,5 +1,6 @@ import React, {useEffect, useState} from 'react' -import {useTranslation} from "react-i18next"; +import {useTranslation} from "react-i18next" +import './loading.less' type Props = { isLoading?: boolean diff --git a/src/components/Navigation.tsx b/src/components/Navigation.tsx index 85776ab..290be87 100644 --- a/src/components/Navigation.tsx +++ b/src/components/Navigation.tsx @@ -7,6 +7,7 @@ import {CalendarPageT} from '../pages/calendar/CalendarPage' import {useTranslation} from "react-i18next"; import {StartPageT} from '../pages/home/HomePage'; import {faBars, faCalendarDays, faHome, faSearch} from "@fortawesome/free-solid-svg-icons"; +import './nav.less' type Props = { startPage: StartPageT diff --git a/src/styles/footer.less b/src/components/footer.less similarity index 100% rename from src/styles/footer.less rename to src/components/footer.less diff --git a/src/styles/loading.less b/src/components/loading.less similarity index 96% rename from src/styles/loading.less rename to src/components/loading.less index 4a27507..e4e07d3 100644 --- a/src/styles/loading.less +++ b/src/components/loading.less @@ -1,3 +1,5 @@ +@import "../style"; + .loading-container { display: flex; flex-direction: column; diff --git a/src/styles/nav.less b/src/components/nav.less similarity index 99% rename from src/styles/nav.less rename to src/components/nav.less index 8b69652..965dbcd 100644 --- a/src/styles/nav.less +++ b/src/components/nav.less @@ -1,3 +1,4 @@ +@import "../style"; nav.header-nav { position: fixed; diff --git a/src/index.tsx b/src/index.tsx index 37e9b21..4df9076 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,5 +1,5 @@ import {createRoot} from 'react-dom/client'; -import './index.less'; +import './style.less'; import App from './App'; import React from 'react'; diff --git a/src/pages/calendar/CalendarPage.tsx b/src/pages/calendar/CalendarPage.tsx index 0057a53..ac60e7e 100644 --- a/src/pages/calendar/CalendarPage.tsx +++ b/src/pages/calendar/CalendarPage.tsx @@ -1,11 +1,12 @@ import React, {useEffect} from 'react' import {FontAwesomeIcon} from '@fortawesome/react-fontawesome' -import Markdown from 'react-markdown'; -import remarkGfm from 'remark-gfm'; -import {LinkComponent} from '../../helper/MarkdownComponents'; -import CalendarForm from './components/CalendarForm'; -import {IconT} from '../section/components/Section'; -import {faCalendarDays} from "@fortawesome/free-solid-svg-icons"; +import Markdown from 'react-markdown' +import remarkGfm from 'remark-gfm' +import {LinkComponent} from '../../helper/MarkdownComponents' +import CalendarForm from './components/CalendarForm' +import {IconT} from '../section/components/Section' +import {faCalendarDays} from "@fortawesome/free-solid-svg-icons" +import './calendar.less' export type CalendarPageT = { title: string diff --git a/src/styles/calendar.less b/src/pages/calendar/calendar.less similarity index 100% rename from src/styles/calendar.less rename to src/pages/calendar/calendar.less diff --git a/src/pages/search/SearchPage.tsx b/src/pages/search/SearchPage.tsx index 3dc297b..a281399 100644 --- a/src/pages/search/SearchPage.tsx +++ b/src/pages/search/SearchPage.tsx @@ -9,7 +9,8 @@ import searchPageDE from "../../data/search-page/de.json" import searchPageFR from "../../data/search-page/fr.json" import searchPageIT from "../../data/search-page/it.json" import {SectionT} from "../section/components/Section" -import {faSearch} from "@fortawesome/free-solid-svg-icons"; +import {faSearch} from "@fortawesome/free-solid-svg-icons" +import './search.less' type Props = { sections: SectionT[] diff --git a/src/styles/search.less b/src/pages/search/search.less similarity index 97% rename from src/styles/search.less rename to src/pages/search/search.less index 26de397..17bd809 100644 --- a/src/styles/search.less +++ b/src/pages/search/search.less @@ -1,3 +1,5 @@ +@import "../../style.less"; + .search-results { display: flex; flex-direction: column; diff --git a/src/pages/section/components/Chapter.tsx b/src/pages/section/components/Chapter.tsx index 2527f9c..ee04739 100644 --- a/src/pages/section/components/Chapter.tsx +++ b/src/pages/section/components/Chapter.tsx @@ -4,6 +4,7 @@ import remarkGfm from 'remark-gfm' import {LinkComponent} from '../../../helper/MarkdownComponents' import {IconT, SectionT} from './Section' import Target from './Target' +import './chapter.less' export type Role = { rolle: string diff --git a/src/pages/section/components/Section.tsx b/src/pages/section/components/Section.tsx index c1e4fcc..8901182 100644 --- a/src/pages/section/components/Section.tsx +++ b/src/pages/section/components/Section.tsx @@ -3,6 +3,7 @@ import Markdown from 'react-markdown' import remarkGfm from 'remark-gfm' import {LinkComponent} from '../../../helper/MarkdownComponents' import Chapter, {ChapterT} from './Chapter' +import './section.less' export type SectionT = { chapters: ChapterT[] diff --git a/src/styles/chapter.less b/src/pages/section/components/chapter.less similarity index 100% rename from src/styles/chapter.less rename to src/pages/section/components/chapter.less diff --git a/src/styles/section.less b/src/pages/section/components/section.less similarity index 100% rename from src/styles/section.less rename to src/pages/section/components/section.less diff --git a/src/index.less b/src/style.less similarity index 92% rename from src/index.less rename to src/style.less index 1ffd50c..b707f6f 100644 --- a/src/index.less +++ b/src/style.less @@ -1,11 +1,4 @@ @import './fonts/fonts.css'; -@import './styles/section.less'; -@import './styles/chapter.less'; -@import './styles/nav.less'; -@import './styles/calendar.less'; -@import './styles/footer.less'; -@import './styles/loading.less'; -@import './styles/search.less'; @color-primary: #521d3a; @color-primary-light: #8c3c4f;