Merge pull request #4 from ConductionNL/feature/HP-199/leiden-theme

lint-fix
ConductionNL · Feb 28, 2024 · 380b2c9 · 380b2c9
2 parents 140acd4 + 6bd76e1
commit 380b2c9
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 24 deletions.
diff --git a/.stylelintrc.json b/.stylelintrc.json
@@ -4,9 +4,9 @@
   "rules": {
     "order/order": ["custom-properties", "declarations"],
     "order/properties-alphabetical-order": true,
-    "custom-property-pattern": "^_?(amsterdam|denhaag|example|todo|utrecht)-?[a-z0-9-]+$",
-    "selector-class-pattern": "^(amsterdam|denhaag|example|todo|utrecht)-[a-z0-9_-]+$",
-    "keyframes-name-pattern": "^(amsterdam|denhaag|example|todo|utrecht)-[a-z0-9-]+$",
+    "custom-property-pattern": "^_?(amsterdam|denhaag|example|todo|utrecht|conduction|leiden)-?[a-z0-9-]+$",
+    "selector-class-pattern": "^(amsterdam|denhaag|example|todo|utrecht|conduction|leiden)-[a-z0-9_-]+$",
+    "keyframes-name-pattern": "^(amsterdam|denhaag|example|todo|utrecht|conduction|leiden)-[a-z0-9-]+$",
     "at-rule-no-unknown": null,
     "block-no-empty": [true],
     "color-no-invalid-hex": [true],

diff --git a/pages/_document.tsx b/pages/_document.tsx
@@ -5,11 +5,7 @@ export default function Document() {
     <Html>
       <Head>
         <link rel="icon" href="/favicon.ico" />
-        <link
-          rel="icon"
-          type="svg"
-          href={process.env.NEXT_PUBLIC_FAV_ICON}
-        />
+        <link rel="icon" type="svg" href={process.env.NEXT_PUBLIC_FAV_ICON} />
       </Head>
       <body>
         <Main />

diff --git a/pages/email-reservation-success.tsx b/pages/email-reservation-success.tsx
@@ -8,12 +8,12 @@ import {
   Document,
   Email,
   Heading1,
+  Logo,
   Page,
   PageContent,
   PageContentMain,
   Paragraph,
   URLValue,
-  Logo,
 } from "../src/components";
 
 export const getServerSideProps = async ({ locale }: { locale: string }) => ({

diff --git a/pages/voorgenomen-huwelijk/partner/aanvrager-email.tsx b/pages/voorgenomen-huwelijk/partner/aanvrager-email.tsx
@@ -9,12 +9,12 @@ import {
   Document,
   Email,
   Heading1,
+  Logo,
   Page,
   PageContent,
   PageContentMain,
   Paragraph,
   URLValue,
-  Logo,
 } from "../../../src/components";
 import { exampleState } from "../../../src/data/huwelijksplanner-state";
 

diff --git a/pages/voorgenomen-huwelijk/partner/invitation-email-partner.tsx b/pages/voorgenomen-huwelijk/partner/invitation-email-partner.tsx
@@ -23,7 +23,6 @@
 
 import { UtrechtDigidButton, UtrechtIconArrow } from "@utrecht/web-component-library-react";
 import Head from "next/head";
-import Link from "next/link";
 import { useTranslation } from "next-i18next";
 import { serverSideTranslations } from "next-i18next/serverSideTranslations";
 import {
@@ -33,12 +32,12 @@ import {
   Document,
   Email,
   Heading1,
+  Logo,
   Page,
   PageContent,
   PageContentMain,
   Paragraph,
   URLValue,
-  Logo,
 } from "../../../src/components";
 import { exampleState } from "../../../src/data/huwelijksplanner-state";
 

diff --git a/src/components/huwelijksplanner/PageFooterTemplate.tsx b/src/components/huwelijksplanner/PageFooterTemplate.tsx
@@ -17,7 +17,7 @@ export const PageFooterTemplate = () => {
 
         {data &&
           data?.content.map((item: any, idx: number) => (
-            <section>
+            <section key={idx}>
               <h3 className="utrecht-heading-3 utrecht-heading-3--distanced">{item.title}</h3>
               <p className="utrecht-paragraph utrecht-paragraph--distanced">
                 {item.title === "Telefoon" && (

diff --git a/src/components/logo.tsx b/src/components/logo.tsx
@@ -1,5 +1,5 @@
-import * as React from "react";
 import clsx from "clsx";
+import * as React from "react";
 
 interface LogoProps {
   variant?: "header" | "footer" | "navbar";

diff --git a/styles/_logo.scss b/styles/_logo.scss
@@ -1,25 +1,25 @@
 .utrecht-logo__container {
-  background-size: contain;
   background-position: center;
   background-repeat: no-repeat;
+  background-size: contain;
 }
 
 .utrecht-logo__container-header {
-  inline-size: var(--conduction-logo-header-inline-size);
-  block-size: var(--conduction-logo-header-block-size);
   background-image: var(--conduction-logo-header-background-image);
+  block-size: var(--conduction-logo-header-block-size);
+  inline-size: var(--conduction-logo-header-inline-size);
 }
 
 .utrecht-logo__container-footer {
-  inline-size: var(--conduction-logo-footer-inline-size);
-  block-size: var(--conduction-logo-footer-block-size);
   background-image: var(--conduction-logo-footer-background-image);
+  block-size: var(--conduction-logo-footer-block-size);
+  inline-size: var(--conduction-logo-footer-inline-size);
 }
 
 .utrecht-logo__container-navbar {
-  inline-size: var(--conduction-logo-navbar-inline-size);
-  block-size: var(--conduction-logo-navbar-block-size);
   background-image: var(--conduction-logo-navbar-background-image);
+  block-size: var(--conduction-logo-navbar-block-size);
+  inline-size: var(--conduction-logo-navbar-inline-size);
 }
 
 .utrecht-logo__container-clickable:hover {

diff --git a/styles/leiden-theme.css b/styles/leiden-theme.css
@@ -38,12 +38,9 @@
   --utrecht-skip-link-padding-inline-end: var(--utrecht-button-padding-inline-end);
   --utrecht-skip-link-padding-inline-start: var(--utrecht-button-padding-inline-start);
   --utrecht-spotlight-section-margin-block-start: var(--utrecht-space-block-md);
-  /* --utrecht-typography-sans-serif-font-family: "Lucida Grande", "Arial", sans-serif; */
   --utrecht-unordered-list-margin-block-start: var(--utrecht-space-block-md);
-
   --utrecht-page-content-padding-block-start: var(--leiden-size-lg);
   --utrecht-page-content-padding-block-end: var(--leiden-size-lg);
   --utrecht-paragraph-margin-block-start: var(--leiden-size-md) !important;
-
   --utrecht-icon-size: 48px;
 }