update branch with recent develop changes (FA, added settings)

src/components/settings_modal/helpers/boolean_setting.vue

@@ -13,7 +13,7 @@
         >
         <slot />
       </span>
-      <ModifiedIcon :changed="isChanged" />
+      <ModifiedIndicator :changed="isChanged" />
     </Checkbox>
   </label>
 </template>
@@ -21,7 +21,7 @@
 <script>
 import { get, set } from 'lodash'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
-import ModifiedIcon from './modified_icon.vue'
+import ModifiedIndicator from './modified_indicator.vue'
 export default {
   props: [
     'path',
@@ -29,7 +29,7 @@ export default {
   ],
   components: {
     Checkbox,
-    ModifiedIcon
+    ModifiedIndicator
   },
   computed: {
     pathDefault () {

src/components/settings_modal/helpers/modified_indicator.vue

@@ -1,15 +1,17 @@
 <template>
   <span
     v-if="changed"
-    class="ModifiedIcon"
+    class="ModifiedIndicator"
     >
     <Popover
       trigger="hover"
       >
-      <i
+      <span slot="trigger">
-        slot="trigger"
+        &nbsp;
-        class="icon icon-wrench"
+          <FAIcon
+            icon="wrench"
           />
+      </span>
       <div
         class="modified-tooltip"
         slot="content"
@@ -22,6 +24,13 @@
 
 <script>
 import Popover from 'src/components/popover/popover.vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faWrench } from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faWrench
+)
+
 export default {
   props: ['changed'],
   components: { Popover }
@@ -29,14 +38,10 @@ export default {
 </script>
 
 <style lang="scss">
-.ModifiedIcon {
+.ModifiedIndicator {
   display: inline-block;
   position: relative;
 
-  .icon {
-    display: inline-block;
-  }
-
   .modified-tooltip {
     margin: 0.5em 1em;
     min-width: 10em;

src/components/settings_modal/helpers/shared_computed_object.js

@@ -9,7 +9,6 @@ const SharedComputedObject = () => ({
     .map(key => [
       key + 'DefaultValue',
       function () {
-        console.log(this.$store.getters.defaultConfig)
         return this.$store.getters.defaultConfig[key]
       }
     ])

src/components/settings_modal/tabs/general_tab.vue

@@ -12,9 +12,9 @@
           </BooleanSetting>
         </li>
         <li v-if="instanceWallpaperUsed">
-          <Checkbox v-model="hideInstanceWallpaper">
+          <BooleanSetting path="hideInstanceWallpaper">
             {{ $t('settings.hide_wallpaper') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
       </ul>
     </div>
@@ -64,9 +64,9 @@
           </BooleanSetting>
         </li>
         <li>
-          <Checkbox v-model="virtualScrolling">
+          <BooleanSetting path="virtualScrolling">
             {{ $t('settings.virtual_scrolling') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
       </ul>
     </div>

src/modules/config.js

@@ -80,7 +80,6 @@ const config = {
   getters: {
     defaultConfig (state, getters, rootState, rootGetters) {
       const { instance } = rootState
-      console.log('DC', instance.minimalScopesMode)
       return {
         ...defaultState,
         ...Object.fromEntries(
@@ -90,7 +89,6 @@ const config = {
     },
     mergedConfig (state, getters, rootState, rootGetters) {
       const { defaultConfig } = rootGetters
-      console.log('DC2', defaultConfig.hideISP)
       return {
         ...defaultConfig,
         ...state