Skip to content

Commit

Permalink
Merge pull request #775 from ethereum/dev
Browse files Browse the repository at this point in the history
Deploy v 1.10.0
  • Loading branch information
samajammin authored Feb 22, 2020
2 parents ccd277e + cf2dc57 commit 7a251f7
Show file tree
Hide file tree
Showing 44 changed files with 483 additions and 271 deletions.
12 changes: 11 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -1334,7 +1334,8 @@
"avatar_url": "https://avatars1.githubusercontent.com/u/4670881?v=4",
"profile": "http://carlfairclough.me",
"contributions": [
"design"
"design",
"code"
]
},
{
Expand All @@ -1345,6 +1346,15 @@
"contributions": [
"content"
]
},
{
"login": "mhatvan",
"name": "Markus Hatvan",
"avatar_url": "https://avatars2.githubusercontent.com/u/16797721?v=4",
"profile": "https://github.com/mhatvan",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
Expand Down
5 changes: 3 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-146-orange.svg?style=flat-square)](#contributors)
[![All Contributors](https://img.shields.io/badge/all_contributors-147-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,8 +413,9 @@ 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></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="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>
</table>

Expand Down
128 changes: 128 additions & 0 deletions docs/.vuepress/components/Icon.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
<template>
<svg
v-bind="$attrs"
xmlns="http://www.w3.org/2000/svg"
:width="size"
:height="size"
viewBox="0 0 24 24"
fill="none"
:aria-labelledby="name"
role="presentation"
>
<title :id="name" lang="en">{{ name }} icon</title>
<path
v-if="name == 'github'"
:class="pathClass"
d="M12 2C10.6868 2 9.38642 2.25866 8.17317 2.7612C6.95991 3.26375 5.85752 4.00035 4.92893 4.92893C3.05357 6.8043 2 9.34784 2 12C2 16.42 4.87 20.17 8.84 21.5C9.34 21.58 9.5 21.27 9.5 21C9.5 20.77 9.5 20.14 9.5 19.31C6.73 19.91 6.14 17.97 6.14 17.97C5.68 16.81 5.03 16.5 5.03 16.5C4.12 15.88 5.1 15.9 5.1 15.9C6.1 15.97 6.63 16.93 6.63 16.93C7.5 18.45 8.97 18 9.54 17.76C9.63 17.11 9.89 16.67 10.17 16.42C7.95 16.17 5.62 15.31 5.62 11.5C5.62 10.39 6 9.5 6.65 8.79C6.55 8.54 6.2 7.5 6.75 6.15C6.75 6.15 7.59 5.88 9.5 7.17C10.29 6.95 11.15 6.84 12 6.84C12.85 6.84 13.71 6.95 14.5 7.17C16.41 5.88 17.25 6.15 17.25 6.15C17.8 7.5 17.45 8.54 17.35 8.79C18 9.5 18.38 10.39 18.38 11.5C18.38 15.32 16.04 16.16 13.81 16.41C14.17 16.72 14.5 17.33 14.5 18.26C14.5 19.6 14.5 20.68 14.5 21C14.5 21.27 14.66 21.59 15.17 21.5C19.14 20.16 22 16.42 22 12C22 10.6868 21.7413 9.38642 21.2388 8.17317C20.7362 6.95991 19.9997 5.85752 19.0711 4.92893C18.1425 4.00035 17.0401 3.26375 15.8268 2.7612C14.6136 2.25866 13.3132 2 12 2Z"
/>

<path
v-else-if="name == 'twitter'"
:class="pathClass"
fill-rule="evenodd"
clip-rule="evenodd"
d="M12 2C17.5191 2 22 6.48086 22 12C22 17.5191 17.5191 22 12 22C6.48086 22 2 17.5191 2 12C2 6.48086 6.48086 2 12 2ZM10.2386 17.3187C14.6637 17.3187 17.0833 13.6519 17.0833 10.474C17.0833 10.3693 17.0833 10.2645 17.0783 10.1647C17.5473 9.82547 17.9564 9.40141 18.2806 8.9175C17.8516 9.10707 17.3876 9.2368 16.8987 9.29664C17.3976 8.9973 17.7768 8.52836 17.9564 7.96465C17.4924 8.23902 16.9786 8.43855 16.4298 8.54832C15.9907 8.07937 15.3671 7.79004 14.6737 7.79004C13.3467 7.79004 12.2691 8.86762 12.2691 10.1946C12.2691 10.3842 12.2891 10.5688 12.3339 10.7434C10.3334 10.6436 8.56238 9.68578 7.37508 8.22902C7.17051 8.58324 7.05078 8.9973 7.05078 9.43633C7.05078 10.2695 7.47484 11.0078 8.1234 11.4368C7.72926 11.4269 7.36008 11.3171 7.03582 11.1375V11.1675C7.03582 12.3348 7.86395 13.3027 8.96648 13.5272C8.76695 13.582 8.55242 13.612 8.33293 13.612C8.17824 13.612 8.02859 13.597 7.87895 13.5671C8.18324 14.5249 9.07125 15.2184 10.1239 15.2383C9.30074 15.8819 8.26309 16.2661 7.13559 16.2661C6.94102 16.2661 6.75145 16.2561 6.56187 16.2311C7.61453 16.9196 8.88168 17.3187 10.2386 17.3187Z"
/>
<path
v-else-if="name == 'youtube'"
:class="pathClass"
d="M17 10.5V7C17 6.73478 16.8946 6.48043 16.7071 6.29289C16.5196 6.10536 16.2652 6 16 6H4C3.73478 6 3.48043 6.10536 3.29289 6.29289C3.10536 6.48043 3 6.73478 3 7V17C3 17.2652 3.10536 17.5196 3.29289 17.7071C3.48043 17.8946 3.73478 18 4 18H16C16.2652 18 16.5196 17.8946 16.7071 17.7071C16.8946 17.5196 17 17.2652 17 17V13.5L21 17.5V6.5L17 10.5Z"
/>

<path
v-else-if="name == 'language'"
:class="pathClass"
d="M11.99 2C6.47 2 2 6.48 2 12C2 17.52 6.47 22 11.99 22C17.52 22 22 17.52 22 12C22 6.48 17.52 2 11.99 2ZM18.92 8H15.97C15.65 6.75 15.19 5.55 14.59 4.44C16.43 5.07 17.96 6.35 18.92 8ZM12 4.04C12.83 5.24 13.48 6.57 13.91 8H10.09C10.52 6.57 11.17 5.24 12 4.04ZM4.26 14C4.1 13.36 4 12.69 4 12C4 11.31 4.1 10.64 4.26 10H7.64C7.56 10.66 7.5 11.32 7.5 12C7.5 12.68 7.56 13.34 7.64 14H4.26ZM5.08 16H8.03C8.35 17.25 8.81 18.45 9.41 19.56C7.57 18.93 6.04 17.66 5.08 16ZM8.03 8H5.08C6.04 6.34 7.57 5.07 9.41 4.44C8.81 5.55 8.35 6.75 8.03 8ZM12 19.96C11.17 18.76 10.52 17.43 10.09 16H13.91C13.48 17.43 12.83 18.76 12 19.96ZM14.34 14H9.66C9.57 13.34 9.5 12.68 9.5 12C9.5 11.32 9.57 10.65 9.66 10H14.34C14.43 10.65 14.5 11.32 14.5 12C14.5 12.68 14.43 13.34 14.34 14ZM14.59 19.56C15.19 18.45 15.65 17.25 15.97 16H18.92C17.96 17.65 16.43 18.93 14.59 19.56ZM16.36 14C16.44 13.34 16.5 12.68 16.5 12C16.5 11.32 16.44 10.66 16.36 10H19.74C19.9 10.64 20 11.31 20 12C20 12.69 19.9 13.36 19.74 14H16.36Z"
/>

<path
v-else-if="name == 'podcast'"
:class="pathClass"
d="M17 18.25V21.5H7V18.25C7 16.87 9.24 15.75 12 15.75C14.76 15.75 17 16.87 17 18.25ZM12 5.5C13.7239 5.5 15.3772 6.18482 16.5962 7.40381C17.8152 8.62279 18.5 10.2761 18.5 12C18.5 13.25 18.15 14.42 17.54 15.41L16 14.04C16.32 13.43 16.5 12.73 16.5 12C16.5 9.5 14.5 7.5 12 7.5C9.5 7.5 7.5 9.5 7.5 12C7.5 12.73 7.68 13.43 8 14.04L6.46 15.41C5.85 14.42 5.5 13.25 5.5 12C5.5 10.2761 6.18482 8.62279 7.40381 7.40381C8.62279 6.18482 10.2761 5.5 12 5.5ZM12 1.5C14.7848 1.5 17.4555 2.60625 19.4246 4.57538C21.3938 6.54451 22.5 9.21523 22.5 12C22.5 14.28 21.77 16.39 20.54 18.11L19.04 16.76C19.96 15.4 20.5 13.76 20.5 12C20.5 9.74566 19.6045 7.58365 18.0104 5.98959C16.4163 4.39553 14.2543 3.5 12 3.5C9.74566 3.5 7.58365 4.39553 5.98959 5.98959C4.39553 7.58365 3.5 9.74566 3.5 12C3.5 13.76 4.04 15.4 4.96 16.76L3.46 18.11C2.23 16.39 1.5 14.28 1.5 12C1.5 9.21523 2.60625 6.54451 4.57538 4.57538C6.54451 2.60625 9.21523 1.5 12 1.5ZM12 9.5C12.663 9.5 13.2989 9.76339 13.7678 10.2322C14.2366 10.7011 14.5 11.337 14.5 12C14.5 12.663 14.2366 13.2989 13.7678 13.7678C13.2989 14.2366 12.663 14.5 12 14.5C11.337 14.5 10.7011 14.2366 10.2322 13.7678C9.76339 13.2989 9.5 12.663 9.5 12C9.5 11.337 9.76339 10.7011 10.2322 10.2322C10.7011 9.76339 11.337 9.5 12 9.5Z"
/>

<path
v-else-if="name == 'chevron-down'"
:class="pathClass"
d="M7.41 8.58002L12 13.17L16.59 8.58002L18 10L12 16L6 10L7.41 8.58002Z"
/>

<path
v-else-if="name == 'chevron-right'"
:class="pathClass"
d="M8.59 16.58L13.17 12L8.59 7.41L10 6L16 12L10 18L8.59 16.58Z"
/>

<path
v-else-if="name == 'close'"
:class="pathClass"
d="M19 6.41L17.59 5L12 10.59L6.41 5L5 6.41L10.59 12L5 17.59L6.41 19L12 13.41L17.59 19L19 17.59L13.41 12L19 6.41Z"
/>

<path
v-else-if="name == 'menu'"
:class="pathClass"
d="M3 6H21V8H3V6ZM3 11H21V13H3V11ZM3 16H21V18H3V16Z"
/>

<path
v-else-if="name == 'search'"
:class="pathClass"
fill-rule="evenodd"
clip-rule="evenodd"
d="M16.6177 18.0319C15.078 19.2635 13.125 20 11 20C6.02944 20 2 15.9706 2 11C2 6.02944 6.02944 2 11 2C15.9706 2 20 6.02944 20 11C20 13.125 19.2635 15.078 18.0319 16.6177L22.3225 20.9083L20.9083 22.3225L16.6177 18.0319ZM18 11C18 14.866 14.866 18 11 18C7.13401 18 4 14.866 4 11C4 7.13401 7.13401 4 11 4C14.866 4 18 7.13401 18 11Z"
/>
<path
v-else-if="name == 'darkmode'"
:class="pathClass"
fill-rule="evenodd"
clip-rule="evenodd"
d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22ZM11.0909 11.9999C11.0909 15.03 12.4386 17.7453 14.5672 19.5792C13.7614 19.852 12.898 19.9999 12 19.9999C7.58173 19.9999 4.00001 16.4182 4.00001 11.9999C4.00001 7.58167 7.58173 3.99994 12 3.99994C12.898 3.99994 13.7614 4.14789 14.5672 4.42074C12.4386 6.25459 11.0909 8.96989 11.0909 11.9999Z"
/>

<path
v-else-if="name == 'lightmode'"
:class="pathClass"
fill-rule="evenodd"
clip-rule="evenodd"
d="M11 20L13 20L13 23L11 23L11 20ZM11 4L11 0.999999L13 0.999999L13 4L11 4ZM23 11L20 11L20 13L23 13L23 11ZM0.999999 11L4 11L4 13L0.999999 13L0.999999 11ZM4.92886 3.51474L3.51465 4.92895L5.63597 7.05027L7.05018 5.63606L4.92886 3.51474ZM16.9497 18.364L18.3639 16.9498L20.4852 19.0711L19.071 20.4853L16.9497 18.364ZM19.071 3.51466L16.9497 5.63598L18.3639 7.0502L20.4852 4.92888L19.071 3.51466ZM3.51465 19.071L5.63597 16.9497L7.05018 18.3639L4.92886 20.4853L3.51465 19.071ZM18 12C18 15.3137 15.3137 18 12 18C8.68629 18 6 15.3137 6 12C6 8.68629 8.68629 6 12 6C15.3137 6 18 8.68629 18 12ZM16 12C16 14.2091 14.2091 16 12 16C9.79087 16 8.00001 14.2091 8.00001 12C8.00001 9.79087 9.79087 8.00001 12 8.00001C14.2091 8.00001 16 9.79087 16 12Z"
/>
</svg>
</template>

<script>
export default {
name: 'icon',
props: {
isDarkMode: {
type: Boolean,
default: false
},
name: {
type: String,
required: true
},
size: {
type: [Number, String],
default: 24
},
darkModeClass: {
type: String,
default: null
},
lightModeClass: {
type: String,
default: null
}
},
computed: {
pathClass() {
if (this.isDarkMode) {
return this.darkModeClass
} else {
return this.lightModeClass
}
}
}
}
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ exports[`AssetItem render icon successfully 1`] = `
>
<a
href="[object Object]"
rel="noopener noreferrer"
target="_blank"
>
<img
Expand All @@ -23,6 +24,7 @@ exports[`AssetItem render icon successfully 1`] = `
<span>
<a
href="[object Object]"
rel="noopener noreferrer"
target="_blank"
>
PNG
Expand All @@ -35,6 +37,7 @@ exports[`AssetItem render icon successfully 1`] = `
<a
href="[object Object]"
rel="noopener noreferrer"
target="_blank"
>
SVG
Expand All @@ -47,6 +50,7 @@ exports[`AssetItem render icon successfully 1`] = `
<a
href="[object Object]"
rel="noopener noreferrer"
target="_blank"
>
JPG
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ exports[`DefaultList list items 1`] = `
>
Bitcoin
</a>
, The 1st Crytocurrency in the world
, The 1st Crytocurrency in the world
</li>
<li>
<a
Expand All @@ -20,8 +20,8 @@ exports[`DefaultList list items 1`] = `
>
Ethereum
</a>
, The smart contract blockchain
, The smart contract blockchain
</li>
</ul>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ exports[`HomePage render successfully with Deutsch 1`] = `
<div
class="headline-subtitle"
>
Auf Ethereum kannst du Code schreiben, der digitale Werte verwaltet, der exakt wie programmiert ausgeführt wird und der von überall auf der Welt zugänglich ist.
</div>
<router-link-stub
class="button headline-button"
to="/beginners/"
to="/de/what-is-ethereum/"
>
Learn more
</router-link-stub>
Expand All @@ -35,7 +37,7 @@ exports[`HomePage render successfully with Deutsch 1`] = `
>
<h3>
<router-link-stub
to="/de/beginners/"
to="/de/what-is-ethereum/"
>
<span
class="arrow"
Expand All @@ -53,7 +55,7 @@ exports[`HomePage render successfully with Deutsch 1`] = `
>
<router-link-stub
class="black"
to="/de/beginners/"
to="/de/what-is-ethereum/"
>
Neu bei Ethereum?
Expand All @@ -64,7 +66,7 @@ exports[`HomePage render successfully with Deutsch 1`] = `
<li>
<router-link-stub
class="black"
to="/de/beginners/"
to="/de/what-is-ethereum/"
>
Was ist Ethereum?
Expand All @@ -75,7 +77,7 @@ exports[`HomePage render successfully with Deutsch 1`] = `
<li>
<router-link-stub
class="black"
to="/de/beginners/"
to="/de/what-is-ethereum/"
>
Welchen Nutzen bringt es mir?
Expand Down Expand Up @@ -212,14 +214,16 @@ exports[`HomePage render successfully with Deutsch 1`] = `
<li>
<router-link-stub
class="black"
to="/de/build"
to="/de/developers/#getting-started"
>
Erste Schritte
</router-link-stub>
</li>
<!---->
<li>
<router-link-stub
class="black"
Expand Down Expand Up @@ -263,12 +267,14 @@ exports[`HomePage show enterprise with en-US 1`] = `
<div
class="headline-subtitle"
>
On Ethereum, you can write code that controls digital value, runs exactly as programmed, and is accessible anywhere in the world.
</div>
<router-link-stub
class="button headline-button"
to="/beginners/"
to="/what-is-ethereum/"
>
Learn more
</router-link-stub>
Expand Down Expand Up @@ -298,7 +304,7 @@ exports[`HomePage show enterprise with en-US 1`] = `
>
<router-link-stub
class="black"
to="/beginners/"
to="/what-is-ethereum/"
>
What is Ethereum?
Expand All @@ -309,7 +315,7 @@ exports[`HomePage show enterprise with en-US 1`] = `
<li>
<router-link-stub
class="black"
to="/use/"
to="/dapps/"
>
Use Ethereum
Expand All @@ -327,6 +333,17 @@ exports[`HomePage show enterprise with en-US 1`] = `
</router-link-stub>
</li>
<li>
<router-link-stub
class="black"
to="/community/"
>
Ethereum Community
</router-link-stub>
</li>
</ul>
</div>
Expand Down Expand Up @@ -354,10 +371,12 @@ exports[`HomePage show enterprise with en-US 1`] = `
</h3>
<ul>
<!---->
<li>
<router-link-stub
class="black"
to="/build"
to="/build/"
>
Getting started guides
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ exports[`LanguagesPage render page after querying incomplete languages from crow
<a
class="lang-item border-box-shadow-hover"
href="https://crowdin.com/project/ethereumfoundation/ph"
rel="noopener noreferrer"
target="_blank"
>
<div
Expand All @@ -90,6 +91,7 @@ exports[`LanguagesPage render page after querying incomplete languages from crow
<a
href="https://crowdin.com/project/ethereumfoundation/ph"
rel="noopener noreferrer"
target="_blank"
>
Contribute
Expand All @@ -98,6 +100,7 @@ exports[`LanguagesPage render page after querying incomplete languages from crow
<a
class="lang-item border-box-shadow-hover"
href="https://crowdin.com/project/ethereumfoundation/gu"
rel="noopener noreferrer"
target="_blank"
>
<div
Expand All @@ -116,6 +119,7 @@ exports[`LanguagesPage render page after querying incomplete languages from crow
<a
href="https://crowdin.com/project/ethereumfoundation/gu"
rel="noopener noreferrer"
target="_blank"
>
Contribute
Expand Down
Loading

0 comments on commit 7a251f7

Please sign in to comment.