diff --git a/src/components/App/scss/variables.scss b/src/components/App/scss/variables.scss index 3ffd8a410f..c3f2dfe397 100644 --- a/src/components/App/scss/variables.scss +++ b/src/components/App/scss/variables.scss @@ -13,7 +13,7 @@ $turquoise-light: #f1f5f5; $turquoise: #51e9d2; $white: #fff; -$blue-overlay: rgba($blue, 0.8); +$blue-overlay: rgba($blue, 0.15); // typography $base-font-family: "montserrat"; diff --git a/src/components/MainMenu/MainMenu.tsx b/src/components/MainMenu/MainMenu.tsx index b0eb602064..35382d5386 100644 --- a/src/components/MainMenu/MainMenu.tsx +++ b/src/components/MainMenu/MainMenu.tsx @@ -1,3 +1,6 @@ +import { mediumScreen, smallScreen } from "../App/scss/variables.scss"; +import "./scss/index.scss"; + import * as React from "react"; import Media from "react-media"; import { Link } from "react-router-dom"; @@ -14,9 +17,6 @@ import { UserContext } from "../User/context"; import NavDropdown from "./NavDropdown"; import { TypedMainMenuQuery } from "./queries"; -import { mediumScreen, smallScreen } from "../App/scss/variables.scss"; -import "./scss/index.scss"; - const cartIcon = require("../../images/cart.svg"); const hamburgerHoverIcon = require("../../images/hamburger-hover.svg"); const hamburgerIcon = require("../../images/hamburger.svg"); diff --git a/src/components/MainMenu/scss/index.scss b/src/components/MainMenu/scss/index.scss index 2c2c58a7eb..c0492752e8 100644 --- a/src/components/MainMenu/scss/index.scss +++ b/src/components/MainMenu/scss/index.scss @@ -135,12 +135,6 @@ line-height: 1rem; transition: 0.3s; } - - &:hover { - span { - background-color: $turquoise; - } - } } &__user { diff --git a/src/components/ProductsFeatured/index.tsx b/src/components/ProductsFeatured/index.tsx index d2d0c81a9e..d143759571 100644 --- a/src/components/ProductsFeatured/index.tsx +++ b/src/components/ProductsFeatured/index.tsx @@ -8,7 +8,7 @@ import { TypedFeaturedProductsQuery } from "./queries"; import "./scss/index.scss"; interface ProductsFeaturedProps { - title?: string; + title?: string | false; } const ProductsFeatured: React.SFC = ({ title }) => { @@ -24,7 +24,7 @@ const ProductsFeatured: React.SFC = ({ title }) => { return (
-

{title}

+ {title !== false &&

{title}

} {products.map(({ node: product }) => ( div { + &:nth-child(3) { + grid-column: 3 / 1; + } + + &:last-child { + display: none; + } + } } a { diff --git a/src/views/Search/index.tsx b/src/views/Search/index.tsx index 6b772c1039..a73e180020 100644 --- a/src/views/Search/index.tsx +++ b/src/views/Search/index.tsx @@ -72,7 +72,11 @@ export const SearchView: React.SFC = ({ return ( {isOnline => ( - + {({ error, data, loading, loadMore }) => { const canDisplayFilters = maybe( () => !!data.attributes.edges.length