From 963c94c262dfed9bbd458c5fb0c89318f77949d0 Mon Sep 17 00:00:00 2001 From: Nikolai Petukhov Date: Sat, 21 Sep 2024 12:42:07 +0300 Subject: [PATCH] last preparation --- ijl.config.js | 26 ------------------- src/components/css/index.css | 1 - src/components/index.css | 1 + .../reg/css/{index.css => input.css} | 0 src/components/reg/index.css | 1 + src/index.css | 26 ++++++++++++++++--- src/{header => outer}/Header.jsx | 0 .../css/index.css => outer/css/header.css} | 0 src/outer/index.css | 1 + src/pages/Home.jsx | 2 +- src/pages/Init.jsx | 4 ++- src/pages/css/index.css | 5 ---- src/pages/css/init.css | 1 + src/pages/index.css | 1 + 14 files changed, 32 insertions(+), 37 deletions(-) delete mode 100644 ijl.config.js delete mode 100644 src/components/css/index.css create mode 100644 src/components/index.css rename src/components/reg/css/{index.css => input.css} (100%) create mode 100644 src/components/reg/index.css rename src/{header => outer}/Header.jsx (100%) rename src/{header/css/index.css => outer/css/header.css} (100%) create mode 100644 src/outer/index.css delete mode 100644 src/pages/css/index.css create mode 100644 src/pages/index.css diff --git a/ijl.config.js b/ijl.config.js deleted file mode 100644 index 47eff81..0000000 --- a/ijl.config.js +++ /dev/null @@ -1,26 +0,0 @@ -const pkg = require('./package') - -module.exports = { - apiPath: 'stubs/api', - webpackConfig: { - output: { - publicPath: `/static/${pkg.name}/${process.env.VERSION || pkg.version}/` - } - }, - navigations: { - 'enterfront.main': '/enterfront', - 'enterfront.home': '/enterfront/home', - 'enterfront.auth': '/enterfront/auth', - 'enterfront.reg': '/enterfront/reg', - 'enterfront.account': '/enterfront/account', - 'enterfront.chat': '/enterfront/chat', - }, - features: { - 'undefined': { - // add your features here in the format [featureName]: { value: string } - }, - }, - config: { - 'undefined.api': '/api', - } -} diff --git a/src/components/css/index.css b/src/components/css/index.css deleted file mode 100644 index f6a2fca..0000000 --- a/src/components/css/index.css +++ /dev/null @@ -1 +0,0 @@ -@import url("../reg/css/index.css"); \ No newline at end of file diff --git a/src/components/index.css b/src/components/index.css new file mode 100644 index 0000000..1e185b8 --- /dev/null +++ b/src/components/index.css @@ -0,0 +1 @@ +@import url("reg/index.css"); \ No newline at end of file diff --git a/src/components/reg/css/index.css b/src/components/reg/css/input.css similarity index 100% rename from src/components/reg/css/index.css rename to src/components/reg/css/input.css diff --git a/src/components/reg/index.css b/src/components/reg/index.css new file mode 100644 index 0000000..a02dd8d --- /dev/null +++ b/src/components/reg/index.css @@ -0,0 +1 @@ +@import url("./css/input.css"); \ No newline at end of file diff --git a/src/index.css b/src/index.css index 2b7a2e5..82c3921 100644 --- a/src/index.css +++ b/src/index.css @@ -1,6 +1,9 @@ -@import url("./pages/css/index.css"); -@import url("./header/css/index.css"); -@import url("./components/css/index.css"); +@import url('https://fonts.googleapis.com/css2?family=MonteCarlo&family=Montserrat:ital,wght@0,100..900;1,100..900&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Metal+Mania&display=swap'); + +@import url("pages/index.css"); +@import url("outer/index.css"); +@import url("components/index.css"); body { @@ -12,3 +15,20 @@ body { -moz-osx-font-smoothing: grayscale; } +code { + font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', + monospace; +} + +* { + font-size: 1.2vw; + font-family: "Montserrat", 'sans-serif'; + color: black; +} + +.metal-mania-regular { + font-family: "Metal Mania", system-ui; + font-weight: 400; + font-style: normal; +} + diff --git a/src/header/Header.jsx b/src/outer/Header.jsx similarity index 100% rename from src/header/Header.jsx rename to src/outer/Header.jsx diff --git a/src/header/css/index.css b/src/outer/css/header.css similarity index 100% rename from src/header/css/index.css rename to src/outer/css/header.css diff --git a/src/outer/index.css b/src/outer/index.css new file mode 100644 index 0000000..cff8028 --- /dev/null +++ b/src/outer/index.css @@ -0,0 +1 @@ +@import url("./css/header.css"); \ No newline at end of file diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx index 4500864..75618f0 100644 --- a/src/pages/Home.jsx +++ b/src/pages/Home.jsx @@ -2,7 +2,7 @@ import React from "react"; const Home = () => { return ( -

Home

+

Home

) } diff --git a/src/pages/Init.jsx b/src/pages/Init.jsx index f01a620..ffcfe7c 100644 --- a/src/pages/Init.jsx +++ b/src/pages/Init.jsx @@ -2,7 +2,9 @@ import React from "react"; const Init = () => { return ( -

Init page

+
+

Hello!

+
) } diff --git a/src/pages/css/index.css b/src/pages/css/index.css deleted file mode 100644 index e3a74da..0000000 --- a/src/pages/css/index.css +++ /dev/null @@ -1,5 +0,0 @@ -@import url("./init.css"); - -.TestClass { - color: red; -} \ No newline at end of file diff --git a/src/pages/css/init.css b/src/pages/css/init.css index e607486..839d281 100644 --- a/src/pages/css/init.css +++ b/src/pages/css/init.css @@ -1,3 +1,4 @@ .TestInit { color: blue; + font-size: 40px; } \ No newline at end of file diff --git a/src/pages/index.css b/src/pages/index.css new file mode 100644 index 0000000..ca21b86 --- /dev/null +++ b/src/pages/index.css @@ -0,0 +1 @@ +@import url("css/init.css");