8000 Pick up some changes by re-fort · Pull Request #330 · vuejs/jp.vuejs.org · GitHub
[go: up one dir, main page]

Skip to content

Pick up some changes #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 11, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/v2/guide/class-and-style.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: クラスとスタイルのバインディング
updated: 2017-07-21
updated: 2017-09-08
type: guide
order: 6
---
Expand Down Expand Up @@ -72,7 +72,7 @@ computed: {
classObject: function () {
return {
active: this.isActive && !this.error,
'text-danger': this.error && this.error.type === 'fatal',
'text-danger': this.error && this.error.type === 'fatal'
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/v2/guide/components.md
< 10000 tr data-hunk="0a508202cce614a2270fb0ff3dc75590945b0744e6fda3863c4d40eb47c27de9" class="show-top-border">
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: コンポーネント
updated: 2017-09-03
updated: 2017-09-08
type: guide
order: 11
---
Expand Down Expand Up @@ -616,7 +616,7 @@ this.$emit('update:foo', newValue)
v-on:input="something = $event.target.value">
```

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

``` html
<custom-input
Expand Down
6 changes: 3 additions & 3 deletions src/v2/guide/deployment.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: プロダクション環境への配信
updated: 2017-09-03
updated: 2017-09-08
type: guide
order: 401
---
Expand Down Expand Up @@ -78,9 +78,9 @@ Webpack を使用している場合、JavaScript と テンプレートの分離

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

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

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

Expand Down
34 changes: 18 additions & 16 deletions themes/vue/layout/post.ejs
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
<div class="sidebar blog">
<ul class="main-menu">
<%- partial('partials/main_menu', { context: 'sidebar' }) %>
</ul>
<div class="list">
<h2>
Recent Posts
<a href="<%- url_for("/atom.xml") %>" target="_blank" style="vertical-align: middle; margin-left: 5px">
<img src="<%- url_for("/images/feed.png") %>" style="width:15px;height:15px">
</a>
</h2>
<ul style="padding:0">
<% site.posts.sort('date', -1).limit(10).each(function (post) { %>
<li>
<a href="/<%- post.path %>" class="sidebar-link<%- page.title === post.title ? ' current' : '' %& CE95 gt;"><%- post.title %></a>
</li>
<% }) %>
<div class="sidebar-inner">
<ul class="main-menu">
<%- partial('partials/main_menu', { context: 'nav' }) %>
</ul>
<div class="list">
<h2>
Recent Posts
<a href="<%- url_for("/atom.xml") %>" target="_blank" style="vertical-align: middle; margin-left: 5px">
<img src="<%- url_for("/images/feed.png") %>" style="width:15px;height:15px">
</a>
</h2>
<ul style="padding:0">
<% site.posts.sort('date', -1).limit(10).each(function (post) { %>
<li>
<a href="/<%- post.path %>" class="sidebar-link<%- page.title === post.title ? ' current' : '' %>"><%- post.title %></a>
</li>
<% }) %>
</ul>
</div>
</div>
</div>
<div class="content with-sidebar blog post">
Expand Down
2 changes: 1 addition & 1 deletion themes/vue/source/css/page.styl
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
padding: 2.2em 0
max-width: 600px
margin: 0 auto
padding-left: 30px
padding-left: 50px
&.api
> a:first-of-type > h2
margin-top: 0
Expand Down
0