Merge pull request #66 from brick-a-brack/dev

Fix production build CSS issue
brick-a-brack · Apr 25, 2024 · 34abe80 · 34abe80
2 parents 49f341b + b114d13
commit 34abe80
Show file tree

Hide file tree

Showing 12 changed files with 94 additions and 94 deletions.
diff --git a/src/renderer/components/Container/index.jsx b/src/renderer/components/Container/index.jsx
@@ -3,7 +3,6 @@ import { withTranslation } from 'react-i18next';
 import { TooltipProvider } from 'react-tooltip';
 
 import 'react-tooltip/dist/react-tooltip.css';
-import './vars.module.css';
 import * as style from './style.module.css';
 
 const Container = ({ children, t }) => {

diff --git a/src/renderer/components/Container/style.module.css b/src/renderer/components/Container/style.module.css
@@ -1,97 +1,4 @@
-/* cyrillic-ext */
-@font-face {
-  font-family: 'Open Sans';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Open Sans Regular'), local('OpenSans-Regular'), url('./fonts/mem8YaGs126MiZpBA-UFWJ0bbck.woff2') format('woff2');
-  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
-}
-
-/* cyrillic */
-@font-face {
-  font-family: 'Open Sans';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Open Sans Regular'), local('OpenSans-Regular'), url('./fonts/mem8YaGs126MiZpBA-UFUZ0bbck.woff2') format('woff2');
-  unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-
-/* greek-ext */
-@font-face {
-  font-family: 'Open Sans';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Open Sans Regular'), local('OpenSans-Regular'), url('./fonts/mem8YaGs126MiZpBA-UFWZ0bbck.woff2') format('woff2');
-  unicode-range: U+1F00-1FFF;
-}
-
-/* greek */
-@font-face {
-  font-family: 'Open Sans';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Open Sans Regular'), local('OpenSans-Regular'), url('./fonts/mem8YaGs126MiZpBA-UFVp0bbck.woff2') format('woff2');
-  unicode-range: U+0370-03FF;
-}
-
-/* vietnamese */
-@font-face {
-  font-family: 'Open Sans';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Open Sans Regular'), local('OpenSans-Regular'), url('./fonts/mem8YaGs126MiZpBA-UFWp0bbck.woff2') format('woff2');
-  unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB;
-}
-
-/* latin-ext */
-@font-face {
-  font-family: 'Open Sans';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Open Sans Regular'), local('OpenSans-Regular'), url('./fonts/mem8YaGs126MiZpBA-UFW50bbck.woff2') format('woff2');
-  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-/* latin */
-@font-face {
-  font-family: 'Open Sans';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Open Sans Regular'), local('OpenSans-Regular'), url('./fonts/mem8YaGs126MiZpBA-UFVZ0b.woff2') format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-html,
-body {
-  background: #2f3136;
-  margin: 0;
-}
-
-* {
-  -webkit-focus-ring-color: rgb(255 255 255 / 0%) !important;
-  font-family: var(--font), -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
-  outline: none !important;
-  -webkit-tap-highlight-color: rgb(255 255 255 / 0%) !important;
-}
-
 .container {
   height: 100vh;
   width: 100%;
-}
-
-body::-webkit-scrollbar {
-  width: 15px;
-}
-
-body::-webkit-scrollbar-thumb {
-  background-clip: padding-box;
-  background-color: var(--color-primary);
-  border: 3px solid transparent;
-  border-radius: 8px;
-  cursor: pointer;
-  min-height: 50px;
-}
-
-body::-webkit-scrollbar-track {
-  background-color: rgb(0 0 0 / 0%);
 }
diff --git a/src/renderer/index.html b/src/renderer/index.html
@@ -16,6 +16,8 @@
     <link rel="apple-touch-icon" href="/icon.png" />
     <meta name="google" content="notranslate" />
     <title>Eagle Animation by Brick à Brack (Brickfilms.com)</title>
+    <link href="./styles/global.module.css" rel="stylesheet" type="text/css" />
+    <link href="./styles/vars.module.css" rel="stylesheet" type="text/css" />
   </head>
 
   <body>

diff --git a/...r/fonts/mem8YaGs126MiZpBA-UFUZ0bbck.woff2 → ...s/fonts/mem8YaGs126MiZpBA-UFUZ0bbck.woff2 b/...r/fonts/mem8YaGs126MiZpBA-UFUZ0bbck.woff2 → ...s/fonts/mem8YaGs126MiZpBA-UFUZ0bbck.woff2
diff --git a/...iner/fonts/mem8YaGs126MiZpBA-UFVZ0b.woff2 → ...yles/fonts/mem8YaGs126MiZpBA-UFVZ0b.woff2 b/...iner/fonts/mem8YaGs126MiZpBA-UFVZ0b.woff2 → ...yles/fonts/mem8YaGs126MiZpBA-UFVZ0b.woff2
diff --git a/...r/fonts/mem8YaGs126MiZpBA-UFVp0bbck.woff2 → ...s/fonts/mem8YaGs126MiZpBA-UFVp0bbck.woff2 b/...r/fonts/mem8YaGs126MiZpBA-UFVp0bbck.woff2 → ...s/fonts/mem8YaGs126MiZpBA-UFVp0bbck.woff2
diff --git a/...r/fonts/mem8YaGs126MiZpBA-UFW50bbck.woff2 → ...s/fonts/mem8YaGs126MiZpBA-UFW50bbck.woff2 b/...r/fonts/mem8YaGs126MiZpBA-UFW50bbck.woff2 → ...s/fonts/mem8YaGs126MiZpBA-UFW50bbck.woff2
diff --git a/...r/fonts/mem8YaGs126MiZpBA-UFWJ0bbck.woff2 → ...s/fonts/mem8YaGs126MiZpBA-UFWJ0bbck.woff2 b/...r/fonts/mem8YaGs126MiZpBA-UFWJ0bbck.woff2 → ...s/fonts/mem8YaGs126MiZpBA-UFWJ0bbck.woff2
diff --git a/...r/fonts/mem8YaGs126MiZpBA-UFWZ0bbck.woff2 → ...s/fonts/mem8YaGs126MiZpBA-UFWZ0bbck.woff2 b/...r/fonts/mem8YaGs126MiZpBA-UFWZ0bbck.woff2 → ...s/fonts/mem8YaGs126MiZpBA-UFWZ0bbck.woff2
diff --git a/...r/fonts/mem8YaGs126MiZpBA-UFWp0bbck.woff2 → ...s/fonts/mem8YaGs126MiZpBA-UFWp0bbck.woff2 b/...r/fonts/mem8YaGs126MiZpBA-UFWp0bbck.woff2 → ...s/fonts/mem8YaGs126MiZpBA-UFWp0bbck.woff2
diff --git a/src/renderer/styles/global.module.css b/src/renderer/styles/global.module.css
@@ -0,0 +1,92 @@
+/* cyrillic-ext */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Open Sans Regular'), local('OpenSans-Regular'), url('./fonts/mem8YaGs126MiZpBA-UFWJ0bbck.woff2') format('woff2');
+  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* cyrillic */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Open Sans Regular'), local('OpenSans-Regular'), url('./fonts/mem8YaGs126MiZpBA-UFUZ0bbck.woff2') format('woff2');
+  unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* greek-ext */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Open Sans Regular'), local('OpenSans-Regular'), url('./fonts/mem8YaGs126MiZpBA-UFWZ0bbck.woff2') format('woff2');
+  unicode-range: U+1F00-1FFF;
+}
+
+/* greek */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Open Sans Regular'), local('OpenSans-Regular'), url('./fonts/mem8YaGs126MiZpBA-UFVp0bbck.woff2') format('woff2');
+  unicode-range: U+0370-03FF;
+}
+
+/* vietnamese */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Open Sans Regular'), local('OpenSans-Regular'), url('./fonts/mem8YaGs126MiZpBA-UFWp0bbck.woff2') format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB;
+}
+
+/* latin-ext */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Open Sans Regular'), local('OpenSans-Regular'), url('./fonts/mem8YaGs126MiZpBA-UFW50bbck.woff2') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* latin */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Open Sans Regular'), local('OpenSans-Regular'), url('./fonts/mem8YaGs126MiZpBA-UFVZ0b.woff2') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+html,
+body {
+  background: #2f3136;
+  margin: 0;
+}
+
+* {
+  -webkit-focus-ring-color: rgb(255 255 255 / 0%) !important;
+  font-family: var(--font), -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+  outline: none !important;
+  -webkit-tap-highlight-color: rgb(255 255 255 / 0%) !important;
+}
+
+body::-webkit-scrollbar {
+  width: 15px;
+}
+
+body::-webkit-scrollbar-thumb {
+  background-clip: padding-box;
+  background-color: var(--color-primary);
+  border: 3px solid transparent;
+  border-radius: 8px;
+  cursor: pointer;
+  min-height: 50px;
+}
+
+body::-webkit-scrollbar-track {
+  background-color: rgb(0 0 0 / 0%);
+}
diff --git a/...erer/components/Container/vars.module.css → src/renderer/styles/vars.module.css b/...erer/components/Container/vars.module.css → src/renderer/styles/vars.module.css