8000 Pick up some changes (#330) · vuejs/jp.vuejs.org@a0908aa · GitHub
[go: up one dir, main page]
Skip to content

Commit a0908aa

Browse files
re-fortkazupon
re-fort
authored and
kazupon
committed
Pick up some changes (#330)
* fix: adjust padding for content section (#1107) * Change links on deployment guide (#1104) * fix extract css related link * change to secureable schema # Conflicts: # src/v2/guide/deployment.md * Tiny update to components.md (#1105) As someone new to Vuejs, it took me a few extra seconds to grok the expanded code block for when `v-model` is used with a component. My mind was somehow trying to relate the 3rd block of code with the 2nd block, instead of the 1st. (https://vuejs.org/v2/guide/components.html#Form-Input-Components-using-Custom-Events). I suggest re-wording it to make it a bit more obvious. # Conflicts: # src/v2/guide/components.md * fix blog layout (#1112) # Conflicts: # themes/vue/layout/post.ejs * Update class-and-style.md (#1113) Remove extra comma in the Object Syntax example for computed properties * Update date * Update doc link to Japanese version
1 parent 4433402 commit a0908aa

File tree

5 files changed

+26
-24
lines changed

5 files changed

+26
-24
lines changed

‎src/v2/guide/class-and-style.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: クラスとスタイルのバインディング
3-
updated: 2017-07-21
3+
updated: 2017-09-08
44
type: guide
55
order: 6
66
---
@@ -72,7 +72,7 @@ computed: {
7272
classObject: function () {
7373
return {
7474
active: this.isActive && !this.error,
75-
'text-danger': this.error && this.error.type === 'fatal',
75+
'text-danger': this.error && this.error.type === 'fatal'
7676
}
7777
}
7878
}

‎src/v2/guide/components.md

Lines changed: 2 additions & 2 deletions
2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2
title: コンポーネント
3-
updated: 2017-09-03
3+
updated: 2017-09-08
44
type: guide
55
order: 11
66
---
@@ -616,7 +616,7 @@ this.$emit('update:foo', newValue)
616616
v-on:input="something = $event.target.value">
617617
```
618618

619-
コンポーネントと共に使用されるとき、これは簡単にできます:
619+
コンポーネントと共に使用されるとき、代わりにこのように簡単にできます:
620620

621621
``` html
622622
<custom-input

‎src/v2/guide/deployment.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
< 8000 /code>
22
title: プロダクション環境への配信
3-
updated: 2017-09-03
3+
updated: 2017-09-08
44
type: guide
55
order: 401
66
---
@@ -78,9 +78,9 @@ Webpack を使用している場合、JavaScript と テンプレートの分離
7878

7979
それぞれのビルドツールのドキュメントを参照してください:
8080

81-
- [Webpack + vue-loader](http://vue-loader.vuejs.org/en/configurations/extract-css.html) (`vue-cli` の webpack テンプレートは既に設定済み)
81+
- [Webpack + vue-loader](https://vue-loader.vuejs.org/ja/configurations/extract-css.html) (`vue-cli` の webpack テンプレートは既に設定済み)
8282
- [Browserify + vueify](https://github.com/vuejs/vueify#css-extraction)
83-
- [Rollup + rollup-plugin-vue](https://github.com/znck/rollup-plugin-vue#options)
83+
- [Rollup + rollup-plugin-vue](https://vuejs.github.io/rollup-plugin-vue/#/en/2.3/?id=custom-handler)
8484

8585
## ランタイムエラーの追跡
8686

‎themes/vue/layout/post.ejs

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
<div class="sidebar blog">
2-
<ul class="main-menu">
3-
<%- partial('partials/main_menu', { context: 'sidebar' }) %>
4-
</ul>
5-
<div class="list">
6-
<h2>
7-
Recent Posts
8-
<a href="<%- url_for("/atom.xml") %>" target="_blank" style="vertical-align: middle; margin-left: 5px">
9-
<img src="<%- url_for("/images/feed.png") %>" style="width:15px;height:15px">
10-
</a>
11-
</h2>
12-
<ul style="padding:0">
13-
<% site.posts.sort('date', -1).limit(10).each(function (post) { %>
14-
<li>
15-
<a href="/<%- post.path %>" class="sidebar-link<%- page.title === post.title ? ' current' : '' %>"><%- post.title %></a>
16-
</li>
17-
<% }) %>
2+
<div class="sidebar-inner">
3+
<ul class="main-menu">
4+
<%- partial('partials/main_menu', { context: 'nav' }) %>
185
</ul>
6+
<div class="list">
7+
<h2>
8+
Recent Posts
9+
<a href="<%- url_for("/atom.xml") %>" target="_blank" style="vertical-align: middle; margin-left: 5px">
10+
<img src="<%- url_for("/images/feed.png") %>" style="width:15px;height:15px">
11+
</a>
12+
</h2>
13+
<ul style="padding:0">
14+
<% site.posts.sort('date', -1).limit(10).each(function (post) { %>
15+
<li>
16+
<a href="/<%- post.path %>" class="sidebar-link<%- page.title === post.title ? ' current' : '' %>"><%- post.title %></a>
17+
</li>
18+
<% }) %>
19+
</ul>
20+
</div>
1921
</div>
2022
</div>
2123
<div class="content with-sidebar blog post">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
padding: 2.2em 0
1818
max-width: 600px
1919
margin: 0 auto
20-
padding-left: 30px
20+
padding-left: 50px
2121
&.api
2222
> a:first-of-type > h2
2323
margin-top: 0

0 commit comments

Comments
 (0)
0