diff --git a/pages/_app.tsx b/pages/_app.tsx
index 5e4a1014..ec8dd195 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -1,3 +1,4 @@
+import 'src/style.css'
import App from 'next/app'
export default class MyApp extends App {
@@ -5,36 +6,7 @@ export default class MyApp extends App {
const { Component, pageProps } = this.props
return (
- <>
-
-
-
- >
+
)
}
}
diff --git a/src/style/variables.scss b/src/style.css
similarity index 75%
rename from src/style/variables.scss
rename to src/style.css
index 21c25a6a..aa0b36a9 100644
--- a/src/style/variables.scss
+++ b/src/style.css
@@ -1,8 +1,7 @@
:root {
- //SHADOW
--white-shadow: 0 0.1em 0.3em rgba(0, 0, 0, 0.2);
- //FONTS
+ /* FONTS */
--title-font: Shadow, 'PT Serif', Georgia, serif;
--text-font: 'PT Sans', Arial, sans-serif;
@@ -12,15 +11,12 @@
--big-font-size: 1.5rem;
--biggest-font-size: 2.25rem;
- //MENU
+ /* MENU */
--menu-thickness: 2.5em;
--menu-colored-mark-thickness: 4px;
--menu-inactive-item-color: hsl(0, 0%, 50%);
- //ANIMATION
- $short-duration: 0.3s;
-
- //SIZE
+ /* SIZE */
--mobile-width: 31.25em;
--desktop-width: 59.99999em;
@@ -37,7 +33,7 @@
--text-color: #303030;
--text-color-second: #ccc;
- //FONTS
+ /* FONTS */
--font-size-default: 14pt;
--font-size-second: 0.9rem;
@@ -45,7 +41,7 @@
--font-size-h2: 2.5rem;
--font-size-h3: 1.5rem;
- //COLOR
+ /* COLOR */
--dark-color: hsl(0, 0%, 20%);
--darker-color: hsl(0, 0%, 10%);
--light-color: hsl(0, 0%, 80%);
@@ -65,13 +61,35 @@
--schedule-row-color: hsl(210, 55%, 90%);
- //MARGINS
+ /* MARGINS */
--small-margin: 0.2em;
--half-margin: 0.5em;
--single-margin: 1em;
--double-margin: 2em;
--post-margin: 5em;
- //OTHER
+ /* OTHER */
--block-border-radius: 3px;
}
+
+
+@media (max-width: 31.25em) {
+ :root {
+ --smaller-font-size: 0.9rem;
+ --normal-font-size: 1rem;
+ --bigger-font-size: 1.1rem;
+ --big-font-size: 1.3rem;
+ --biggest-font-size: 2rem;
+
+ --font-size-h1: 1.5rem;
+ --font-size-h2: 1.5rem;
+ --font-size-h3: 1.25rem;
+
+ --content-thin: 90%;
+ --content-wide: 90%;
+ }
+}
+
+.noscroll {
+ overflow: hidden;
+}
diff --git a/src/style/album.scss b/src/style/album.scss
index 93368807..b9880301 100644
--- a/src/style/album.scss
+++ b/src/style/album.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
.album-block {
//margin: 1em auto 2em;
diff --git a/src/style/components/ArticleTags.scss b/src/style/components/ArticleTags.scss
index cebdb74f..9bdd2b65 100644
--- a/src/style/components/ArticleTags.scss
+++ b/src/style/components/ArticleTags.scss
@@ -1,5 +1,3 @@
-@import "../variables";
-
.ArticleTags {
--article-card-width: 30%;
--article-card-margin: var(--single-margin) var(--half-margin);
diff --git a/src/style/components/page-collective.scss b/src/style/components/page-collective.scss
deleted file mode 100644
index dc9228fe..00000000
--- a/src/style/components/page-collective.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-.page-collective {
- &.ng-leave {
- animation: slideOutLeft var(--short-duration) both ease-in;
- }
-
- &.ng-enter {
- animation: slideInRight var(--short-duration) both ease-in;
- }
-}
-
-.page-collective {
- &__collective-image {
- //min-height: 40em;
- }
-}
-
-@media (max-width: var(--mobile-width)) {
- .page-collective {
- &__collective-image {
- display: none;
- }
- }
-}
\ No newline at end of file
diff --git a/src/style/components/page-schedule.scss b/src/style/components/page-schedule.scss
deleted file mode 100644
index bbde4944..00000000
--- a/src/style/components/page-schedule.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-.page-schedule {
- &.ng-leave {
- transform-origin: 0% 0%;
- animation: rotateFall var(--short-duration) both ease-in;
- }
-
- &.ng-enter {
- animation: scaleUp var(--short-duration) both ease-in;
- }
-}
\ No newline at end of file
diff --git a/src/style/components/parallax.scss b/src/style/components/parallax.scss
index 67826870..05bf781d 100644
--- a/src/style/components/parallax.scss
+++ b/src/style/components/parallax.scss
@@ -1,5 +1,3 @@
-@import "../variables";
-
.parallax {
min-width: 1280px;
width: 1280px;
diff --git a/src/style/components/timeline-record-instagram.scss b/src/style/components/timeline-record-instagram.scss
index 6e0954e5..51959a37 100644
--- a/src/style/components/timeline-record-instagram.scss
+++ b/src/style/components/timeline-record-instagram.scss
@@ -1,5 +1,3 @@
-@import "../variables";
-
$user-size: 40px;
$half-margin: $single-margin/2;
$image-border-radius: .35em;
diff --git a/src/style/footer.scss b/src/style/footer.scss
index a7567a24..156b9aaf 100644
--- a/src/style/footer.scss
+++ b/src/style/footer.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
footer {
padding: 0 var(--half-margin) var(--half-margin);
position: relative;
diff --git a/src/style/style.scss b/src/style/style.scss
index 313efee1..6923ea9d 100644
--- a/src/style/style.scss
+++ b/src/style/style.scss
@@ -15,9 +15,6 @@
@import "components/album";
@import "components/parallax";
-@import "components/page-schedule";
-@import "components/page-collective";
-
@import "components/ArticleTags";
@import "main";
diff --git a/src/style/vertical-image.scss b/src/style/vertical-image.scss
index 98c2f10b..d59b3a43 100644
--- a/src/style/vertical-image.scss
+++ b/src/style/vertical-image.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
.vertical-image {
position: relative;
width: 100%;