diff --git a/public/img/peertube-upload.png b/public/img/peertube-upload.png index 3ae7380..e102a27 100644 Binary files a/public/img/peertube-upload.png and b/public/img/peertube-upload.png differ diff --git a/public/img/peertube-you-play.png b/public/img/peertube-you-play.png deleted file mode 100644 index e102a27..0000000 Binary files a/public/img/peertube-you-play.png and /dev/null differ diff --git a/src/components/Instances.vue b/src/components/Instances.vue deleted file mode 100644 index de54e90..0000000 --- a/src/components/Instances.vue +++ /dev/null @@ -1,103 +0,0 @@ - - - diff --git a/src/components/InstancesList.vue b/src/components/InstancesList.vue new file mode 100644 index 0000000..112fd8e --- /dev/null +++ b/src/components/InstancesList.vue @@ -0,0 +1,362 @@ + + + + + + + diff --git a/src/main.js b/src/main.js index ece3413..7f56d70 100644 --- a/src/main.js +++ b/src/main.js @@ -8,10 +8,10 @@ import App from './App.vue' import Home from './views/Home.vue' import Help from './views/Help' import News from './views/News' +import Instances from './views/Instances' -import './scss/bootstrap.scss' import './scss/main.scss' -import CommonMixins from './mixins/Common-Mixins' +import CommonMixins from './mixins/CommonMixins' const translations = require('./translations.json') @@ -66,6 +66,10 @@ const routes = [ { path: '/news', component: News + }, + { + path: '/instances', + component: Instances } ] diff --git a/src/mixins/Common-Mixins.js b/src/mixins/CommonMixins.js similarity index 100% rename from src/mixins/Common-Mixins.js rename to src/mixins/CommonMixins.js diff --git a/src/scss/_bootstrap-variables.scss b/src/scss/_bootstrap-variables.scss new file mode 100644 index 0000000..2bfd0c7 --- /dev/null +++ b/src/scss/_bootstrap-variables.scss @@ -0,0 +1,3 @@ +@import "_variables"; + +$primary: $orange; diff --git a/src/scss/bootstrap.scss b/src/scss/bootstrap.scss index fc61a0a..105b77d 100644 --- a/src/scss/bootstrap.scss +++ b/src/scss/bootstrap.scss @@ -34,3 +34,5 @@ @import '~bootstrap/scss/carousel'; @import '~bootstrap/scss/utilities'; @import '~bootstrap/scss/print'; + +@import '~bootstrap-vue/dist/bootstrap-vue.css'; diff --git a/src/scss/main.scss b/src/scss/main.scss index 6c32aae..7c027bf 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss @@ -1,6 +1,9 @@ @import "_variables"; @import "_mixins"; +@import "_bootstrap-variables"; +@import "bootstrap.scss"; + @font-face { font-family: 'Proza Libre'; font-style: normal; @@ -181,10 +184,11 @@ main { .title-block { text-align: center; - margin-bottom: 100px; + margin: auto auto 100px auto; display: flex; flex-direction: column; align-items: center; + max-width: 450px; .title { margin-bottom: 10px; diff --git a/src/views/Home.vue b/src/views/Home.vue index 946603a..86635bd 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -253,7 +253,7 @@
À vous de jouer !
- PeerTube you play illustration + PeerTube you play illustration
diff --git a/src/views/Instances.vue b/src/views/Instances.vue new file mode 100644 index 0000000..6ef7fe5 --- /dev/null +++ b/src/views/Instances.vue @@ -0,0 +1,106 @@ + + + + +