Skip to content

Update pour charte graphique p26 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AurianeGb merged 1 commit into from
Feb 20, 2026
Merged

Update pour charte graphique p26 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*

#/src/config.ts
/src/config.ts

/.idea
Binary file modified public/favicon.ico
View file
Open in desktop
Binary file not shown.
Binary file modified public/logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 8 additions & 8 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,19 @@ const theme = createTheme({
categories: {
fontWeight: 900, // or 'bold'
fontSize: "1rem",
fontFamily: "Neophyte"
fontFamily: "Pretendard"
},
header: {
fontWeight: 900, // or 'bold'
fontSize: "1.5rem",
fontFamily: "Octuple",
fontSize: "1.9rem",
fontFamily: "Tarotheque",
letterSpacing:"0.02em",
},
"sub-header": {
fontWeight: 700, // or 'bold'
fontSize: "1.2rem",
textAlign: "center",
fontFamily: "Neophyte"
fontFamily: "Pretendard"
},
"article-text": {
fontWeight: 900, // or 'bold'
Expand All @@ -88,15 +88,15 @@ const theme = createTheme({
lineHeight: 1,
color: "white",
textShadow: '2px 2px 4px rgba(0, 0, 0, 0.7)',
fontFamily: "Neophyte"
fontFamily: "Pretendard"
},
"alt-article-text": {
fontWeight: 900,
fontSize: "1.3rem",
textAlign: "center",
lineHeight: 1,
color: "#a33b7e",
fontFamily: "Neophyte"
color: "#923615",
fontFamily: "Pretendard"
},
},
});
Expand Down Expand Up @@ -510,7 +510,7 @@ function App() {
return (
<ThemeProvider theme={theme}>
<div
className="App bg-logo_bg w-screen bg-no-repeat bg-center bg-fixed bg-background-page bg-[length:70%] h-screen overflow-y-scroll">
className="App bg-logo_bg w-screen bg-no-repeat bg-center bg-fixed bg-background-page bg-[length:55%] h-screen overflow-y-scroll">
<History/>
<Connexion/>
<CardReaderNotConnected/>
Expand Down
2 changes: 1 addition & 1 deletion src/components/header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export default function Header() {
<Box>
<Button
variant="contained"
style={{backgroundColor:"#fffb6c", color:'#a33b7e'}}
style={{backgroundColor:"#230E2F", color:'#9C75BE'}}
onClick={() => handleLogOut()}
disabled={connexion.type !== typeConnexion.SUCCESSFULL}
endIcon={<CancelPresentation/>}
Expand Down
Binary file added src/fonts/Pretendard-Light.otf
View file
Open in desktop
Binary file not shown.
Binary file added src/fonts/tarotheque_v1.ttf
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ code {
}

@font-face {
font-family: 'Octuple';
src: local('Octuple'), url(./fonts/Octuple-max.ttf) format('truetype');
font-family: 'Tarotheque';
src: local('Tarotheque'), url(./fonts/tarotheque_v1.ttf) format('truetype');
}

@font-face {
font-family: 'Neophyte';
src: local('Neophyte'), url(./fonts/Y2K_neophyte.ttf) format('truetype');
font-family: 'Pretendard';
src: local('Pretendard'), url(./fonts/Pretendard-Light.otf) format('truetype');
}

@tailwind base;
Expand Down
12 changes: 6 additions & 6 deletions tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module.exports = {
content: ["./src/**/*.{js,jsx,ts,tsx}"],
theme: {
boxShadow: {
component: "0 4px 6px -1px #883F1A",
article: "0 4px 6px -1px #883F1A",
component: "0 4px 6px -1px #923615",
article: "0 4px 6px -1px #923615",
},
borderWidth: {
DEFAULT: "0.1em",
Expand All @@ -16,18 +16,18 @@ module.exports = {
8: "8px",
},
colors: {
"background-component": "#c33b7a",
"border-component": "#612f96",
"background-component": "#923615",
"border-component": "#230E2F",
"border-inter-categories": "hsla(0, 0%, 100%, .1)",
red: "#ff3333",
green: "#5cb85c",
"border-article": "#612f96",
"border-article": "#230E2F",
orange: "#EF7B45",
"gray-dark": "#273444",
gray: "#8492a6",
"gray-light": "#d3dce6",
slate: "#201f1f",
"background-page": "#f3c238",
"background-page": "#9C75BE",
white: "#FFFFFF",
},
extend: {
Expand Down