diff options
| -rw-r--r-- | src/components/settings_modal/helpers/boolean_setting.vue | 6 | ||||
| -rw-r--r-- | src/components/settings_modal/helpers/modified_indicator.vue (renamed from src/components/settings_modal/helpers/modified_icon.vue) | 25 | ||||
| -rw-r--r-- | src/components/settings_modal/helpers/shared_computed_object.js | 1 | ||||
| -rw-r--r-- | src/components/settings_modal/tabs/general_tab.vue | 8 | ||||
| -rw-r--r-- | src/modules/config.js | 2 |
5 files changed, 22 insertions, 20 deletions
diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue index f7c392cd..b600b63b 100644 --- a/src/components/settings_modal/helpers/boolean_setting.vue +++ b/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 () { diff --git a/src/components/settings_modal/helpers/modified_icon.vue b/src/components/settings_modal/helpers/modified_indicator.vue index 27e0a9c5..b75a2811 100644 --- a/src/components/settings_modal/helpers/modified_icon.vue +++ b/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 - slot="trigger" - class="icon icon-wrench" - /> + <span slot="trigger"> + + <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; diff --git a/src/components/settings_modal/helpers/shared_computed_object.js b/src/components/settings_modal/helpers/shared_computed_object.js index 3cbcd288..2c833c0c 100644 --- a/src/components/settings_modal/helpers/shared_computed_object.js +++ b/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] } ]) diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue index 92cd2069..f93f4ea0 100644 --- a/src/components/settings_modal/tabs/general_tab.vue +++ b/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> diff --git a/src/modules/config.js b/src/modules/config.js index 444808cf..f992519e 100644 --- a/src/modules/config.js +++ b/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 |