Merge branch 'development' into SFR-1720/cleanup-eslint-plugins

NYPL · Nov 18, 2024 · d29153a · d29153a
2 parents b61216f + dcd142f
commit d29153a
Show file tree

Hide file tree

Showing 80 changed files with 8 additions and 460 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## [Prerelease]
 
 - Enable playwright tests GH action
+- Remove unused scss and img files
 - Remove duplicate eslint packages, update eslint config, and resolve linting errors
 
 ## [0.18.8]

diff --git a/src/components/Landing/Landing.tsx b/src/components/Landing/Landing.tsx
@@ -22,6 +22,7 @@ const LandingPage: React.FC<{ collections?: Opds2Feed }> = ({
       sx={{
         a: {
           color: "ui.link.primary",
+          display: "inline",
         },
       }}
     >

diff --git a/src/components/ReaderLayout/ReaderLayout.tsx b/src/components/ReaderLayout/ReaderLayout.tsx
@@ -149,7 +149,7 @@ const ReaderLayout: React.FC<{
   const BackButton = () => {
     return (
       //Apends design system classname to use Design System Link.
-      <Link to={props.backUrl} className="nypl-ds logo-link">
+      <Link to={props.backUrl} type="action" className="nypl-ds logo-link">
         <Icon decorative className="logo-link__icon">
           <ReaderLogoSvg />
         </Icon>

diff --git a/src/components/Svgs/ReaderLogoSvg.tsx b/src/components/Svgs/ReaderLogoSvg.tsx
@@ -1,6 +1,7 @@
+import { PropsOf } from "@chakra-ui/react";
 import React from "react";
 
-const ReaderLogoSvg: React.FC = () => (
+const ReaderLogoSvg: React.FC<PropsOf<"svg">> = () => (
   <svg
     width="48"
     height="49"

diff --git a/styles/components/Citations.scss b/styles/components/Citations.scss
diff --git a/styles/components/Feedback.scss b/styles/components/Feedback.scss
diff --git a/styles/components/ReaderLayout.scss b/styles/components/ReaderLayout.scss
diff --git a/styles/components/RequestDigitization.scss b/styles/components/RequestDigitization.scss
diff --git a/styles/dividers.scss b/styles/dividers.scss
diff --git a/styles/img/alerts/error.svg b/styles/img/alerts/error.svg
diff --git a/styles/img/alerts/info.svg b/styles/img/alerts/info.svg
diff --git a/styles/img/alerts/success.svg b/styles/img/alerts/success.svg
diff --git a/styles/img/alerts/warning.svg b/styles/img/alerts/warning.svg
diff --git a/styles/img/angle-arrow-down-hover.svg b/styles/img/angle-arrow-down-hover.svg
diff --git a/styles/img/angle-arrow-down-primary-hover.svg b/styles/img/angle-arrow-down-primary-hover.svg
diff --git a/styles/img/angle-arrow-down-primary.svg b/styles/img/angle-arrow-down-primary.svg
diff --git a/styles/img/angle-arrow-down-white.svg b/styles/img/angle-arrow-down-white.svg
diff --git a/styles/img/angle-arrow-down.svg b/styles/img/angle-arrow-down.svg
diff --git a/styles/img/angle-arrow-up-primary-hover.svg b/styles/img/angle-arrow-up-primary-hover.svg
diff --git a/styles/img/angle-arrow-up-primary.svg b/styles/img/angle-arrow-up-primary.svg
diff --git a/styles/img/angle-arrow-up-white.svg b/styles/img/angle-arrow-up-white.svg
diff --git a/styles/img/arrow-both.svg b/styles/img/arrow-both.svg
diff --git a/styles/img/arrow-down.svg b/styles/img/arrow-down.svg
diff --git a/styles/img/arrow-right.svg b/styles/img/arrow-right.svg
diff --git a/styles/img/circle-124.png b/styles/img/circle-124.png
diff --git a/styles/img/close-blue-30-alt.svg b/styles/img/close-blue-30-alt.svg
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ const LandingPage: React.FC<{ collections?: Opds2Feed }> = ({ @@
           sx={{
             a: {
               color: "ui.link.primary",
+              display: "inline",
             },
           }}
         >
@@ Expand Down @@