Skip to content

Commit

Permalink
Merge pull request #899 from ethereum/dev
Browse files Browse the repository at this point in the history
Deploy v1.3.2
  • Loading branch information
samajammin authored Mar 30, 2020
2 parents fc30121 + dec262a commit f3fcb4b
Show file tree
Hide file tree
Showing 39 changed files with 302 additions and 293 deletions.
2 changes: 1 addition & 1 deletion docs/.vuepress/components/BuildPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ export default {
.resource
flex 1 1 25%
min-width 200px
@media (min-width: $breakS)
@media (min-width: $breakL)
flex 0 1 25%
.logo
Expand Down
50 changes: 25 additions & 25 deletions docs/.vuepress/components/CardList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ export default {
},
computed: {
classes() {
var desktop = 'a-m-col-' + this.desktopColumns
var tablet = 'a-s-col-' + this.tabletColumns
var smallTablet = 'a-xs-col-' + this.smallTabletColumns
var base = 'grid col-1'
var desktop = 'l-up-col-' + this.desktopColumns
var tablet = 'm-up-col-' + this.tabletColumns
var smallTablet = 's-up-col-' + this.smallTabletColumns
var base = 'grid'
return [desktop, tablet, smallTablet, base]
}
}
Expand Down Expand Up @@ -72,45 +72,45 @@ export default {
.col-6
grid-template-columns repeat(6, 1fr)
@media screen and (min-width: $breakXS)
.a-xs-col-1
@media screen and (min-width: $breakS)
.s-up-col-1
grid-template-columns 1fr
.a-xs-col-2
.s-up-col-2
grid-template-columns repeat(2, 1fr)
.a-xs-col-3
.s-up-col-3
grid-template-columns repeat(3, 1fr)
.a-xs-col-4
.s-up-col-4
grid-template-columns repeat(4, 1fr)
.a-xs-col-5
.s-up-col-5
grid-template-columns repeat(5, 1fr)
.a-xs-col-6
.s-up-col-6
grid-template-columns repeat(6, 1fr)
@media screen and (min-width: $breakS)
.a-s-col-1
@media screen and (min-width: $breakM)
.m-up-col-1
grid-template-columns 1fr
.a-s-col-2
.m-up-col-2
grid-template-columns repeat(2, 1fr)
.a-s-col-3
.m-up-col-3
grid-template-columns repeat(3, 1fr)
.a-s-col-4
.m-up-col-4
grid-template-columns repeat(4, 1fr)
.a-s-col-5
.m-up-col-5
grid-template-columns repeat(5, 1fr)
.a-s-col-6
.m-up-col-6
grid-template-columns repeat(6, 1fr)
@media screen and (min-width: $breakM)
.a-m-col-1
@media screen and (min-width: $breakL)
.l-up-col-1
grid-template-columns 1fr
.a-m-col-2
.l-up-col-2
grid-template-columns repeat(2, 1fr)
.a-m-col-3
.l-up-col-3
grid-template-columns repeat(3, 1fr)
.a-m-col-4
.l-up-col-4
grid-template-columns repeat(4, 1fr)
.a-m-col-5
.l-up-col-5
grid-template-columns repeat(5, 1fr)
.a-m-col-6
.l-up-col-6
grid-template-columns repeat(6, 1fr)
</style>
2 changes: 1 addition & 1 deletion docs/.vuepress/components/HomePage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default {
introBlockClasses() {
return {
'intro-blocks flex flex-wrap pt-5': true,
'max-w-768px': this.contentVersion() < 1.1
'max-w-m': this.contentVersion() < 1.1
}
},
introBlocks() {
Expand Down
4 changes: 2 additions & 2 deletions docs/.vuepress/components/ListCard.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="list-new max-w-768px">
<div class="list-new max-w-m">
<template v-for="(item, i) in items">
<router-link
v-if="!isExternal(ensureExt(item.link))"
Expand Down Expand Up @@ -109,7 +109,7 @@ export default {
grid-column 3
content '↗️'
@media (min-width: $breakM)
@media (min-width: $breakL)
&.has-meta
grid-template-columns auto 3fr 1fr auto
.art-title
Expand Down
74 changes: 42 additions & 32 deletions docs/.vuepress/components/RandomAppList.vue
Original file line number Diff line number Diff line change
@@ -1,42 +1,52 @@
<template>
<RandomList :n="4" :items="items"></RandomList>
<RandomList :n="7" :items="items"></RandomList>
</template>

<script>
/*
*
*/
import RandomList from './RandomList.vue'
export default {
components: { RandomList },
components: { RandomList },
data() {
const items = [
{
name: "Gitcoin",
url: "https://gitcoin.co",
description: "a network of incentivized open-source developers"
},
{
name: "Cent",
url: "https://beta.cent.co",
description: "a social network where you can earn money by posting"
},
{
name: "CryptoKitties",
url: "https://www.cryptokitties.co",
description: "a game where you collect and breed digital collectible cats"
},
{
name: "DAI",
url: "https://makerdao.com/en/",
description: "a stable cryptocurrency that holds value at $1 USD"
}
];
return {items}
}
data() {
const items = [
{
name: 'Gitcoin',
url: 'https://gitcoin.co',
description: 'a network of incentivized open-source developers'
},
{
name: 'Cent',
url: 'https://beta.cent.co',
description: 'a social network where you can earn money by posting'
},
{
name: 'Gods Unchained',
url: 'https://godsunchained.com/',
description: 'a competitive collectible card game'
},
{
name: 'DAI',
url: 'https://makerdao.com/en/',
description: 'a stable cryptocurrency that holds value at $1 USD'
},
{
name: 'Decentraland',
url: 'https://decentraland.org/',
description: 'a virtual world owned and built by its users'
},
{
name: 'Dharma',
url: 'https://www.dharma.io/',
description: 'the easiest way to earn interest on your cryptocurrency'
},
{
name: 'Augur',
url: 'https://www.augur.net/',
description: 'The world’s most accessible, no-limit betting exchange'
}
]
return { items }
}
}
</script>
2 changes: 1 addition & 1 deletion docs/.vuepress/theme/Layout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export default {
return [
{
home: this.isLandingPage,
'pt-4 md-up-pt-8': !this.isHomePage,
'pt-4 l-up-pt-8': !this.isHomePage,
'has-sidebar': this.showSidebar,
'sidebar-open': this.isSidebarOpen,
'dark-mode': this.isDarkMode,
Expand Down
2 changes: 1 addition & 1 deletion docs/.vuepress/theme/NotFound.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default {
pageClasses() {
return [
{
'pt-4 md-up-pt-8': true,
'pt-4 l-up-pt-8': true,
'dark-mode': this.darkMode
}
]
Expand Down
88 changes: 34 additions & 54 deletions docs/.vuepress/theme/components/Footer.vue
Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
<template>
<footer class="footer pt-3 pb-4" id="footer">
<div class="top-row">
<footer class="footer flex flex-wrap space-between pt-3 pb-4" id="footer">
<div class="flex flex-wrap space-between w-100 flex-center">
<p class="flex flex-center l8 tc-text200">
<Icon :name="footerLogoVersion" size="48" /> {{ lastUpdatedText }}:
{{ lastUpdatedDate }}
</p>
<!-- Generate our social icons -->
<ul class="social-links">
<li class="social-link ml-1" v-for="item in socialLinks">
<a
:href="item.to"
target="_blank"
rel="noopener noreferrer"
class="hide-icon"
:aria-labelledby="item.icon + '-link'"
>
<icon
:name="item.icon"
size="36"
class="fill-text100 fill-h-text300"
/>
</a>
</li>
<ul class="social-links no-bullets pl-0 flex">
<template v-for="(item, i) in socialLinks">
<li :class="`social-link flex ma-0 ${i != 0 ? 'ml-05' : ''}`">
<a
:href="item.to"
target="_blank"
rel="noopener noreferrer"
class="flex hide-icon"
:aria-labelledby="item.icon + '-link'"
>
<icon :name="item.icon" size="36" />
</a>
</li>
</template>
</ul>
</div>
<!-- Generate multiple lists -->
<div v-for="linkCluster in links" class="list-block">
<div v-for="(linkCluster, i) in links" class="list-block pr-2">
<h3 class="l8 c-text500">
<b>{{ linkCluster.title }}</b>
</h3>
Expand Down Expand Up @@ -224,47 +222,29 @@ export default {
</script>

<style lang="stylus">
// @require '../styles/config';
// move forwards with json objects or CSS vars
json('../styles/media-queries.json');
@require '../styles/config';
footer
width 85vw
max-width $contentWidthXL
max-width $breakXL
margin 0 auto
display flex
flex-wrap wrap
justify-content space-between
// Set padding at breakpoints
@media L
padding-bottom 128px
padding-top 64px
.top-row
display flex
justify-content space-between
flex 1 0 100%
flex-wrap wrap
align-items center
.list-block
min-width: 300px
@media (min-width: $breakL)
min-width initial
footer
.social-links
display flex
.social-link
margin 0
display flex
.social-link:not(first-of-type)
marginLeft 1rem
a
display flex
svg path
fill $subduedColor
&:hover
svg path
fill $colorPrimary
.list-block
flex 1
//set fuzzy widths to force reflow into 1, 2 or 4 columns
min-width 100%
@media M
min-width 40%
@media L
min-width 20%
.dark-mode footer
.social-links
a:hover
svg path
fill $colorPrimaryDark
</style>
8 changes: 4 additions & 4 deletions docs/.vuepress/theme/components/NavDropdown.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
:aria-label="`Select ${item.text.toLowerCase()}`"
>
<span
class="dropdown-title flex flex-center ma-1 mr-0 ml-0 md-up-ma-0 md-up-pt-05 md-up-pb-05"
class="dropdown-title flex flex-center ma-1 mr-0 ml-0 l-up-ma-0 l-up-pt-05 l-up-pb-05"
>{{ item.text }}<icon class="chevron-icon hidden" name="chevron-down"
/></span>
<ul
class="dropdown-items no-bullets ma-0 pa-0 md-up-pt-05 md-up-pb-05 md-up-hidden md-up-absolute"
class="dropdown-items no-bullets ma-0 pa-0 l-up-pt-05 l-up-pb-05 l-up-hidden l-up-absolute"
>
<li
class="dropdown-item ma-0 pa-0"
Expand All @@ -24,7 +24,7 @@
<NavLink
tabindex="-1"
:item="subItem"
childClass="link-item child-link-item block mb-1 md-up-m-0 md-up-pa-05 md-up-pl-05 md-up-pr-05"
childClass="link-item child-link-item block mb-1 l-up-m-0 l-up-pa-05 l-up-pl-05 l-up-pr-05"
@nav-toggle="$emit('nav-toggle', false)"
/>
</li>
Expand Down Expand Up @@ -131,7 +131,7 @@ export default {
.router-link-exact-active
color $colorPrimaryDark500
@media (min-width: $breakM)
@media (min-width: $breakL)
.dropdown-title
.chevron-icon
display inline-block
Expand Down
Loading

0 comments on commit f3fcb4b

Please sign in to comment.