Skip to content

Commit

Permalink
Merge pull request #1000 from ethereum/dev
Browse files Browse the repository at this point in the history
Deploy v1.5.3
  • Loading branch information
samajammin authored May 1, 2020
2 parents bd15e83 + 318b469 commit 10e0516
Show file tree
Hide file tree
Showing 21 changed files with 307 additions and 162 deletions.
49 changes: 45 additions & 4 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,8 @@
"avatar_url": "https://avatars2.githubusercontent.com/u/429604?v=4",
"profile": "https://twitter.com/smpalladino",
"contributions": [
"content"
"content",
"ideas"
]
},
{
Expand Down Expand Up @@ -568,7 +569,8 @@
"avatar_url": "https://avatars1.githubusercontent.com/u/6937903?v=4",
"profile": "https://github.com/ethers",
"contributions": [
"content"
"content",
"ideas"
]
},
{
Expand All @@ -578,7 +580,8 @@
"profile": "http://faraggi.org",
"contributions": [
"content",
"translation"
"translation",
"ideas"
]
},
{
Expand Down Expand Up @@ -1523,7 +1526,8 @@
"avatar_url": "https://avatars1.githubusercontent.com/u/18563486?v=4",
"profile": "https://github.com/tasdienes",
"contributions": [
"ideas"
"ideas",
"content"
]
},
{
Expand All @@ -1534,6 +1538,43 @@
"contributions": [
"code"
]
},
{
"login": "sinahab",
"name": "Sina Habibian",
"avatar_url": "https://avatars0.githubusercontent.com/u/4315207?v=4",
"profile": "http://twitter.com/sinahab",
"contributions": [
"ideas"
]
},
{
"login": "crazyrabbitLTC",
"name": "Dennison Bertram",
"avatar_url": "https://avatars0.githubusercontent.com/u/1938013?v=4",
"profile": "http://www.dennisonbertram.com",
"contributions": [
"ideas"
]
},
{
"login": "arturgontijo",
"name": "Artur Gontijo",
"avatar_url": "https://avatars0.githubusercontent.com/u/15108323?v=4",
"profile": "https://github.com/arturgontijo",
"contributions": [
"ideas"
]
},
{
"login": "ethjoe",
"name": "ethjoe",
"avatar_url": "https://avatars0.githubusercontent.com/u/36374665?v=4",
"profile": "https://github.com/ethjoe",
"contributions": [
"content",
"review"
]
}
],
"contributorsPerLine": 7,
Expand Down
18 changes: 12 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-166-orange.svg?style=flat-square)](#contributors)
[![All Contributors](https://img.shields.io/badge/all_contributors-170-orange.svg?style=flat-square)](#contributors)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

<h1 align="center" style="margin-top: 1em; margin-bottom: 3em;">
<p><a href="https://ethereum.org"><img alt="ethereum logo" src="./eth.png" alt="ethereum.org" width="125"></a></p>
<p>👋 Welcome to ethereum.org!</p>
</h1>

[Ethereum.org](https://ethereum.org) is a primary online resource for the Ethereum community. The purpose of the site is to _“Be the best portal to Ethereum for our growing global community"_ - read more about what this means [here](https://ethereum.org/about/purpose/).
[Ethereum.org](https://ethereum.org) is a primary online resource for the Ethereum community. The purpose of the site is to _“Be the best portal to Ethereum for our growing global community"_ - read more about what this means [here](https://github.com/ethereum/ethereum-org-website/blob/dev/purpose.md).

[Ethereum.org](https://ethereum.org) is improved and changed over time through the contributions of community members who submit content, give feedback, or volunteer their time to managing its evolution. If you’re interested in helping to improve [ethereum.org](https://ethereum.org), start here. This contribution guide will help you get started.

Expand Down Expand Up @@ -271,7 +271,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center"><a href="https://exomel.com"><img src="https://avatars1.githubusercontent.com/u/11348?v=4" width="100px;" alt=""/><br /><sub><b>Rémi Prévost</b></sub></a><br /><a href="#content-remiprev" title="Content">🖋</a></td>
<td align="center"><a href="http://shanejonas.net"><img src="https://avatars2.githubusercontent.com/u/364566?v=4" width="100px;" alt=""/><br /><sub><b>Shane</b></sub></a><br /><a href="#content-shanejonas" title="Content">🖋</a></td>
<td align="center"><a href="https://shazow.net/"><img src="https://avatars3.githubusercontent.com/u/6292?v=4" width="100px;" alt=""/><br /><sub><b>Andrey Petrov</b></sub></a><br /><a href="#content-shazow" title="Content">🖋</a> <a href="#ideas-shazow" title="Ideas, Planning, & Feedback">🤔</a> <a href="#a11y-shazow" title="Accessibility">️️️️♿️</a></td>
<td align="center"><a href="https://twitter.com/smpalladino"><img src="https://avatars2.githubusercontent.com/u/429604?v=4" width="100px;" alt=""/><br /><sub><b>Santiago Palladino</b></sub></a><br /><a href="#content-spalladino" title="Content">🖋</a></td>
<td align="center"><a href="https://twitter.com/smpalladino"><img src="https://avatars2.githubusercontent.com/u/429604?v=4" width="100px;" alt=""/><br /><sub><b>Santiago Palladino</b></sub></a><br /><a href="#content-spalladino" title="Content">🖋</a> <a href="#ideas-spalladino" title="Ideas, Planning, & Feedback">🤔</a></td>
<td align="center"><a href="http://www.twitter.com/timbeiko"><img src="https://avatars0.githubusercontent.com/u/9390255?v=4" width="100px;" alt=""/><br /><sub><b>Tim Beiko</b></sub></a><br /><a href="#content-timbeiko" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/pulls?q=is%3Apr+reviewed-by%3Atimbeiko" title="Reviewed Pull Requests">👀</a></td>
</tr>
<tr>
Expand Down Expand Up @@ -307,8 +307,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center"><a href="https://sawinyh.com"><img src="https://avatars1.githubusercontent.com/u/7769371?v=4" width="100px;" alt=""/><br /><sub><b>Nick Sawinyh</b></sub></a><br /><a href="#content-sneg55" title="Content">🖋</a></td>
<td align="center"><a href="http://zoek1.github.com"><img src="https://avatars1.githubusercontent.com/u/660973?v=4" width="100px;" alt=""/><br /><sub><b>Miguel Angel Gordián</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=zoek1" title="Code">💻</a></td>
<td align="center"><a href="https://eswarasai.com"><img src="https://avatars2.githubusercontent.com/u/5172086?v=4" width="100px;" alt=""/><br /><sub><b>Eswara Sai</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=eswarasai" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/ethers"><img src="https://avatars1.githubusercontent.com/u/6937903?v=4" width="100px;" alt=""/><br /><sub><b>ethers</b></sub></a><br /><a href="#content-ethers" title="Content">🖋</a></td>
<td align="center"><a href="http://faraggi.org"><img src="https://avatars2.githubusercontent.com/u/264382?v=4" width="100px;" alt=""/><br /><sub><b>Felipe Faraggi</b></sub></a><br /><a href="#content-faraggi" title="Content">🖋</a> <a href="#translation-faraggi" title="Translation">🌍</a></td>
<td align="center"><a href="https://github.com/ethers"><img src="https://avatars1.githubusercontent.com/u/6937903?v=4" width="100px;" alt=""/><br /><sub><b>ethers</b></sub></a><br /><a href="#content-ethers" title="Content">🖋</a> <a href="#ideas-ethers" title="Ideas, Planning, & Feedback">🤔</a></td>
<td align="center"><a href="http://faraggi.org"><img src="https://avatars2.githubusercontent.com/u/264382?v=4" width="100px;" alt=""/><br /><sub><b>Felipe Faraggi</b></sub></a><br /><a href="#content-faraggi" title="Content">🖋</a> <a href="#translation-faraggi" title="Translation">🌍</a> <a href="#ideas-faraggi" title="Ideas, Planning, & Feedback">🤔</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/maurelian"><img src="https://avatars3.githubusercontent.com/u/23033765?v=4" width="100px;" alt=""/><br /><sub><b>Maurelian</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=maurelian" title="Code">💻</a> <a href="https://github.com/ethereum/ethereum-org-website/pulls?q=is%3Apr+reviewed-by%3Amaurelian" title="Reviewed Pull Requests">👀</a> <a href="#content-maurelian" title="Content">🖋</a></td>
Expand Down Expand Up @@ -440,8 +440,14 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center"><a href="https://etherworld.co"><img src="https://avatars0.githubusercontent.com/u/29681685?v=4" width="100px;" alt=""/><br /><sub><b>Pooja Ranjan</b></sub></a><br /><a href="#content-poojaranjan" title="Content">🖋</a></td>
<td align="center"><a href="https//twitter.com/sassal0x"><img src="https://avatars0.githubusercontent.com/u/9276959?v=4" width="100px;" alt=""/><br /><sub><b>sassal</b></sub></a><br /><a href="#content-sassal" title="Content">🖋</a></td>
<td align="center"><a href="https://zaremba.ch"><img src="https://avatars0.githubusercontent.com/u/811701?v=4" width="100px;" alt=""/><br /><sub><b>Robert Zaremba</b></sub></a><br /><a href="#content-robert-zaremba" title="Content">🖋</a></td>
<td align="center"><a href="https://github.com/tasdienes"><img src="https://avatars1.githubusercontent.com/u/18563486?v=4" width="100px;" alt=""/><br /><sub><b>Tas</b></sub></a><br /><a href="#ideas-tasdienes" title="Ideas, Planning, & Feedback">🤔</a></td>
<td align="center"><a href="https://github.com/tasdienes"><img src="https://avatars1.githubusercontent.com/u/18563486?v=4" width="100px;" alt=""/><br /><sub><b>Tas</b></sub></a><br /><a href="#ideas-tasdienes" title="Ideas, Planning, & Feedback">🤔</a> <a href="#content-tasdienes" title="Content">🖋</a></td>
<td align="center"><a href="https://github.com/s-pace"><img src="https://avatars2.githubusercontent.com/u/32097720?v=4" width="100px;" alt=""/><br /><sub><b>Sylvain Pace</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=s-pace" title="Code">💻</a></td>
<td align="center"><a href="http://twitter.com/sinahab"><img src="https://avatars0.githubusercontent.com/u/4315207?v=4" width="100px;" alt=""/><br /><sub><b>Sina Habibian</b></sub></a><br /><a href="#ideas-sinahab" title="Ideas, Planning, & Feedback">🤔</a></td>
<td align="center"><a href="http://www.dennisonbertram.com"><img src="https://avatars0.githubusercontent.com/u/1938013?v=4" width="100px;" alt=""/><br /><sub><b>Dennison Bertram</b></sub></a><br /><a href="#ideas-crazyrabbitLTC" title="Ideas, Planning, & Feedback">🤔</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/arturgontijo"><img src="https://avatars0.githubusercontent.com/u/15108323?v=4" width="100px;" alt=""/><br /><sub><b>Artur Gontijo</b></sub></a><br /><a href="#ideas-arturgontijo" title="Ideas, Planning, & Feedback">🤔</a></td>
<td align="center"><a href="https://github.com/ethjoe"><img src="https://avatars0.githubusercontent.com/u/36374665?v=4" width="100px;" alt=""/><br /><sub><b>ethjoe</b></sub></a><br /><a href="#content-ethjoe" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/pulls?q=is%3Apr+reviewed-by%3Aethjoe" title="Reviewed Pull Requests">👀</a></td>
</tr>
</table>

Expand Down
20 changes: 9 additions & 11 deletions docs/.vuepress/components/ListCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
<article :class="{ 'has-meta': item.meta }">
<!-- h3 is overridden by the level prop. Default is 3 (h3) -->
<h3 class="l7 mb-0 mt-0 tc-text500 art-title" :is="itemTitleTag">
{{ item.title }}
<span v-html="inlineMd(item.title)" />
</h3>
<p v-if="item.subtitle" class="l7 mb-0 mt-0 tc-text100 art-subtitle">
{{ item.subtitle }}
<span v-html="inlineMd(item.subtitle)" />
</p>
<p
v-if="item.meta"
class="l7 mb-0 mt-0 tc-text100 art-meta flex flex-center"
>
{{ item.meta }}
<span v-html="inlineMd(item.meta)" />
</p>
</article>
</router-link>
Expand All @@ -34,16 +34,16 @@
<article :class="{ 'has-meta': item.meta }">
<!-- h3 is overridden by the level prop. Default is 3 (h3) -->
<h3 class="l7 mb-0 mt-0 tc-text500 art-title" :is="itemTitleTag">
{{ item.title }}
<span v-html="inlineMd(item.title)" />
</h3>
<p v-if="item.subtitle" class="l7 mb-0 mt-0 tc-text100 art-subtitle">
{{ item.subtitle }}
<span v-html="inlineMd(item.subtitle)" />
</p>
<p
v-if="item.meta"
class="l7 mb-0 mt-0 tc-text100 art-meta flex flex-center"
>
{{ item.meta }}
<span v-html="inlineMd(item.meta)" />
</p>
</article>
</a>
Expand All @@ -53,6 +53,7 @@

<script>
import { isExternal, ensureExt } from '../theme/utils/util'
const { inlineMd } = require('../theme/utils/inline-md')
export default {
name: 'list-card',
Expand All @@ -75,6 +76,7 @@ export default {
}
},
methods: {
inlineMd,
isExternal,
ensureExt
}
Expand Down Expand Up @@ -108,20 +110,16 @@ export default {
align-items center
grid-column 3
content '↗️'
grid-row 1/999
@media (min-width: $breakL)
&.has-meta
grid-template-columns auto 3fr 1fr auto
.art-title
grid-row 1
.art-subtitle
grid-row 2
.art-meta
grid-column 3
grid-row 1/999
&:after
grid-column 4
content '↗️'
.list-new
box-shadow 0px 14px 66px rgba(0, 0, 0, 0.07), 0px 10px 17px rgba(0, 0, 0, 0.03), 0px 4px 7px rgba(0, 0, 0, 0.05)
Expand Down
Binary file added docs/.vuepress/public/ef-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 7 additions & 19 deletions docs/.vuepress/theme/components/AlgoliaSearchBox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -254,16 +254,16 @@ export default {
.ds-suggestions
margin-top 0
.ds-suggestion
border-bottom 1px solid $colorBlack100
margin-bottom 4px
.algolia-docsearch-suggestion
border-color $colorBlack100
padding 0
.algolia-docsearch-suggestion--category-header
padding 5px 10px
margin-top 0
background $colorBlack300
color #fff
background #f1f3f5
font-weight 600
border none
.algolia-docsearch-suggestion--highlight
background rgba(255, 255, 255, 0.6)
.algolia-docsearch-suggestion--wrapper
Expand All @@ -273,14 +273,9 @@ export default {
margin-bottom 0
color $textColor
.algolia-docsearch-suggestion--subcategory-column
vertical-align top
padding 5px 7px 5px 5px
border-color $colorBlack100
background #f1f3f5
&:after
display none
.algolia-docsearch-suggestion--subcategory-column-text
color #555
display none
.algolia-docsearch-suggestion--text
font-size .9em
.algolia-docsearch-footer
border-color $colorBlack100
.ds-cursor .algolia-docsearch-suggestion--content
Expand Down Expand Up @@ -327,6 +322,7 @@ export default {
color $colorPrimaryDark !important
.algolia-docsearch-suggestion--category-header
background-color $colorBlack300 !important
color #fff !important
.result-title, .result-page, .algolia-docsearch-suggestion--category-header
color: $colorWhite500
.result-title + .result-page
Expand All @@ -342,14 +338,8 @@ export default {
.algolia-search-wrapper
.algolia-autocomplete
.algolia-docsearch-suggestion
.algolia-docsearch-suggestion--subcategory-column
float none
width 150px
min-width 150px
display table-cell
.algolia-docsearch-suggestion--content
float none
display table-cell
width 100%
vertical-align top
.ds-dropdown-menu
Expand All @@ -367,8 +357,6 @@ export default {
max-width calc(100vw - 4rem) !important
.algolia-docsearch-suggestion--wrapper
padding 5px 7px 5px 5px !important
.algolia-docsearch-suggestion--subcategory-column
display none !important
@media (max-width: $breakM)
.algolia-search-wrapper
Expand Down
5 changes: 5 additions & 0 deletions docs/.vuepress/theme/components/Footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,11 @@ export default {
{
title: translate('footer-ecosystem', this.$lang),
links: [
{
to: '/foundation/',
text: 'Ethereum Foundation',
display: true
},
{
to: 'https://blog.ethereum.org/',
text: 'Ethereum Foundation Blog',
Expand Down
8 changes: 8 additions & 0 deletions docs/.vuepress/theme/styles/theme.styl
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ ol

.twemoji-svg
height 1em
vertical-align text-bottom

h2, h3
.header-anchor
Expand Down Expand Up @@ -164,6 +165,13 @@ table
border 1px dotted $colorPrimary
box-shadow 0 4px 8px $boxShadowHoverColor

.ef-logo
max-width 40%
@media (max-width $breakM)
max-width 60%
@media (max-width $breakS)
max-width 100%

// BASE TEXT STYLES
// These target mainly our markdown content, and whenever a .l# class is not used
// They should eventually be moved out of utils.styl
Expand Down
2 changes: 1 addition & 1 deletion docs/.vuepress/theme/utils/inline-md.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ md.renderer.rules.emoji = (token, idx) => {
.url.split('/')
.pop()
// get svg file contents
let svg = require('twemoji/svg/' + file)
let svg = require('twemoji/v/latest/svg/' + file)
return `<img class="twemoji-svg" src="${svg}" />`
}

Expand Down
Loading

0 comments on commit 10e0516

Please sign in to comment.