Commit 94527b097121d2903dc3709ec79709a5804d13c9
Merge pull request #128 from ticktackim/versions
add version to settings pagemix 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.js | changed |
app/page/settings.mcss | changed |
translations/en.js | changed |
app/page/settings.js | ||
---|---|---|
@@ -1,8 +1,9 @@ | ||
1 | 1 … | const nest = require('depnest') |
2 | 2 … | const { h, computed } = require('mutant') |
3 | 3 … | const electron = require('electron') |
4 | 4 … | const path = require('path') |
5 … | +const { version } = require('../../package.json') | |
5 | 6 … | |
6 | 7 … | exports.gives = nest('app.page.settings') |
7 | 8 … | |
8 | 9 … | exports.needs = nest({ |
@@ -83,8 +84,12 @@ | ||
83 | 84 … | ]), |
84 | 85 … | h('section -zoom', [ |
85 | 86 … | h('div.left', strings.settingsPage.section.zoom), |
86 | 87 … | 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) | |
87 | 92 … | ]) |
88 | 93 … | ]) |
89 | 94 … | ]) |
90 | 95 … |
app/page/settings.mcss | ||
---|---|---|
@@ -49,12 +49,20 @@ | ||
49 | 49 … | div.right { |
50 | 50 … | flex-basis: 60% |
51 | 51 … | justify-content: flex-start |
52 | 52 … | } |
53 | - } | |
54 | 53 … | |
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 … | + } | |
57 | 65 … | } |
58 | 66 … | } |
59 | 67 … | } |
60 | 68 … |
Built with git-ssb-web