nolanlawson
/
pinafore
forked from cybrespace/pinafore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feat(settings): add theme settings to general (#706)

This commit is contained in:
Nolan Lawson 2018-12-01 12:57:00 -08:00 committed by GitHub
parent a760687c6d
commit f3254bb22d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
routes/_pages/settings/general.html
View File

@ -35,11 +35,8 @@
</div> </div>
</form> </form>
<h2>Themes <h2>{themeTitle}</h2>
</h2> <ThemeSettings instanceName={$currentInstance} />
<p>
Changes to the theme can be made in <em>Settings &gt; Instances &gt; (instance name)</em>
</p>
</SettingsLayout> </SettingsLayout>
<style> <style>
.ui-settings { .ui-settings {
@ -55,12 +52,19 @@
</style> </style>
<script> <script>
import SettingsLayout from '../../_components/settings/SettingsLayout.html' import SettingsLayout from '../../_components/settings/SettingsLayout.html'
import ThemeSettings from '../../_components/settings/instance/ThemeSettings.html'
import { store } from '../../_store/store' import { store } from '../../_store/store'
export default { export default {
components: { components: {
SettingsLayout SettingsLayout,
ThemeSettings
}, },
store: () => store store: () => store,
computed: {
themeTitle: ({ $loggedInInstancesInOrder, $currentInstance }) => (
$loggedInInstancesInOrder.length > 1 ? `Theme for ${$currentInstance}` : 'Theme'
)
}
} }
</script> </script>