diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/App.js | 4 | ||||
| -rw-r--r-- | src/App.scss | 5 | ||||
| -rw-r--r-- | src/App.vue | 4 | ||||
| -rw-r--r-- | src/components/settings/settings.js | 9 | ||||
| -rw-r--r-- | src/components/settings/settings.vue | 22 | ||||
| -rw-r--r-- | src/main.js | 4 |
6 files changed, 43 insertions, 5 deletions
@@ -1,15 +1,13 @@ import UserPanel from './components/user_panel/user_panel.vue' import NavPanel from './components/nav_panel/nav_panel.vue' import Notifications from './components/notifications/notifications.vue' -import StyleSwitcher from './components/style_switcher/style_switcher.vue' export default { name: 'app', components: { UserPanel, NavPanel, - Notifications, - StyleSwitcher + Notifications }, data: () => ({ mobileActivePanel: 'timeline' diff --git a/src/App.scss b/src/App.scss index d39fc749..b7bbf8ef 100644 --- a/src/App.scss +++ b/src/App.scss @@ -260,3 +260,8 @@ nav { display: flex; } } + +.item.right { + text-align: right; + padding-right: 20px; +} diff --git a/src/App.vue b/src/App.vue index a22307a6..7bd79280 100644 --- a/src/App.vue +++ b/src/App.vue @@ -5,7 +5,9 @@ <div class='item'> <a route-to='friends-timeline' href="#">{{sitename}}</a> </div> - <style-switcher></style-switcher> + <div class='item right'> + <router-link :to="{ name: 'settings'}"><i class="icon-cog"></i></router-link> + </div> </div> </nav> <div class="container" id="content"> diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js new file mode 100644 index 00000000..f979e7ab --- /dev/null +++ b/src/components/settings/settings.js @@ -0,0 +1,9 @@ +import StyleSwitcher from '../style_switcher/style_switcher.vue' + +const settings = { + components: { + StyleSwitcher + } +} + +export default settings diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue new file mode 100644 index 00000000..8bb0ffb1 --- /dev/null +++ b/src/components/settings/settings.vue @@ -0,0 +1,22 @@ +<template> + <div class="settings panel panel-default base00-background"> + <div class="panel-heading base01-background base04"> + Settings + </div> + <div class="panel-body"> + <div class="setting-item"> + <h2>Theme</h2> + <style-switcher></style-switcher> + </div> + </div> + </div> +</template> + +<script src="./settings.js"> +</script> + +<style> + .setting-item { + margin: 1em + } +</style> diff --git a/src/main.js b/src/main.js index 0e43518d..dfff1444 100644 --- a/src/main.js +++ b/src/main.js @@ -8,6 +8,7 @@ import FriendsTimeline from './components/friends_timeline/friends_timeline.vue' import ConversationPage from './components/conversation-page/conversation-page.vue' import Mentions from './components/mentions/mentions.vue' import UserProfile from './components/user_profile/user_profile.vue' +import Settings from './components/settings/settings.vue' import statusesModule from './modules/statuses.js' import usersModule from './modules/users.js' @@ -49,7 +50,8 @@ const routes = [ { path: '/main/friends', component: FriendsTimeline }, { name: 'conversation', path: '/notice/:id', component: ConversationPage }, { name: 'user-profile', path: '/users/:id', component: UserProfile }, - { name: 'mentions', path: '/:username/mentions', component: Mentions } + { name: 'mentions', path: '/:username/mentions', component: Mentions }, + { name: 'settings', path: '/settings', component: Settings } ] const router = new VueRouter({ |