diff --git a/client/src/components/BasicKnowledgeTeaser.vue b/client/src/components/BasicKnowledgeTeaser.vue new file mode 100644 index 00000000..438871e0 --- /dev/null +++ b/client/src/components/BasicKnowledgeTeaser.vue @@ -0,0 +1,30 @@ + + + Basiswissen: Diskussionsregeln + + Für eine konstruktive Diskussion braucht es gewisse Regeln. + + + + + + + diff --git a/client/src/components/FilterBar.vue b/client/src/components/FilterBar.vue index 7ba17a53..153d4f5d 100644 --- a/client/src/components/FilterBar.vue +++ b/client/src/components/FilterBar.vue @@ -62,11 +62,8 @@ .filter-bar { position: sticky; top: -1px; - margin-top: -25px; - z-index: 9; - - padding: 0px 24px; + padding: 0 24px; height: 50px; background-color: $color-lightgrey; display: flex; diff --git a/client/src/components/book-navigation/BookNavigationItem.vue b/client/src/components/book-navigation/BookNavigationItem.vue index 60413a61..9a083528 100644 --- a/client/src/components/book-navigation/BookNavigationItem.vue +++ b/client/src/components/book-navigation/BookNavigationItem.vue @@ -25,7 +25,7 @@ data() { return { - show: true + show: false } } } diff --git a/client/src/layouts/DefaultLayout.vue b/client/src/layouts/DefaultLayout.vue index 474c7817..02201f0b 100644 --- a/client/src/layouts/DefaultLayout.vue +++ b/client/src/layouts/DefaultLayout.vue @@ -71,7 +71,6 @@ width: 100%; display: grid; grid-template-rows: auto 1fr; - grid-row-gap: 32px; min-height: 100vh; grid-auto-rows: 1fr; diff --git a/client/src/pages/basicknowledge-overview.vue b/client/src/pages/basicknowledge-overview.vue new file mode 100644 index 00000000..ab08994c --- /dev/null +++ b/client/src/pages/basicknowledge-overview.vue @@ -0,0 +1,58 @@ + + + + + Basiswissen: Sprache und Gesellschaft + + + + + + + + + + + + + diff --git a/client/src/router/index.js b/client/src/router/index.js index d4a1824c..4770f84c 100644 --- a/client/src/router/index.js +++ b/client/src/router/index.js @@ -11,6 +11,7 @@ import newRoom from '@/pages/newRoom' import editRoom from '@/pages/editRoom' import article from '@/pages/article' import basicknowledge from '@/pages/basicknowledge' +import basicknowledgeOverview from '@/pages/basicknowledge-overview' import submissions from '@/pages/submissions' import p404 from '@/pages/p404' import start from '@/pages/start' @@ -45,6 +46,7 @@ const routes = [ {path: '/edit-room/:id', name: 'edit-room', component: editRoom, props: true}, {path: '/room/:slug', name: 'room', component: room, props: true}, {path: '/article/:slug', name: 'article', component: article, meta: {layout: 'simple'}}, + {path: '/basic-knowledge/', name: 'basic-knowledge-overview', component: basicknowledgeOverview, meta: {subnavigation: true}}, {path: '/basic-knowledge/:slug', name: 'basic-knowledge', component: basicknowledge, meta: {layout: 'simple'}}, {path: '/submission/:id', name: 'submission', component: submission, meta: {layout: 'simple'}}, {path: '/portfolio', name: 'portfolio', component: portfolio},
+ Für eine konstruktive Diskussion braucht es gewisse Regeln. +