Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit 90e172e

Browse files
committed
chore: merge branch 'dev'
2 parents bbafff4 + 20580ce commit 90e172e

File tree

9 files changed

+874
-1853
lines changed

9 files changed

+874
-1853
lines changed

.babelrc

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,6 @@
1818
}]
1919
]
2020
},
21-
"ci": {
22-
"presets": [
23-
["next/babel", {
24-
"preset-env": {
25-
"targets": {
26-
"ie": "11"
27-
},
28-
"debug": false
29-
}
30-
}]
31-
]
32-
},
3321
"test": {
3422
"plugins": ["inline-dotenv"]
3523
}

config/next_seo.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
export default {
22
title: 'coderplanets',
3-
description: 'the most sexy community for developers, ever.',
3+
description: 'the sexiest community for developers, ever.',
44
cannotical: 'https://coderplanets.com',
55
openGraph: {
66
type: 'website',
77
locale: 'en_IE',
88
url: 'https://coderplanets.com',
99
site_name: 'coderplanets',
10-
description: 'the most sexy community for developers, ever.',
10+
description: 'the sexiest community for developers, ever.',
1111
},
1212
/*
1313
twitter: {

containers/Banner/styles/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export const BaseTabber = styled.div`
3131
bottom: -16px;
3232
width: 80vw;
3333
${cs.media.mobile`width: 100%`};
34+
overflow-y: scroll;
3435
`
3536

3637
export const NumbersWrapper = styled.div`

containers/CommunityBanner/styles/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export const BaseTabber = styled.div`
2222
bottom: -16px;
2323
margin-left: -10px;
2424
width: 80vw;
25+
overflow-y: scroll;
2526
${cs.media.tablet`
2627
left: 10px;
2728
width: 100%;

containers/UserBilling/BillsTable.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react'
2-
import { Table } from 'antd'
32
import TimeAgo from 'timeago-react'
3+
import { Table } from 'antd'
4+
import 'antd/lib/table/style/index.css'
45

56
import { ArticleContentLoading } from '@components/LoadingEffects'
67
// import { ICON_CMD } from '@config'

next.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ require('dotenv').config()
77

88
// next-plugins
99
const withPlugins = require('next-compose-plugins')
10+
const withCSS = require('@zeit/next-css')
1011
const withSourceMaps = require('@zeit/next-source-maps')
1112
const withProgressBar = require('next-progressbar')
1213
const withOffline = require('next-offline')
@@ -67,6 +68,7 @@ const nextConfig = {
6768

6869
module.exports = withPlugins(
6970
[
71+
withCSS,
7072
withProgressBar,
7173
withBundleAnalyzer,
7274
withSourceMaps,

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"@next/bundle-analyzer": "^8.1.0",
4444
"@sentry/browser": "^4.6.4",
4545
"@sentry/node": "^4.6.4",
46+
"@zeit/next-css": "^1.0.1",
4647
"@zeit/next-source-maps": "0.0.4-canary.1",
4748
"accepts": "^1.3.4",
4849
"acorn": "^6.1.1",
@@ -56,7 +57,7 @@
5657
"chalk": "^2.4.1",
5758
"compatible-debug": "^1.0.0",
5859
"cookie-parser": "^1.4.4",
59-
"core-js": "3.0.1",
60+
"core-js": "3.1.4",
6061
"draft-js": "^0.10.5",
6162
"draft-js-linkify-plugin": "^2.0.1",
6263
"draft-js-mention-plugin": "3.1.3",
@@ -135,7 +136,7 @@
135136
"babel-plugin-module-resolver": "^3.1.2",
136137
"babel-plugin-ramda": "2.0.0",
137138
"babel-plugin-react-intl": "2.4.0",
138-
"babel-plugin-styled-components": "1.9.3",
139+
"babel-plugin-styled-components": "1.10.1",
139140
"babel-plugin-transform-inline-environment-variables": "^0.4.3",
140141
"commitizen": "3.0.7",
141142
"coveralls": "3.0.3",
@@ -149,7 +150,7 @@
149150
"enzyme-to-json": "^3.3.4",
150151
"eslint": "5.14.0",
151152
"eslint-config-airbnb": "17.1.0",
152-
"eslint-config-prettier": "4.2.0",
153+
"eslint-config-prettier": "5.0.0",
153154
"eslint-import-resolver-babel-module": "5.0.0-beta.1",
154155
"eslint-plugin-cypress": "^2.0.1",
155156
"eslint-plugin-import": "2.17.3",

0 commit comments

Comments
 (0)