Skip to content

Commit 71661ff

Browse files
authored
Merge pull request vuejs#148 from Alex-Sokolov/master
Добавлена ссылка на магазин
2 parents 64f5fc5 + d718873 commit 71661ff

File tree

6 files changed

+29
-1
lines changed

6 files changed

+29
-1
lines changed

src/support-vuejs/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ Vue.js является программным продуктом с откры
4040
<img src="/images/vuejobs.png">
4141
</a><a href="https://leanpub.com/vuejs2" target="_blank">
4242
<img src="/images/tmvuejs2.png">
43+
</a><a href="https://fancygrid.com" target="_blank">
44+
<img src="https://fancygrid.com/logo/logo.png">
4345
</a>
4446
</p>
4547

src/v2/api/index.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1786,6 +1786,9 @@ if (version === 2) {
17861786
<!-- связывание входного параметра. "prop" должен быть определён в my-component. -->
17871787
<my-component :prop="someThing"></my-component>
17881788

1789+
<!-- передача всех входных параметров компонента в child-component -->
1790+
<child-component v-bind.prop="$props"></child-component>
1791+
17891792
<!-- XLink -->
17901793
<svg><a :xlink:special="foo"></a></svg>
17911794
```

src/v2/guide/comparison.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ Render-функции, использующие JSX, имеют определё
140140
<template>
141141
<div class="list-container">
142142
<ul v-if="items.length">
143-
<li v-for="item in items">
143+
<li v-for="item in items" :key="item.id">
144144
{{ item.name }}
145145
</li>
146146
</ul>

themes/vue/layout/partials/main_menu.ejs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@
88
<li><a href="<%- url_for("/v2/examples/") %>" class="nav-link<%- page.path.match(/examples/) ? ' current' : '' %>">Примеры</a></li>
99
<%- partial('partials/ecosystem_dropdown') %>
1010
<%- partial('partials/language_dropdown') %>
11+
<li>
12+
<a href="https://vue.threadless.com" target="_blank" class="nav-link shop">Магазин</a>
13+
<span class="new-label">NEW!</span>
14+
</li>

themes/vue/layout/partials/sponsors.ejs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,6 @@
3232
<a href="https://leanpub.com/vuejs2" target="_blank">
3333
<img src="<%- url_for("/images/tmvuejs2.png") %>">
3434
</a>
35+
<a href="https://fancygrid.com" target="_blank">
36+
<img src="https://fancygrid.com/logo/logo.png">
37+
</a>

themes/vue/source/css/_header.styl

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,22 @@ body.docs
3535
padding-bottom 3px
3636
&:hover, &.current
3737
border-bottom 3px solid $green
38+
&.shop
39+
margin-left 10px
40+
41+
.new-label
42+
position absolute
43+
top 3px
44+
left 110%
45+
background-color $green
46+
color #fff
47+
line-height 16px
48+
height 16px
49+
font-size 9px
50+
font-weight bold
51+
font-family $code-font
52+
padding 1px 4px 0 6px
53+
border-radius 4px
3854

3955
.search-query
4056
height 30px

0 commit comments

Comments
 (0)