merge completion

.vscode/settings.json

@@ -8,7 +8,7 @@
     "vue"
   ],
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "i18n-ally.localesPaths": [
     "server/locales"

client/components/admin/admin-theme.vue

@@ -55,15 +55,6 @@
                 v-toolbar(color='primary', dark, dense, flat)
                   v-toolbar-title.subtitle-1 {{$t(`admin:theme.options`)}}
                 v-card-text
-                  v-range-slider(
-                    prepend-icon='mdi-menu-open'
-                    :label='$t(`admin:theme.tocHeadingLevels`)'
-                    v-model='tocRange'
-                    :min='1'
-                    :max='6'
-                    :tick-labels='["H1", "H2", "H3", "H4", "H5", "H6"]'
-                  )
-                  .text-caption {{$t('admin:theme.tocHeadingLevelsHint')}}
                   v-select(
                     :items='tocPositions'
                     outlined
@@ -73,6 +64,15 @@
                     persistent-hint
                     hint='Select whether the table of contents is shown on the left, right or not at all.'
                     )
+                  v-range-slider(
+                    prepend-icon='mdi-menu-open'
+                    label='Heading Levels in ToC'
+                    v-model='tocRange'
+                    :min='1'
+                    :max='6'
+                    :tick-labels='["H1", "H2", "H3", "H4", "H5", "H6"]'
+                    hint='Select which levels of the toc are displayed.'
+                  )
             v-flex(lg6 xs12)
 
               v-card.animated.fadeInUp.wait-p2s

client/components/editor/editor-modal-properties.vue

@@ -92,7 +92,7 @@ v-dialog(
               )
         v-tab-item(transition='fade-transition', reverse-transition='fade-transition')
           v-card-text
-            .overline {{$t('editor:props.tocTitle')}}
+            .overline.pb-5 {{$t('editor:props.tocTitle')}}
             v-switch(
               :label='$t(`editor:props.tocUseDefault`)'
               v-model='useDefaultTocDepth'

client/graph/admin/theme/theme-mutation-save.gql

@@ -1,6 +1,6 @@
-mutation($theme: String!, $iconset: String!, $darkMode: Boolean!, $tocPosition: String,  $tocDepth: RangeInput!, $injectCSS: String, $injectHead: String, $injectBody: String) {
+mutation($theme: String!, $iconset: String!, $darkMode: Boolean!, $tocPosition: String, $tocDepth: RangeInput!, $injectCSS: String, $injectHead: String, $injectBody: String) {
   theming {
-    setConfig(theme: $theme, iconset: $iconset, darkMode: $darkMode, tocPosition: $tocPosition,      tocDepth: $tocDepth, injectCSS: $injectCSS, injectHead: $injectHead, injectBody: $injectBody) {
+    setConfig(theme: $theme, iconset: $iconset, darkMode: $darkMode, tocPosition: $tocPosition, tocDepth: $tocDepth, injectCSS: $injectCSS, injectHead: $injectHead, injectBody: $injectBody) {
       responseResult {
         succeeded
         errorCode