Merge branch 'master' into 'production'

Prod deploy: Remove NRC logo

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!77

src/components/Hero/Hero.tsx

@@ -6,33 +6,10 @@ import breakpoints from "@theme/breakpoints";
 const Container = styled.div`
   display: flex;
   flex-flow: row wrap;
-  justify-content: space-between;
   position: relative;
   padding: 0;
-  min-height: 75vh;
+  min-height: 55vh;
-
+  justify-content: space-between;
-  section {
-    padding: 2rem 6rem;
-
-    @media screen and (max-width: ${breakpoints.mobile}) {
-      padding: 1rem;
-    }
-  }
-
-  aside {
-    max-width: 50%;
-    padding: 3rem 6rem;
-    align-items: center;
-
-    @media screen and (max-width: ${breakpoints.mobile}) {
-      max-width: unset;
-      padding: 2rem 1rem;
-    }
-  }
-
-  & > div {
-    flex: 8;
-  }
 
   @media screen and (max-width: ${breakpoints.mobile}) {
     flex-direction: column;

src/components/Hero/HeroAside.tsx

@@ -1,7 +1,8 @@
 import React from "react";
 import styled from "styled-components";
-import colors from "@theme/colors";
 import { Link } from "@components/index";
+import colors from "@theme/colors";
+import breakpoints from "@theme/breakpoints";
 
 interface HeroAsideItemProps {
   header: string;
@@ -11,7 +12,7 @@ interface HeroAsideItemProps {
 }
 
 const Article = styled.article`
-  margin-bottom: 1rem;
+  margin-top: 1rem;
 `;
 
 export const HeroAsideItem: React.FC<HeroAsideItemProps> = ({
@@ -40,10 +41,17 @@ interface HeroAsideProps {
 const Aside = styled.aside<{ colors: string }>`
   ${(p) => p.colors}
 
-  flex: 4;
   display: flex;
   flex-direction: column;
   justify-content: center;
+  padding: 6rem;
+  align-items: center;
+  width: 45%;
+
+  @media screen and (max-width: ${breakpoints.mobile}) {
+    width: unset;
+    padding: 3rem 2rem;
+  }
 
   & > div {
     h2 {

src/components/Hero/HeroPrimaryButtons.tsx

@@ -1,12 +1,16 @@
+import React from "react";
 import styled from "styled-components";
 import colors from "@theme/colors";
 
-const Buttons = styled.div<{ row?: boolean }>`
+interface HeroPrimaryButtonsProps {
-  min-width: 20%;
+  row?: boolean;
-  max-width: fit-content;
+}
-  margin: auto;
+
+const Buttons = styled.div<HeroPrimaryButtonsProps>`
+  ${({ row }) => (row ? "width: 100%;" : "")}
+
   display: flex;
-  flex-flow: ${(p) => (p.row ? "row" : "column")} wrap;
+  flex-flow: ${({ row }) => (row ? "row" : "column")} wrap;
 
   a {
     display: contents;
@@ -14,10 +18,15 @@ const Buttons = styled.div<{ row?: boolean }>`
   }
 
   button {
+    margin: 0.5rem;
+
+    /* stylelint-disable function-name-case */
+    flex: 1 0 calc(100% / ${({ children }) => React.Children.count(children)} - 2 * 0.5rem);
+
+    /* stylelint-enable function-name-case */
     color: ${colors.blue1};
     background-color: transparent;
     padding: 0.8rem 2rem;
-    margin: 0.5rem;
     font-size: 0.8rem;
     font-weight: 800;
     letter-spacing: 0.1em;

src/components/Hero/HeroPrimarySection.tsx

@@ -9,12 +9,19 @@ interface HeroPrimarySectionProps {
 }
 
 const Section = styled.section`
-  max-width: 50%;
+  width: 55%;
-  margin: 10vh auto 0;
   text-align: center;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 8rem 8rem 2rem;
 
   @media screen and (max-width: ${breakpoints.mobile}) {
-    max-width: unset;
+    padding: 3rem 2rem;
+  }
+
+  @media screen and (max-width: ${breakpoints.mobile}) {
+    width: unset;
   }
 
   p {

src/components/Hero/HeroSecondarySection.tsx

@@ -36,6 +36,7 @@ export const HeroSecondarySectionItem: React.FC<HeroSecondarySectionItemProps> =
 const Section = styled.section`
   background-color: ${colors.green1};
   color: ${colors.darkBlue};
+  padding: 3rem;
 
   h1 {
     padding: 1rem 0;

src/pages/_app.tsx

@@ -22,8 +22,8 @@ const GlobalCommonStyles = createGlobalStyle`
 html {
   font-family: ${fontFamily};
 
-  /* 12px */
+  /* 10px */
-  font-size: ${fontSize * 0.75}pt;
+  font-size: ${fontSize * (2 / 3)}pt;
   line-height: ${lineHeight};
 
   @media screen and (min-width: ${breakpoints.medium}) {

src/pages/_document.tsx

@@ -36,7 +36,6 @@ export default class MyDocument extends Document<{ styleTags: unknown }> {
         <Head>
           <HTMLLogo />
           <link href="https://fonts.googleapis.com/css?family=Montserrat:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,800,900&display=swap" rel="stylesheet" />
-          <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.0/normalize.min.css" />
           <Favicons />
         </Head>
         <body>

src/views/FrontPage/FrontPageHero.tsx

@@ -15,12 +15,12 @@ const FrontPageHero: React.FC = () => (
       <HeroPrimaryButtons>
         <Link to="/kilta">
           <button type="button" onClick={noop}>
-            <span>Tietoa killasta&nbsp;›</span>
+            <span>Tietoa&nbsp;killasta&nbsp;›</span>
           </button>
         </Link>
         <Link to="/kilta/toiminta">
           <button type="button" onClick={noop}>
-            <span>Vastapainoa opiskelulle&nbsp;›</span>
+            <span>Vastapainoa&nbsp;opiskelulle&nbsp;›</span>
           </button>
         </Link>
       </HeroPrimaryButtons>

src/views/FrontPage/FrontPageView.tsx

@@ -159,9 +159,6 @@ const FrontPageView: React.FC<FrontPageViewProps> = ({ events, feed }) => (
             <Link to="https://www.fingrid.fi/">
               <Image src={Fingrid} alt="Fingrid" layout="responsive" width={200} height={100} objectFit="contain" />
             </Link>
-            <Link to="https://www.nrcgroup.fi/">
-              <Image src={NRCGroup} alt="NRCGroup" layout="responsive" width={200} height={100} objectFit="contain" />
-            </Link>
             <Link to="https://www.okmetic.com/fi/">
               <Image src={Okmetic} alt="Okmetic" layout="responsive" width={200} height={100} objectFit="contain" />
             </Link>

src/views/InEnglishPage/InEnglishPageHero.tsx

@@ -15,12 +15,12 @@ const InEnglishPageHero: React.FC = () => (
       <HeroPrimaryButtons>
         <Link to="/in_english#guild">
           <button type="button" onClick={noop}>
-            <span>About guild&nbsp;›</span>
+            <span>About&nbsp;guild&nbsp;›</span>
           </button>
         </Link>
         <Link to="/in_english#activities">
           <button type="button" onClick={noop}>
-            <span>Counterbalance to your studies&nbsp;›</span>
+            <span>Counterbalance&nbsp;to&nbsp;your&nbsp;studies&nbsp;›</span>
           </button>
         </Link>
       </HeroPrimaryButtons>