Skip to content
This repository has been archived by the owner on May 7, 2019. It is now read-only.

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
Closes #1
  • Loading branch information
kripod committed Jun 22, 2018
1 parent f6ed0f2 commit cabc047
Show file tree
Hide file tree
Showing 7 changed files with 142 additions and 128 deletions.
15 changes: 1 addition & 14 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
{
"root": true,
"extends": ["airbnb", "plugin:prettier/recommended"],
"extends": ["airbnb", "plugin:prettier/recommended", "prettier/react"],
"env": {
"browser": true
},
"globals": {
"graphql": true
},
"rules": {
"jsx-a11y/anchor-is-valid": [
"error",
{
"components": ["Link"],
"specialLink": ["to"],
"aspects": ["noHref", "invalidHref", "preferButton"]
}
]
}
}
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
"format": "prettier --ignore-path .gitignore --write \"**/*.{js,jsx,json,scss,md}\""
},
"dependencies": {
"gatsby": "next",
"gatsby-plugin-react-helmet": "next",
"gatsby-plugin-sass": "next",
"modern-normalize": "^0.4.0",
"gatsby": "^2.0.0-beta.9",
"gatsby-plugin-react-helmet": "^3.0.0-beta.2",
"gatsby-plugin-sass": "^2.0.0-beta.2",
"modern-normalize": "^0.5.0",
"node-sass": "^4.9.0",
"prop-types": "^15.6.1",
"prop-types": "^15.6.2",
"react": "^16.4.1",
"react-dom": "^16.4.1",
"react-helmet": "^5.2.0"
},
"devDependencies": {
"eslint": "^4.19.1",
"eslint-config-airbnb": "^16.1.0",
"eslint-config-airbnb": "^17.0.0",
"eslint-config-prettier": "^2.9.0",
"eslint-plugin-import": "^2.12.0",
"eslint-plugin-jsx-a11y": "^6.0.3",
Expand All @@ -30,7 +30,7 @@
"prettier": "^1.13.5",
"stylelint": "^9.3.0",
"stylelint-config-idiomatic-order": "^5.0.0",
"stylelint-config-prettier": "^3.2.0",
"stylelint-config-prettier": "^3.3.0",
"stylelint-config-recommended-scss": "^3.2.0",
"stylelint-scss": "^3.1.3"
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Layout.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'modern-normalize/modern-normalize.css';
import { StaticQuery } from 'gatsby';
import { graphql, StaticQuery } from 'gatsby';
import PropTypes from 'prop-types';
import React from 'react';
import Helmet from 'react-helmet';
Expand Down
7 changes: 0 additions & 7 deletions src/components/Layout.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@
@import '../utils/themes';
@import '../utils/typography';

html {
// TODO: Remove the rule below if https://github.com/sindresorhus/modern-normalize/pull/28 gets merged and released
// Prevent adjustments of font size after orientation changes in iOS
// Source: https://github.com/necolas/normalize.css/blob/7369f566898b8cefc2649b6a66e112857de4c46f/normalize.css#L13
-webkit-text-size-adjust: 100%;
}

body {
@include theme(light);
@include font(body);
Expand Down
7 changes: 6 additions & 1 deletion src/utils/_themes.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
$themes: (light: (background: white, color: black));
$themes: (
light: (
background: white,
color: black,
),
);

@mixin theme($type) {
@each $key, $value in map-get($themes, $type) {
Expand Down
8 changes: 6 additions & 2 deletions src/utils/_typography.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
$fonts: (
display: (font-family: system-ui),
body: (font-family: system-ui)
display: (
font-family: system-ui,
),
body: (
font-family: system-ui,
),
);

@mixin font($type) {
Expand Down
Loading

0 comments on commit cabc047

Please sign in to comment.