Skip to content

Commit f3fcb4b

Browse files
samajamminsamajammin
authored
Merge pull request #899 from ethereum/dev
Deploy v1.3.2
2 parents fc30121 + dec262a commit f3fcb4b

File tree

39 files changed

+302
-293
lines changed

39 files changed

+302
-293
lines changed

‎docs/.vuepress/components/BuildPage.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ export default {
245245
.resource
246246
flex 1 1 25%
247247
min-width 200px
248-
@media (min-width: $breakS)
248+
@media (min-width: $breakL)
249249
flex 0 1 25%
250250
251251
.logo

‎docs/.vuepress/components/CardList.vue‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ export default {
4141
},
4242
computed: {
4343
classes() {
44-
var desktop = 'a-m-col-' + this.desktopColumns
45-
var tablet = 'a-s-col-' + this.tabletColumns
46-
var smallTablet = 'a-xs-col-' + this.smallTabletColumns
47-
var base = 'grid col-1'
44+
var desktop = 'l-up-col-' + this.desktopColumns
45+
var tablet = 'm-up-col-' + this.tabletColumns
46+
var smallTablet = 's-up-col-' + this.smallTabletColumns
47+
var base = 'grid'
4848
return [desktop, tablet, smallTablet, base]
4949
}
5050
}
@@ -72,45 +72,45 @@ export default {
7272
.col-6
7373
grid-template-columns repeat(6, 1fr)
7474
75-
@media screen and (min-width: $breakXS)
76-
.a-xs-col-1
75+
@media screen and (min-width: $breakS)
76+
.s-up-col-1
7777
grid-template-columns 1fr
78-
.a-xs-col-2
78+
.s-up-col-2
7979
grid-template-columns repeat(2, 1fr)
80-
.a-xs-col-3
80+
.s-up-col-3
8181
grid-template-columns repeat(3, 1fr)
82-
.a-xs-col-4
82+
.s-up-col-4
8383
grid-template-columns repeat(4, 1fr)
84-
.a-xs-col-5
84+
.s-up-col-5
8585
grid-template-columns repeat(5, 1fr)
86-
.a-xs-col-6
86+
.s-up-col-6
8787
grid-template-columns repeat(6, 1fr)
8888
89-
@media screen and (min-width: $breakS)
90-
.a-s-col-1
89+
@media screen and (min-width: $breakM)
90+
.m-up-col-1
9191
grid-template-columns 1fr
92-
.a-s-col-2
92+
.m-up-col-2
9393
grid-template-columns repeat(2, 1fr)
94-
.a-s-col-3
94+
.m-up-col-3
9595
grid-template-columns repeat(3, 1fr)
96-
.a-s-col-4
96+
.m-up-col-4
9797
grid-template-columns repeat(4, 1fr)
98-
.a-s-col-5
98+
.m-up-col-5
9999
grid-template-columns repeat(5, 1fr)
100-
.a-s-col-6
100+
.m-up-col-6
101101
grid-template-columns repeat(6, 1fr)
102102
103-
@media screen and (min-width: $breakM)
104-
.a-m-col-1
103+
@media screen and (min-width: $breakL)
104+
.l-up-col-1
105105
grid-template-columns 1fr
106-
.a-m-col-2
106+
.l-up-col-2
107107
grid-template-columns repeat(2, 1fr)
108-
.a-m-col-3
108+
.l-up-col-3
109109
grid-template-columns repeat(3, 1fr)
110-
.a-m-col-4
110+
.l-up-col-4
111111
grid-template-columns repeat(4, 1fr)
112-
.a-m-col-5
112+
.l-up-col-5
113113
grid-template-columns repeat(5, 1fr)
114-
.a-m-col-6
114+
.l-up-col-6
115115
grid-template-columns repeat(6, 1fr)
116116
</style>

‎docs/.vuepress/components/HomePage.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export default {
5050
introBlockClasses() {
5151
return {
5252
'intro-blocks flex flex-wrap pt-5': true,
53-
'max-w-768px': this.contentVersion() < 1.1
53+
'max-w-m': this.contentVersion() < 1.1
5454
}
5555
},
5656
introBlocks() {

‎docs/.vuepress/components/ListCard.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<div class="list-new max-w-768px">
2+
<div class="list-new max-w-m">
33
<template v-for="(item, i) in items">
44
<router-link
55
v-if="!isExternal(ensureExt(item.link))"
@@ -109,7 +109,7 @@ export default {
109109
grid-column 3
110110
content '↗️'
111111
112-
@media (min-width: $breakM)
112+
@media (min-width: $breakL)
113113
&.has-meta
114114
grid-template-columns auto 3fr 1fr auto
115115
.art-title

‎docs/.vuepress/components/RandomAppList.vue‎

Lines changed: 42 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,52 @@
11
<template>
2-
<RandomList :n="4" :items="items"></RandomList>
2+
<RandomList :n="7" :items="items"></RandomList>
33
</template>
44

55
<script>
6-
7-
/*
8-
*
9-
*/
10-
116
import RandomList from './RandomList.vue'
127
138
export default {
14-
components: { RandomList },
9+
components: { RandomList },
1510
16-
data() {
17-
const items = [
18-
{
19-
name: "Gitcoin",
20-
url: "https://gitcoin.co",
21-
description: "a network of incentivized open-source developers"
22-
},
23-
{
24-
name: "Cent",
25-
url: "https://beta.cent.co",
26-
description: "a social network where you can earn money by posting"
27-
},
28-
{
29-
name: "CryptoKitties",
30-
url: "https://www.cryptokitties.co",
31-
description: "a game where you collect and breed digital collectible cats"
32-
},
33-
{
34-
name: "DAI",
35-
url: "https://makerdao.com/en/",
36-
description: "a stable cryptocurrency that holds value at $1 USD"
37-
}
38-
];
39-
return {items}
40-
}
11+
data() {
12+
const items = [
13+
{
14+
name: 'Gitcoin',
15+
url: 'https://gitcoin.co',
16+
description: 'a network of incentivized open-source developers'
17+
},
18+
{
19+
name: 'Cent',
20+
url: 'https://beta.cent.co',
21+
description: 'a social network where you can earn money by posting'
22+
},
23+
{
24+
name: 'Gods Unchained',
25+
url: 'https://godsunchained.com/',
26+
description: 'a competitive collectible card game'
27+
},
28+
{
29+
name: 'DAI',
30+
url: 'https://makerdao.com/en/',
31+
description: 'a stable cryptocurrency that holds value at $1 USD'
32+
},
33+
{
34+
name: 'Decentraland',
35+
url: 'https://decentraland.org/',
36+
description: 'a virtual world owned and built by its users'
37+
},
38+
{
39+
name: 'Dharma',
40+
url: 'https://www.dharma.io/',
41+
description: 'the easiest way to earn interest on your cryptocurrency'
42+
},
43+
{
44+
name: 'Augur',
45+
url: 'https://www.augur.net/',
46+
description: 'The world’s most accessible, no-limit betting exchange'
47+
}
48+
]
49+
return { items }
50+
}
4151
}
4252
</script>

‎docs/.vuepress/theme/Layout.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ export default {
121121
return [
122122
{
123123
home: this.isLandingPage,
124-
'pt-4 md-up-pt-8': !this.isHomePage,
124+
'pt-4 l-up-pt-8': !this.isHomePage,
125125
'has-sidebar': this.showSidebar,
126126
'sidebar-open': this.isSidebarOpen,
127127
'dark-mode': this.isDarkMode,

‎docs/.vuepress/theme/NotFound.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default {
3535
pageClasses() {
3636
return [
3737
{
38-
'pt-4 md-up-pt-8': true,
38+
'pt-4 l-up-pt-8': true,
3939
'dark-mode': this.darkMode
4040
}
4141
]

‎docs/.vuepress/theme/components/Footer.vue‎

Lines changed: 34 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,29 @@
11
<template>
2-
<footer class="footer pt-3 pb-4" id="footer">
3-
<div class="top-row">
2+
<footer class="footer flex flex-wrap space-between pt-3 pb-4" id="footer">
3+
<div class="flex flex-wrap space-between w-100 flex-center">
44
<p class="flex flex-center l8 tc-text200">
55
<Icon :name="footerLogoVersion" size="48" /> {{ lastUpdatedText }}:
66
{{ lastUpdatedDate }}
77
</p>
88
<!-- Generate our social icons -->
9-
<ul class="social-links">
10-
<li class="social-link ml-1" v-for="item in socialLinks">
11-
<a
12-
:href="item.to"
13-
target="_blank"
14-
rel="noopener noreferrer"
15-
class="hide-icon"
16-
:aria-labelledby="item.icon + '-link'"
17-
>
18-
<icon
19-
:name="item.icon"
20-
size="36"
21-
class="fill-text100 fill-h-text300"
22-
/>
23-
</a>
24-
</li>
9+
<ul class="social-links no-bullets pl-0 flex">
10+
<template v-for="(item, i) in socialLinks">
11+
<li :class="`social-link flex ma-0 ${i != 0 ? 'ml-05' : ''}`">
12+
<a
13+
:href="item.to"
14+
target="_blank"
15+
rel="noopener noreferrer"
16+
class="flex hide-icon"
17+
:aria-labelledby="item.icon + '-link'"
18+
>
19+
<icon :name="item.icon" size="36" />
20+
</a>
21+
</li>
22+
</template>
2523
</ul>
2624
</div>
2725
<!-- Generate multiple lists -->
28-
<div v-for="linkCluster in links" class="list-block">
26+
<div v-for="(linkCluster, i) in links" class="list-block pr-2">
2927
<h3 class="l8 c-text500">
3028
<b>{{ linkCluster.title }}</b>
3129
</h3>
@@ -224,47 +222,29 @@ export default {
224222
</script>
225223

226224
<style lang="stylus">
227-
// @require '../styles/config';
228-
229-
// move forwards with json objects or CSS vars
230-
json('../styles/media-queries.json');
225+
@require '../styles/config';
231226
232227
footer
233228
width 85vw
234-
max-width $contentWidthXL
229+
max-width $breakXL
235230
margin 0 auto
236-
display flex
237-
flex-wrap wrap
238-
justify-content space-between
239-
240-
// Set padding at breakpoints
241-
@media L
242-
padding-bottom 128px
243-
padding-top 64px
244-
245-
.top-row
246-
display flex
247-
justify-content space-between
248-
flex 1 0 100%
249-
flex-wrap wrap
250-
align-items center
231+
.list-block
232+
min-width: 300px
233+
@media (min-width: $breakL)
234+
min-width initial
251235
236+
footer
252237
.social-links
253-
display flex
254-
.social-link
255-
margin 0
256-
display flex
257-
.social-link:not(first-of-type)
258-
marginLeft 1rem
259238
a
260-
display flex
239+
svg path
240+
fill $subduedColor
241+
&:hover
242+
svg path
243+
fill $colorPrimary
261244
262-
.list-block
263-
flex 1
264-
//set fuzzy widths to force reflow into 1, 2 or 4 columns
265-
min-width 100%
266-
@media M
267-
min-width 40%
268-
@media L
269-
min-width 20%
245+
.dark-mode footer
246+
.social-links
247+
a:hover
248+
svg path
249+
fill $colorPrimaryDark
270250
</style>

‎docs/.vuepress/theme/components/NavDropdown.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
:aria-label="`Select ${item.text.toLowerCase()}`"
1111
>
1212
<span
13-
class="dropdown-title flex flex-center ma-1 mr-0 ml-0 md-up-ma-0 md-up-pt-05 md-up-pb-05"
13+
class="dropdown-title flex flex-center ma-1 mr-0 ml-0 l-up-ma-0 l-up-pt-05 l-up-pb-05"
1414
>{{ item.text }}<icon class="chevron-icon hidden" name="chevron-down"
1515
/></span>
1616
<ul
17-
class="dropdown-items no-bullets ma-0 pa-0 md-up-pt-05 md-up-pb-05 md-up-hidden md-up-absolute"
17+
class="dropdown-items no-bullets ma-0 pa-0 l-up-pt-05 l-up-pb-05 l-up-hidden l-up-absolute"
1818
>
1919
<li
2020
class="dropdown-item ma-0 pa-0"
@@ -24,7 +24,7 @@
2424
<NavLink
2525
tabindex="-1"
2626
:item="subItem"
27-
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"
27+
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"
2828
@nav-toggle="$emit('nav-toggle', false)"
2929
/>
3030
</li>
@@ -131,7 +131,7 @@ export default {
131131
.router-link-exact-active
132132
color $colorPrimaryDark500
133133
134-
@media (min-width: $breakM)
134+
@media (min-width: $breakL)
135135
.dropdown-title
136136
.chevron-icon
137137
display inline-block

0 commit comments

Comments
 (0)