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

This commit is contained in:
Henry Jameson 2021-02-01 20:08:36 +02:00
parent 8958f386be
commit 66f3e72b54
5 changed files with 22 additions and 20 deletions

View file

@ -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 () {

View file

@ -1,15 +1,17 @@
<template>
<span
v-if="changed"
class="ModifiedIcon"
class="ModifiedIndicator"
>
<Popover
trigger="hover"
>
<i
slot="trigger"
class="icon icon-wrench"
/>
<span slot="trigger">
&nbsp;
<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;

View file

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

View file

@ -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>

View file

@ -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