Skip to content

Commit

Permalink
Merge pull request #851 from ethereum/dev
Browse files Browse the repository at this point in the history
Deploy v1.3.0
  • Loading branch information
samajammin authored Mar 20, 2020
2 parents e85a4f9 + ca0494a commit 4237bfd
Show file tree
Hide file tree
Showing 111 changed files with 3,669 additions and 2,840 deletions.
21 changes: 20 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -1335,7 +1335,8 @@
"profile": "http://carlfairclough.me",
"contributions": [
"design",
"code"
"code",
"bug"
]
},
{
Expand Down Expand Up @@ -1373,6 +1374,24 @@
"contributions": [
"translation"
]
},
{
"login": "tvanepps",
"name": "tvanepps",
"avatar_url": "https://avatars1.githubusercontent.com/u/27454964?v=4",
"profile": "https://github.com/tvanepps",
"contributions": [
"bug"
]
},
{
"login": "FlipFloop",
"name": "Victor Guyard",
"avatar_url": "https://avatars3.githubusercontent.com/u/19635051?v=4",
"profile": "https://github.com/FlipFloop",
"contributions": [
"a11y"
]
}
],
"contributorsPerLine": 7,
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-149-orange.svg?style=flat-square)](#contributors)
[![All Contributors](https://img.shields.io/badge/all_contributors-151-orange.svg?style=flat-square)](#contributors)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

<h1 align="center" style="margin-top: 1em; margin-bottom: 3em;">
Expand Down Expand Up @@ -413,13 +413,15 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center"><a href="https://github.com/hsy822"><img src="https://avatars3.githubusercontent.com/u/17763340?v=4" width="100px;" alt=""/><br /><sub><b>sooyoung</b></sub></a><br /><a href="#content-hsy822" title="Content">🖋</a></td>
<td align="center"><a href="https://github.com/adria0"><img src="https://avatars3.githubusercontent.com/u/5526331?v=4" width="100px;" alt=""/><br /><sub><b>Adria Massanet</b></sub></a><br /><a href="#content-adria0" title="Content">🖋</a></td>
<td align="center"><a href="http://www.alexsingh.com"><img src="https://avatars0.githubusercontent.com/u/6787950?v=4" width="100px;" alt=""/><br /><sub><b>Alex Singh</b></sub></a><br /><a href="#design-as-dr" title="Design">🎨</a></td>
<td align="center"><a href="http://carlfairclough.me"><img src="https://avatars1.githubusercontent.com/u/4670881?v=4" width="100px;" alt=""/><br /><sub><b>Carl Fairclough</b></sub></a><br /><a href="#design-carlfairclough" title="Design">🎨</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=carlfairclough" title="Code">💻</a></td>
<td align="center"><a href="http://carlfairclough.me"><img src="https://avatars1.githubusercontent.com/u/4670881?v=4" width="100px;" alt=""/><br /><sub><b>Carl Fairclough</b></sub></a><br /><a href="#design-carlfairclough" title="Design">🎨</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=carlfairclough" title="Code">💻</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Acarlfairclough" title="Bug reports">🐛</a></td>
<td align="center"><a href="https://github.com/kvrnc"><img src="https://avatars3.githubusercontent.com/u/36660375?v=4" width="100px;" alt=""/><br /><sub><b>Kaven C</b></sub></a><br /><a href="#content-kvrnc" title="Content">🖋</a></td>
<td align="center"><a href="https://github.com/mhatvan"><img src="https://avatars2.githubusercontent.com/u/16797721?v=4" width="100px;" alt=""/><br /><sub><b>Markus Hatvan</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=mhatvan" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/evanstucker-hates-2fa"><img src="https://avatars0.githubusercontent.com/u/20584445?v=4" width="100px;" alt=""/><br /><sub><b>Evans Tucker</b></sub></a><br /><a href="#content-evanstucker-hates-2fa" title="Content">🖋</a></td>
<td align="center"><a href="https://github.com/fluffays"><img src="https://avatars1.githubusercontent.com/u/39056857?v=4" width="100px;" alt=""/><br /><sub><b>Adina Cretu</b></sub></a><br /><a href="#translation-fluffays" title="Translation">🌍</a></td>
<td align="center"><a href="https://github.com/tvanepps"><img src="https://avatars1.githubusercontent.com/u/27454964?v=4" width="100px;" alt=""/><br /><sub><b>tvanepps</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Atvanepps" title="Bug reports">🐛</a></td>
<td align="center"><a href="https://github.com/FlipFloop"><img src="https://avatars3.githubusercontent.com/u/19635051?v=4" width="100px;" alt=""/><br /><sub><b>Victor Guyard</b></sub></a><br /><a href="#a11y-FlipFloop" title="Accessibility">️️️️♿️</a></td>
</tr>
</table>

Expand Down
13 changes: 3 additions & 10 deletions docs/.vuepress/components/AssetItem.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<template>
<div class="asset-item">
<div class="asset-item pb-1">
<a :href="imagePath('png')" target="_blank" rel="noopener noreferrer">
<img class="asset-image" :src="imagePath('png')" />
<img class="asset-image pt-1 pb-1 max-w-100" :src="imagePath('png')" />
</a>
<div class="asset-download">
<div class="l8">
Download:
<span v-if="hasFileType('png') === true">
<a :href="imagePath('png')" target="_blank" rel="noopener noreferrer"
Expand Down Expand Up @@ -49,15 +49,8 @@ export default {
@import '../theme/styles/config.styl';
.asset-item
padding-bottom 1 rem
border-bottom 1px dotted $subduedColor
.asset-image
max-height 200px
max-width 100%
padding-top 1rem
padding-bottom 1rem
.asset-download
font-size $fsSmall
</style>
8 changes: 7 additions & 1 deletion docs/.vuepress/components/BuildPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
<a
target="_blank"
rel="noopener noreferrer"
class="hide-icon"
:href="template.to.url"
>{{ template.to.text }}</a
>
Expand All @@ -71,7 +72,12 @@
>
<h3 class="l4 tc-text400 ma-0">{{ resource.title }}</h3>
<div class="logo flex flex-column flex-center justify-center pl-2 pr-2">
<a :href="resource.to" target="_blank" rel="noopener noreferrer">
<a
:href="resource.to"
target="_blank"
rel="noopener noreferrer"
class="hide-icon"
>
<img
:src="resource.img.src"
:alt="resource.img.alt || resource.title"
Expand Down
19 changes: 9 additions & 10 deletions docs/.vuepress/components/Button.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
href
v-if="isExternal"
:href="to"
:class="buttonClasses"
:class="classes"
target="_blank"
rel="noopener noreferrer"
>
<slot />
</a>
<router-link v-else :to="to" :class="buttonClasses">
<router-link v-else :to="to" :class="classes">
<slot />
</router-link>
</template>
Expand All @@ -32,11 +32,11 @@ export default {
}
},
computed: {
buttonClasses() {
if (this.secondary) {
return 'button secondary'
} else {
return 'button primary'
classes() {
return {
'button pl-075 pr-075 pt-05 pb-05': true,
primary: !this.secondary,
secondary: this.secondary
}
}
}
Expand All @@ -49,7 +49,6 @@ export default {
.button
font-size 1rem
border-radius .25em
padding .5em .75em
text-align: center;
.primary
Expand All @@ -65,9 +64,9 @@ export default {
outline: none;
.secondary
color $textColor
color $colorPrimary500
background-color: $colorWhite500
border: 1px solid $subduedColor
border: 1px solid $colorWhite900
&:hover
background-color $subduedColor
Expand Down
98 changes: 98 additions & 0 deletions docs/.vuepress/components/Card.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<template>
<a
v-if="isExternal && clickable"
:href="getLink"
target="_blank"
rel="noopener noreferrer"
class="hide-icon flex"
>
<CardInner
:level="level"
:hero="hero"
:header="header"
:leftimg="leftimg"
:title="title"
:content="content"
:link="link"
/>
</a>

<router-link
v-else-if="getLink && clickable"
:to="getLink"
class="hide-icon flex"
>
<CardInner
:level="level"
:hero="hero"
:header="header"
:leftimg="leftimg"
:title="title"
:content="content"
:link="link"
/>
</router-link>

<div v-else class="flex">
<CardInner
:level="level"
:hero="hero"
:header="header"
:leftimg="leftimg"
:title="title"
:content="content"
:link="link"
/>
</div>
</template>

<script>
import { isExternal, ensureExt } from '../theme/utils/util'
export default {
name: 'Card',
props: {
level: {
required: false,
default: 3
},
hero: {
required: false,
type: Boolean
},
header: {
required: false,
type: String
},
leftimg: {
required: false,
type: Boolean
},
title: {
required: true,
type: String
},
content: {
required: true,
type: String
},
link: {
required: false,
type: [Object, Array]
},
clickable: {
required: false,
type: Boolean,
default: true
}
},
computed: {
getLink() {
return this.link && !Array.isArray(this.link) && ensureExt(this.link.to)
}
},
methods: {
isExternal
}
}
</script>
Loading

0 comments on commit 4237bfd

Please sign in to comment.