Skip to content

Commit

Permalink
Merge pull request #174 from FDMediagroep/develop
Browse files Browse the repository at this point in the history
Margin radio, checkbox
  • Loading branch information
willemliufdmg committed Sep 24, 2020
2 parents c8c8f7b + c05e222 commit 8a60ad6
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 11 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ Install `date-input-polyfill` for date-picker polyfill for older browsers.

`npm i date-input-polyfill`

#### Optional configuration
### Optional configuration

You can replace date-input-polyfill with an empty component.

##### Webpack config
#### Webpack config

Install `null-loader` and add the following to your Webpack configuration rules.

Expand Down
10 changes: 10 additions & 0 deletions src/components/Explain.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@
background-color: transparent;
border: none;
cursor: pointer;
svg {
width: 1rem;
height: 1rem;
fill: var(--content-copy);
// IE11
@media screen and (-ms-high-contrast: active),
(-ms-high-contrast: none) {
color: #{map-deep-get($colors, 'colors', 'neutral', 10)};
}
}
}

.previewContainer {
Expand Down
7 changes: 4 additions & 3 deletions src/components/Explain.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
initializeDesignTokensTooltip,
clearDesignTokensTooltips,
} from '../utils/designTokensTooltip';
import { PaperclipIcon } from '../design-tokens/icons';

declare let window: Window | any;
declare let cssbeautify: (css: string) => string;
Expand Down Expand Up @@ -184,9 +185,9 @@ function Explain(props: Props) {
className={styles.anchor}
onClick={copyAnchor.bind(null, props.anchor)}
title="Copy link"
>
🔗
</button>
aria-label={`Copy link to ${props.legend}`}
dangerouslySetInnerHTML={{ __html: PaperclipIcon }}
/>
) : null}
</h2>
{props.description && (
Expand Down
4 changes: 2 additions & 2 deletions src/components/input/Checkbox.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
user-select: none;
position: relative;
display: inline-block;
padding-left: 1.5rem;
margin-right: 1rem;
padding-left: 1.75rem;
margin-right: 2.5rem;
margin-bottom: 0.5rem;
cursor: pointer;
color: var(--content-copy);
Expand Down
4 changes: 2 additions & 2 deletions src/components/input/Radio.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
position: relative;
z-index: 1;
display: inline-block;
padding-left: 1.5rem;
margin-right: 1rem;
padding-left: 1.75rem;
margin-right: 2.5rem;
margin-bottom: 0.5rem;
cursor: pointer;
color: var(--content-copy);
Expand Down
1 change: 1 addition & 0 deletions src/design-tokens/icons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export { default as ExpandIcon } from '../../public/assets/icons/expand.svg';
export { default as FdmgIcon } from '../../public/assets/icons/logo-fdmg.svg';
export { default as LinkedInIcon } from '../../public/assets/icons/linkedin.svg';
export { default as MinimiseIcon } from '../../public/assets/icons/minimise.svg';
export { default as PaperclipIcon } from '../../public/assets/icons/paperclip.svg';
export { default as ReadingTimeIcon } from '../../public/assets/icons/reading-time.svg';
export { default as SpyglassIcon } from '../../public/assets/icons/spyglass.svg';
export { default as TwitterIcon } from '../../public/assets/icons/twitter.svg';
Expand Down
2 changes: 1 addition & 1 deletion src/pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function App({ Component, pageProps }) {
<Head>
<meta
name="viewport"
content="width=device-width, initial-scale=1,maximum-scale=1,user-scalable=no, minimal-ui, viewport-fit=cover"
content="width=device-width,initial-scale=1,viewport-fit=cover"
/>
</Head>
<section className={pageStyle}>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/_document.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Document, { Html, Main, NextScript, Head } from 'next/document';
export default class MyDocument extends Document<any> {
render() {
return (
<Html lang="nl">
<Html lang="en">
<Head>
<link href="/favicon.ico" rel="shortcut icon" />
<link
Expand Down

1 comment on commit 8a60ad6

@vercel
Copy link

@vercel vercel bot commented on 8a60ad6 Sep 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.