Fix icons

This commit is contained in:
Aaron Carlino 2019-12-17 15:18:14 +13:00
parent e93af9e168
commit 86e3239b93
4 changed files with 24 additions and 12 deletions

View File

@ -89,7 +89,7 @@ module.exports = {
// allowed selectors defined in FontAwesome. Everything else in FA should be removed. // allowed selectors defined in FontAwesome. Everything else in FA should be removed.
extractor: class { extractor: class {
static extract(content) { static extract(content) {
const selectors = [`file-alt`] const selectors = [`fa-file-alt`]
const matches = content.match(/icon(Brand)?: ([a-zA-Z0-9_-]+)/); const matches = content.match(/icon(Brand)?: ([a-zA-Z0-9_-]+)/);
if (matches) { if (matches) {
const isBrand = typeof matches[1] !== 'undefined'; const isBrand = typeof matches[1] !== 'undefined';

View File

@ -2,6 +2,7 @@ import React, { StatelessComponent, ReactElement } from 'react';
import SearchBox from './SearchBox'; import SearchBox from './SearchBox';
import { Link, navigate } from 'gatsby'; import { Link, navigate } from 'gatsby';
import logo from '../images/silverstripe-logo.svg'; import logo from '../images/silverstripe-logo.svg';
import useDocContext from '../hooks/useDocContext';
import useHierarchy from '../hooks/useHierarchy'; import useHierarchy from '../hooks/useHierarchy';
interface HeaderProps { interface HeaderProps {
@ -12,6 +13,7 @@ const Header: StatelessComponent<HeaderProps> = ({ handleSidebarToggle }): React
const { getNodes, getHomePage, getCurrentNode, getCurrentVersion } = useHierarchy(); const { getNodes, getHomePage, getCurrentNode, getCurrentVersion } = useHierarchy();
const home = getHomePage(); const home = getHomePage();
const currentNode = getCurrentNode() || home; const currentNode = getCurrentNode() || home;
const context = useDocContext();
const handleNavigate = (e: any): void => { const handleNavigate = (e: any): void => {
if (typeof window === 'undefined') { if (typeof window === 'undefined') {
@ -32,7 +34,7 @@ const Header: StatelessComponent<HeaderProps> = ({ handleSidebarToggle }): React
} }
}; };
const title = (currentNode && currentNode.category) === 'user' ? 'CMS Help' : 'CMS Docs'; const title = context === 'user' ? 'CMS Help' : 'CMS Docs';
return ( return (
<header role="banner" className="header fixed-top"> <header role="banner" className="header fixed-top">

View File

@ -2,6 +2,7 @@ import React from 'react'
import { StatelessComponent, ReactElement, useEffect, useState } from 'react'; import { StatelessComponent, ReactElement, useEffect, useState } from 'react';
import { navigateTo } from "gatsby-link" import { navigateTo } from "gatsby-link"
import useHierarchy from '../hooks/useHierarchy'; import useHierarchy from '../hooks/useHierarchy';
import useDocContext from '../hooks/useDocContext';
import { useStaticQuery, graphql } from 'gatsby'; import { useStaticQuery, graphql } from 'gatsby';
interface SearchBoxProps { interface SearchBoxProps {
@ -20,15 +21,7 @@ const autocompleteSelected = (e) => {
const SearchBox: StatelessComponent<SearchBoxProps> = ({ identifier }): ReactElement|null => { const SearchBox: StatelessComponent<SearchBoxProps> = ({ identifier }): ReactElement|null => {
const { getCurrentVersion } = useHierarchy(); const { getCurrentVersion } = useHierarchy();
const [ isFocused, setFocus ] = useState(false); const [ isFocused, setFocus ] = useState(false);
const { site } = useStaticQuery(graphql` const context = useDocContext();
query {
site {
siteMetadata {
context
}
}
}
`);
useEffect(() => { useEffect(() => {
if (typeof window === 'undefined') return; if (typeof window === 'undefined') return;
@ -45,7 +38,7 @@ const SearchBox: StatelessComponent<SearchBoxProps> = ({ identifier }): ReactEle
algoliaOptions: { algoliaOptions: {
facetFilters: [ facetFilters: [
`version:${getCurrentVersion()}`, `version:${getCurrentVersion()}`,
//`context:${site.siteMetadata.context}`, //`context:${context}`,
], ],
hitsPerPage: 5, hitsPerPage: 5,
}, },

View File

@ -0,0 +1,17 @@
import { graphql, useStaticQuery } from 'gatsby';
const useDocContext = (): string => {
const result = useStaticQuery(graphql`
query {
site {
siteMetadata {
context
}
}
}
`);
return result.site.siteMetadata.context;
};
export default useDocContext;