diff --git a/assets/style/components/heading.css b/assets/style/components/heading.css index db0195c..c29cb0d 100644 --- a/assets/style/components/heading.css +++ b/assets/style/components/heading.css @@ -1,15 +1,25 @@ .heading { padding: 4rem 1.2rem 2rem 1.2rem; + h1, + h2, + h3 { + font-weight: 700; + margin: 1.25rem 0; + } + h2 { font-size: 2.5rem; - font-weight: 700; line-height: 3.25rem; - margin: 2rem 0; + } + + h3 { + font-size: 2rem; + line-height: 2.75rem; } p { - font-size: 1.25rem; + font-size: 1.35rem; font-weight: 300; line-height: 1.75rem; margin: 0 0 0 .1rem; diff --git a/assets/style/pages/about/heading.css b/assets/style/pages/about/heading.css deleted file mode 100644 index 0fbb011..0000000 --- a/assets/style/pages/about/heading.css +++ /dev/null @@ -1,7 +0,0 @@ -.about .heading { - padding: 4rem 1.15rem; - - p { - margin: 0 14rem 0 0.05rem; - } -} \ No newline at end of file diff --git a/assets/style/pages/resources/partners.css b/assets/style/pages/about/partners.css similarity index 97% rename from assets/style/pages/resources/partners.css rename to assets/style/pages/about/partners.css index 72a2f7b..973197c 100644 --- a/assets/style/pages/resources/partners.css +++ b/assets/style/pages/about/partners.css @@ -1,4 +1,4 @@ -.partners { +.about .partners { .categories { padding: 1rem; @@ -67,7 +67,7 @@ } @media only screen and (--viewport-4) { - .partners { + .about .partners { .categories { padding: 1rem 2rem 2rem 2.1rem; } diff --git a/assets/style/pages/about/values.css b/assets/style/pages/about/values.css deleted file mode 100644 index 44f4ec2..0000000 --- a/assets/style/pages/about/values.css +++ /dev/null @@ -1,30 +0,0 @@ -.about .values { - display: grid; - grid-template-columns: 1fr 1fr; - grid-gap: 0 4rem; - padding: 4rem 1.2rem 6rem 1.2rem; - margin: 0 auto; - - h2 { - grid-column: 1/3; - font-size: 2rem; - font-weight: 600; - margin: .5rem 0; - } - - .value { - h3 { - font-size: 1.5rem; - font-weight: 400; - margin: 2rem 0 .5rem 0; - } - - p { - font-size: 1.15rem; - font-weight: 300; - line-height: 1.85rem; - padding: .5rem 0; - margin: 0; - } - } -} \ No newline at end of file diff --git a/assets/style/pages/article/cards.css b/assets/style/pages/article/cards.css index 328cfe4..4417e54 100644 --- a/assets/style/pages/article/cards.css +++ b/assets/style/pages/article/cards.css @@ -80,8 +80,14 @@ a { display: block; - .meta .date { - display: none; + .meta { + .desc { + margin: .5rem 0; + } + + .date { + display: none; + } } } } diff --git a/assets/style/pages/index/journal.css b/assets/style/pages/index/notified.css similarity index 96% rename from assets/style/pages/index/journal.css rename to assets/style/pages/index/notified.css index 2b7ac2b..b7fdda5 100644 --- a/assets/style/pages/index/journal.css +++ b/assets/style/pages/index/notified.css @@ -1,5 +1,5 @@ .index { - .journal { + .notified { /* background-image: linear-gradient(0deg, transparent 24%, rgba(0, 0, 0, .03) 25%, rgba(0, 0, 0, .03) 26%, transparent 27%, transparent 74%, rgba(0, 0, 0, .03) 75%, rgba(0, 0, 0, .03) 76%, transparent 77%, transparent), linear-gradient(90deg, transparent 24%, rgba(0, 0, 0, .03) 25%, rgba(0, 0, 0, .03) 26%, transparent 27%, transparent 74%, rgba(0, 0, 0, .03) 75%, rgba(0, 0, 0, .03) 76%, transparent 77%, transparent); */ /* background-size: 3.35rem 3.35rem; */ padding: 7rem 0 4rem 0; @@ -34,6 +34,7 @@ width: 100%; .scroll { + display: none; position: absolute; right: calc((100% - 48rem) / 2); top: -1.5rem; @@ -180,19 +181,19 @@ } @media only screen and (--viewport-13) { - .index .journal .cards-container .cards .card:last-of-type { + .index .notified .cards-container .cards .card:last-of-type { margin: 2rem 20vw 2rem 0; } } @media only screen and (--viewport-10) { - .index .journal .cards-container .cards .card:last-of-type { + .index .notified .cards-container .cards .card:last-of-type { margin: 2rem 12vw 2rem 0; } } @media only screen and (--viewport-4) { - .index .journal { + .index .notified { padding: 4rem 2.25rem; .msg { @@ -235,7 +236,7 @@ } @media only screen and (--viewport-3) { - .index .journal { + .index .notified { padding: 3rem 1.5rem; } } \ No newline at end of file diff --git a/assets/style/style.css b/assets/style/style.css index 2715682..b7649b6 100644 --- a/assets/style/style.css +++ b/assets/style/style.css @@ -19,7 +19,7 @@ @import 'pages/index/hero'; @import 'pages/index/stats'; @import 'pages/index/principles'; -@import 'pages/index/journal'; +@import 'pages/index/notified'; /* Projects */ @import 'pages/projects/cards'; @@ -29,11 +29,9 @@ /* Resources */ @import 'pages/resources/index'; -@import 'pages/resources/partners'; /* About */ -@import 'pages/about/heading'; -@import 'pages/about/values'; +@import 'pages/about/partners'; /* Article */ @import 'pages/article/cards'; diff --git a/components/partners/Card.vue b/components/about/Card.vue similarity index 100% rename from components/partners/Card.vue rename to components/about/Card.vue diff --git a/components/about/Hero.vue b/components/about/Hero.vue new file mode 100644 index 0000000..7426c96 --- /dev/null +++ b/components/about/Hero.vue @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/pages/partners.vue b/components/about/Partners.vue similarity index 54% rename from pages/partners.vue rename to components/about/Partners.vue index eeeba8d..c86130e 100644 --- a/pages/partners.vue +++ b/components/about/Partners.vue @@ -1,19 +1,8 @@