diff --git a/front/package.json b/front/package.json index 66ff72d9c..c39805d4f 100644 --- a/front/package.json +++ b/front/package.json @@ -28,7 +28,8 @@ "vue-upload-component": "^2.7.4", "vuedraggable": "^2.14.1", "vuex": "^3.0.1", - "vuex-persistedstate": "^2.4.2" + "vuex-persistedstate": "^2.4.2", + "vuex-router-sync": "^5.0.0" }, "devDependencies": { "autoprefixer": "^6.7.2", diff --git a/front/src/App.vue b/front/src/App.vue index d1d63e651..d310c3ca9 100644 --- a/front/src/App.vue +++ b/front/src/App.vue @@ -40,6 +40,7 @@ export default { // and we end up with CSS rules not applied, // see https://github.com/webpack/webpack/issues/215 @import 'semantic/semantic.css'; +@import 'style/vendor/media'; #app { @@ -48,17 +49,19 @@ export default { -moz-osx-font-smoothing: grayscale; } .main.pusher, .footer { - margin-left: 350px !important; + @include media(">desktop") { + margin-left: 350px !important; + } transform: none !important; } .main-pusher { padding: 1.5rem 0; } -#footer { - padding: 4em; -} -.ui.stripe.segment { - padding: 4em; +.ui.stripe.segment, #footer { + padding: 2em; + @include media(">tablet") { + padding: 4em; + } } .ui.small.text.container { diff --git a/front/src/components/Sidebar.vue b/front/src/components/Sidebar.vue index a315aab19..6aaf04c42 100644 --- a/front/src/components/Sidebar.vue +++ b/front/src/components/Sidebar.vue @@ -1,13 +1,17 @@ @@ -25,6 +26,9 @@ export default { onSelect (result, response) { router.push(result.routerUrl) }, + onSearchQuery (query) { + self.$emit('search') + }, apiSettings: { beforeXHR: function (xhrObject) { xhrObject.setRequestHeader('Authorization', self.$store.getters['auth/header']) diff --git a/front/src/components/audio/album/Card.vue b/front/src/components/audio/album/Card.vue index 4c803b29c..968b828a4 100644 --- a/front/src/components/audio/album/Card.vue +++ b/front/src/components/audio/album/Card.vue @@ -14,7 +14,7 @@
- +
diff --git a/front/src/components/audio/artist/Card.vue b/front/src/components/audio/artist/Card.vue index 8a02163fb..9a82d6c8f 100644 --- a/front/src/components/audio/artist/Card.vue +++ b/front/src/components/audio/artist/Card.vue @@ -7,7 +7,7 @@
- +
diff --git a/front/src/components/audio/track/Table.vue b/front/src/components/audio/track/Table.vue index 8a591d3bd..00bcf9f7d 100644 --- a/front/src/components/audio/track/Table.vue +++ b/front/src/components/audio/track/Table.vue @@ -1,5 +1,5 @@