Skip to content

Commit 0343314

Browse files
yyx990803yyx990803
committed
Merge branch 'master' into 2.0
2 parents 912b9d0 + d2bceb4 commit 0343314

File tree

9 files changed

+70
-39
lines changed

9 files changed

+70
-39
lines changed

‎src/support-vuejs/index.md

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,25 @@
1212

1313
## Current premium sponsors:
1414

15-
<p style="text-align: center">
16-
<a href="https://strikingly.com">
17-
<img width="360px" src="/images/strikingly.png">
18-
</a>
15+
<p style="text-align: center; margin-bottom: 60px" class="sponsors-page">
1916
<a href="https://itunescn.com">
20-
<img width="250px" src="/images/itunescn.png">
21-
</a>
22-
<a href="https://jsfiddle.net">
23-
<img width="250px" src="/images/jsfiddle.png">
24-
</a>
25-
<a href="https://laravel.com">
26-
<img width="250px" src="/images/laravel.png">
27-
</a>
28-
<a href="https://chaitin.cn">
29-
<img width="250px" src="/images/chaitin.png">
30-
</a>
31-
<a href="https://htmlburger.com" target="_blank">
32-
<img width="250px" src="/images/htmlburger.png">
33-
</a>
34-
<a href="https://starter.someline.com/" target="_blank">
35-
<img width="250px" src="/images/someline.png">
36-
</a>
37-
<a href="http://gold.xitu.io/?utm_source=vuejs&utm_medium=image&utm_content=juejin&utm_campaign=q3_website" target="_blank">
17+
<img src="/images/itunescn.png">
18+
</a><a href="https://jsfiddle.net">
19+
<img src="/images/jsfiddle.png">
20+
</a><a href="https://laravel.com">
21+
<img src="/images/laravel.png">
22+
</a><a href="https://chaitin.cn">
23+
<img src="/images/chaitin.png">
24+
</a><a href="https://htmlburger.com" target="_blank">
25+
<img src="/images/htmlburger.png">
26+
</a><a href="https://starter.someline.com/" target="_blank">
27+
<img src="/images/someline.png">
28+
</a><a href="http://gold.xitu.io/?utm_source=vuejs&utm_medium=image&utm_content=juejin&utm_campaign=q3_website" target="_blank">
3829
<img width="180px" src="/images/juejin.png">
30+
</a><a href="http://monterail.com/" target="_blank">
31+
<img src="/images/monterail.svg">
32+
</a><a href="https://www.trisoft.ro/" target="_blank">
33+
<img src="/images/trisoft.png">
3934
</a>
4035
</p>
4136

‎themes/vue/layout/index.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</ul>
3030

3131
<ul id="translations">
32-
<li><a href="http://vuejs.org.cn" class="nav-link">中文</a></li>
32+
<li><a href="http://cn.vuejs.org" class="nav-link">中文</a></li>
3333
<li class="delimiter">|</li>
3434
<li><a href="http://jp.vuejs.org" class="nav-link">日本語</a></li>
3535
<li class="delimiter">|</li>

‎themes/vue/layout/partials/ad.ejs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
<div id="ad">
2-
<span>Proudly sponsored by</span>
3-
<br>
4-
<a href="https://strikingly.com/s/careers?utm_source=v" target="_blank"
5-
style="display:inline-block;padding-top:8px">
6-
<img src="/images/strikingly.png">
7-
</a>
2+
<script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=vuejs" id="_carbonads_js"></script>
83
</div>

‎themes/vue/layout/partials/sponsors.ejs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<span>Proudly sponsored by</span>
22
<br>
3-
<a href="https://strikingly.com/s/careers?utm_source=v" target="_blank" style="top:3px">
4-
<img src="/images/strikingly.png">
5-
</a>
6-
<a href="https://itunescn.com/" target="_blank" style="top:2px">
3+
<a href="https://www.itunescn.com/" target="_blank" style="top:2px">
74
<img src="/images/itunescn.png">
85
</a>
96
<a href="https://jsfiddle.net/" target="_blank">
@@ -24,3 +21,9 @@
2421
<a href="http://gold.xitu.io/?utm_source=vuejs&utm_medium=image&utm_content=juejin&utm_campaign=q3_website" target="_blank" style="width:75px">
2522
<img src="/images/juejin.png" style="width:75px">
2623
</a>
24+
<a href="http://monterail.com/" target="_blank">
25+
<img src="/images/monterail.svg">
26+
</a>
27+
<a href="https://www.trisoft.ro/" target="_blank" style="width:80px;top:-1px">
28+
<img src="/images/trisoft.png" style="width:80px">
29+
</a>

‎themes/vue/source/css/_common.styl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ a.small-button
118118

119119
#ad
120120
width 140px
121-
text-align center
122121
position fixed
123122
z-index 99
124123
bottom 10px

‎themes/vue/source/css/_sponsor.styl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.sponsors-page
2+
a, img
3+
width 120px
4+
display inline-block
5+
vertical-align middle
6+
a
7+
margin 10px 20px

‎themes/vue/source/css/page.styl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
@import "_demo"
33
@import "_blog"
44
@import "_search"
5+
@import "_sponsor"
56

67
$header-height = 40px
78

@@ -263,8 +264,7 @@ $header-height = 40px
263264
#ad
264265
z-index 8
265266
position relative
266-
width 140px
267-
height 60px
267+
width 100%
268268
padding 0
269269
bottom 0
270270
right 0
@@ -273,12 +273,12 @@ $header-height = 40px
273273
display inline-block
274274
vertical-align top
275275
.carbon-text
276-
width 130px
276+
width 140px
277277
margin-left 15px
278278
.carbon-poweredby
279279
position absolute
280-
bottom 0
281-
left 145px
280+
bottom 12px
281+
left 140px
282282

283283
@media screen and (max-width: 720px)
284284
#ad

‎themes/vue/source/images/monterail.svg

Lines changed: 32 additions & 0 deletions
Loading

‎themes/vue/source/images/trisoft.png

34.6 KB
Loading

0 commit comments

Comments
 (0)