Merge branch 'master' into 0.9.10

This commit is contained in:
Sébastien Chopin 2017-02-16 19:45:01 +01:00
commit 40ddfaacd7
7 changed files with 87 additions and 35 deletions

View File

@ -168,6 +168,6 @@ https://github.com/nuxt/nuxt.js/projects/1
## Donate
Feel free to make a donation if you want to support us.
Feel free to make a donation to support us.
<a href="https://donorbox.org/nuxt"><img src="https://img.shields.io/badge/Support%20us-donate-41B883.svg" alt="Support us"></a>

View File

@ -1,21 +1,13 @@
<template>
<div class="Content">
<div class="container">
<h1 class="Content__Title">{{ $t('about.title') }}</h1>
<p>{{ $t('about.introduction') }}</p>
</div>
</div>
<about/>
</template>
<style>
.Content
{
padding: 50px 0;
text-align: center;
<script>
import About from '~/partials/About.vue'
export default {
components: {
About
}
}
.Content__Title
{
font-weight: 300;
padding-bottom: 30px;
}
</style>
</script>

View File

@ -1,21 +1,13 @@
<template>
<div class="Content">
<div class="container">
<h1 class="Content__Title">{{ $t('home.title') }}</h1>
<p>{{ $t('home.introduction') }}</p>
</div>
</div>
<home/>
</template>
<style>
.Content
{
padding: 50px 0;
text-align: center;
<script>
import Home from '~/partials/Home.vue'
export default {
components: {
Home
}
}
.Content__Title
{
font-weight: 300;
padding-bottom: 30px;
}
</style>
</script>

View File

@ -0,0 +1,13 @@
<template>
<about/>
</template>
<script>
import About from '~/partials/About.vue'
export default {
components: {
About
}
}
</script>

View File

@ -0,0 +1,13 @@
<template>
<home/>
</template>
<script>
import Home from '~/partials/Home.vue'
export default {
components: {
Home
}
}
</script>

View File

@ -0,0 +1,21 @@
<template>
<div class="Content">
<div class="container">
<h1 class="Content__Title">{{ $t('about.title') }}</h1>
<p>{{ $t('about.introduction') }}</p>
</div>
</div>
</template>
<style>
.Content
{
padding: 50px 0;
text-align: center;
}
.Content__Title
{
font-weight: 300;
padding-bottom: 30px;
}
</style>

View File

@ -0,0 +1,21 @@
<template>
<div class="Content">
<div class="container">
<h1 class="Content__Title">{{ $t('home.title') }}</h1>
<p>{{ $t('home.introduction') }}</p>
</div>
</div>
</template>
<style>
.Content
{
padding: 50px 0;
text-align: center;
}
.Content__Title
{
font-weight: 300;
padding-bottom: 30px;
}
</style>