Skip to content
This repository was archived by the owner on Feb 13, 2024. It is now read-only.

Commit 89e3088

Browse files
author
Gabriel Cardona
committed
Merge branch 'stage' into add-op-return-to-badger
2 parents 8ef680f + 1663465 commit 89e3088

6 files changed

Lines changed: 1956 additions & 257 deletions

File tree

package.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
{
22
"name": "developer.bitcoin.com",
33
"description": "Bitcoin.com developer resources and documentation",
4-
"version": "3.2.5",
4+
"version": "3.2.6",
55
"author": "Peter <peter@bitcoin.com> and Gabriel Cardona <gabriel@bitcoin.com>",
66
"dependencies": {
77
"badger-components-react": "^0.1.3",
8-
"gatsby": "^2.0.50",
9-
"gatsby-image": "^2.0.20",
8+
"gatsby": "^2.0.118",
9+
"gatsby-image": "^2.0.29",
1010
"gatsby-plugin-flow": "^1.0.2",
11-
"gatsby-plugin-google-tagmanager": "^2.0.6",
12-
"gatsby-plugin-manifest": "^2.0.9",
13-
"gatsby-plugin-offline": "^2.0.15",
14-
"gatsby-plugin-react-helmet": "^3.0.2",
15-
"gatsby-plugin-robots-txt": "^1.3.0",
16-
"gatsby-plugin-sharp": "^2.0.12",
17-
"gatsby-plugin-sitemap": "^2.0.2",
18-
"gatsby-plugin-styled-components": "^3.0.2",
19-
"gatsby-remark-autolink-headers": "^2.0.11",
11+
"gatsby-plugin-google-tagmanager": "^2.0.9",
12+
"gatsby-plugin-manifest": "^2.0.17",
13+
"gatsby-plugin-offline": "^2.0.23",
14+
"gatsby-plugin-react-helmet": "^3.0.6",
15+
"gatsby-plugin-robots-txt": "^1.4.0",
16+
"gatsby-plugin-sharp": "^2.0.20",
17+
"gatsby-plugin-sitemap": "^2.0.5",
18+
"gatsby-plugin-styled-components": "^3.0.5",
19+
"gatsby-remark-autolink-headers": "^2.0.14",
2020
"gatsby-remark-component": "^1.1.3",
21-
"gatsby-remark-copy-linked-files": "^2.0.6",
22-
"gatsby-remark-images": "^2.0.6",
23-
"gatsby-source-filesystem": "^2.0.8",
24-
"gatsby-transformer-remark": "^2.1.12",
25-
"gatsby-transformer-sharp": "^2.1.8",
21+
"gatsby-remark-copy-linked-files": "^2.0.9",
22+
"gatsby-remark-images": "^3.0.3",
23+
"gatsby-source-filesystem": "^2.0.20",
24+
"gatsby-transformer-remark": "^2.2.4",
25+
"gatsby-transformer-sharp": "^2.1.13",
2626
"isomorphic-fetch": "^2.2.1",
27-
"react": "^16.6.3",
28-
"react-dom": "^16.6.3",
27+
"react": "^16.8.1",
28+
"react-dom": "^16.8.1",
2929
"react-helmet": "^5.2.0",
30-
"react-icons": "^3.2.2",
31-
"react-syntax-highlighter": "^10.0.1",
30+
"react-icons": "^3.3.0",
31+
"react-syntax-highlighter": "^10.1.2",
3232
"recompose": "^0.30.0",
33-
"rehype-react": "^3.0.3",
34-
"styled-components": "^4.1.1"
33+
"rehype-react": "^3.1.0",
34+
"styled-components": "^4.1.3"
3535
},
3636
"keywords": [
3737
"gatsby",
@@ -51,10 +51,10 @@
5151
"test": "echo \"Error: no test specified\" && exit 1"
5252
},
5353
"devDependencies": {
54-
"babel-plugin-styled-components": "^1.8.0",
55-
"husky": "^1.1.4",
56-
"prettier": "^1.15.2",
57-
"pretty-quick": "^1.8.0"
54+
"babel-plugin-styled-components": "^1.10.0",
55+
"husky": "^1.3.1",
56+
"prettier": "^1.16.4",
57+
"pretty-quick": "^1.10.0"
5858
},
5959
"repository": {
6060
"type": "git",

src/atoms/StyledLink.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@ const StyledLink = styled(Link)`
1616
color: ${props => props.theme.primary600};
1717
}
1818
`
19-
const StyledA = props => <StyledLink as="a" {...props} />
2019

2120
type Props = {
2221
children: React.Node,
2322
text?: string,
2423
to: string,
2524
href?: string,
25+
subtle?: ?boolean,
2626
}
2727

28+
const StyledA = (props: Props) => <StyledLink as="a" {...props} />
29+
2830
class SmartLink extends React.PureComponent<Props> {
2931
render() {
3032
const { children, text, ...rest } = this.props
@@ -33,8 +35,9 @@ class SmartLink extends React.PureComponent<Props> {
3335
const patternInternal = /^\/(?!\/)/
3436
const patternStaticAsset = /\/static\//g
3537

36-
const internal = patternInternal.test(to) || patternInternal.test(href)
37-
const isAsset = patternStaticAsset.test(href)
38+
const internal =
39+
patternInternal.test(to) || patternInternal.test(href || '')
40+
const isAsset = patternStaticAsset.test(href || '')
3841

3942
if (isAsset || !internal) {
4043
return (

src/components/NavBar.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,20 @@ class NavBar extends React.PureComponent<Props> {
7373
<Main>
7474
<Container>
7575
<NavLayout>
76-
<NavItem monospace to="/" isActive={homeActive}>
76+
<NavItem monospace="true" to="/" isActive={homeActive}>
7777
Home
7878
</NavItem>
79-
<NavItem monospace to="/learn" isActive={learnActive}>
79+
<NavItem monospace="true" to="/learn" isActive={learnActive}>
8080
Learn
8181
</NavItem>
8282
<NavItem
83-
monospace
83+
monospace="true"
8484
to="/develop"
8585
isActive={developActive && !learnActive}
8686
>
8787
Develop
8888
</NavItem>
89-
<NavItem monospace to="/about" isActive={aboutActive}>
89+
<NavItem monospace="true" to="/about" isActive={aboutActive}>
9090
About
9191
</NavItem>
9292
</NavLayout>

src/components/layouts/DefaultLayout.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const DefaultLayout = ({ children, location }: Props) => (
4545
'BITBOX based bitcoin.com developer platform and resources'
4646
}
4747
keywords={
48-
'bitbox, developer tools, bitcoin, bitcoin cash, BCH, sdk, api'
48+
'bitbox, developer tools, bitcoin, bitcoin cash, BCH, sdk, api, slp, development tools'
4949
}
5050
location={location}
5151
image={Favicon}

src/components/layouts/base.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ html {
55
font-weight: 400;
66
font-size: 16px;
77
font-size-adjust: 0.5;
8+
height: auto !important;
89
}
910

1011
body {
1112
margin: 0;
1213
position: relative;
1314
color: #151b1e;
15+
height: auto !important;
1416
}
1517

1618
h1,

0 commit comments

Comments
 (0)