git ssb

2+

mixmix / ticktack



Commit 94527b097121d2903dc3709ec79709a5804d13c9

Merge pull request #128 from ticktackim/versions

add version to settings page
mix irving authored on 4/10/2018, 10:25:11 PM
GitHub committed on 4/10/2018, 10:25:11 PM
Parent: 6cc3ba8e958c74086d517dc9dfe1236bdde29e2d
Parent: 81b5142c9c1ffb82378b6e32ba1b24a2d3a029e5

Files changed

app/page/settings.jschanged
app/page/settings.mcsschanged
translations/en.jschanged
app/page/settings.jsView
@@ -1,8 +1,9 @@
11 const nest = require('depnest')
22 const { h, computed } = require('mutant')
33 const electron = require('electron')
44 const path = require('path')
5 +const { version } = require('../../package.json')
56
67 exports.gives = nest('app.page.settings')
78
89 exports.needs = nest({
@@ -83,8 +84,12 @@
8384 ]),
8485 h('section -zoom', [
8586 h('div.left', strings.settingsPage.section.zoom),
8687 h('div.right', [ zoomButton(-0.1, '-'), zoomButton(+0.1, '+') ])
88 + ]),
89 + h('section -version', [
90 + h('div.left', strings.settingsPage.section.version),
91 + h('div.right', version)
8792 ])
8893 ])
8994 ])
9095
app/page/settings.mcssView
@@ -49,12 +49,20 @@
4949 div.right {
5050 flex-basis: 60%
5151 justify-content: flex-start
5252 }
53- }
5453
55- section -introduction {
56- margin-bottom: 2rem
54 + -introduction {
55 + margin-bottom: 2rem
56 + }
57 +
58 + -version {
59 + margin-top: 2rem
60 +
61 + div.right {
62 + $colorFontSubtle
63 + }
64 + }
5765 }
5866 }
5967 }
6068
translations/en.jsView
@@ -66,9 +66,10 @@
6666 section: {
6767 name: 'Name',
6868 introduction: 'Introduction',
6969 language: 'Language',
70- zoom: 'Zoom'
70 + zoom: 'Zoom',
71 + version: 'Version'
7172 }
7273 },
7374 addressBook: {
7475 action: {

Built with git-ssb-web