diff --git a/package.json b/package.json index 009fd6b..ac1b773 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "@adobe/react-spectrum": "^3.19.0", "@mdx-js/mdx": "^1.6.22", "@mdx-js/react": "^1.6.22", + "@spectrum-icons/workflow": "^4.0.0", "autoprefixer": "^10.2.6", "babel-eslint": "^10.1.0", "babel-plugin-preval": "^5.0.0", diff --git a/src/components/GalleryImage/GalleryImage.js b/src/components/GalleryImage/GalleryImage.js index 65eb972..79fc144 100644 --- a/src/components/GalleryImage/GalleryImage.js +++ b/src/components/GalleryImage/GalleryImage.js @@ -1,5 +1,17 @@ import React, { useState } from "react"; import { graphql, navigate, Link } from "gatsby"; +import { GatsbyImage, getImage } from "gatsby-plugin-image"; +import { Helmet } from "react-helmet"; +import classnames from "classnames"; + +import Calendar from "@spectrum-icons/workflow/Calendar"; +import Stopwatch from "@spectrum-icons/workflow/Stopwatch"; +import Exposure from "@spectrum-icons/workflow/Exposure"; +import Filmroll from "@spectrum-icons/workflow/Filmroll"; +import Camera from "@spectrum-icons/workflow/Camera"; +import Circle from "@spectrum-icons/workflow/Circle"; +import Location from "@spectrum-icons/workflow/Location"; + import { getAspectRatio, getMeta, @@ -9,9 +21,6 @@ import { getHelmetSafeBodyStyle, hasName, } from "../../utils"; -import { GatsbyImage, getImage } from "gatsby-plugin-image"; -import { Helmet } from "react-helmet"; -import classnames from "classnames"; import MetadataItem from "./MetadataItem"; const logKeyShortcut = (keyCode) => { @@ -197,33 +206,33 @@ const GalleryImage = ({ data, pageContext }) => {
} title="date taken" />
} title="shutter speed" /> {meta.FNumber && ( } title="aperture" /> )} - + } title="ISO" />
} title="location" /> {(meta.Make || meta.Model) && ( } title="camera" /> )} @@ -235,7 +244,7 @@ const GalleryImage = ({ data, pageContext }) => { ] .filter(Boolean) .join(" @")} - icon="ellipse" + icon={} title="lens" /> )} diff --git a/src/components/GalleryImage/MetadataItem.js b/src/components/GalleryImage/MetadataItem.js index c762bd7..89fe065 100644 --- a/src/components/GalleryImage/MetadataItem.js +++ b/src/components/GalleryImage/MetadataItem.js @@ -7,8 +7,8 @@ const MetadataItem = ({ icon, data, title }) => {title} {data}
- - + + {icon} ) : null; diff --git a/src/components/index/ActionButtons.js b/src/components/index/ActionButtons.js index b265e11..a94c003 100644 --- a/src/components/index/ActionButtons.js +++ b/src/components/index/ActionButtons.js @@ -2,19 +2,23 @@ import React from "react"; import classnames from "classnames"; import { Link } from "gatsby"; +import Image from "@spectrum-icons/workflow/Image"; +import Shuffle from "@spectrum-icons/workflow/Shuffle"; + const getButtonClasses = (isClient) => classnames( "z-20 rounded-md text-md inline-block px-2 py-1 mt-1 md:py-2 md:px-3 md:my-1 mr-2 text-md hover:underline text-black", - isClient - ? "cool-border-small hover:bg-vibrant" - : "text-gray-200" + isClient ? "cool-border-small hover:bg-vibrant" : "text-gray-200" ); const ActionButtons = ({ isClient, image, shuffleImage }) => (

Try my word game!

- + Buzzwords
@@ -22,13 +26,11 @@ const ActionButtons = ({ isClient, image, shuffleImage }) => ( - - - - + title="view image details" + to={`/photogallery/${image.base}/`} + > + + {props.postBodyComponents} - ); diff --git a/src/styles/global.css b/src/styles/global.css index 249e247..63d3c49 100644 --- a/src/styles/global.css +++ b/src/styles/global.css @@ -13,10 +13,6 @@ transition: color .2s, background-color .2s; } */ @layer utilities { - .icon-offset { - position: relative; - top: 2px; - } .scroll-snap-none { scroll-snap-type: none; }