Commit f1afbfb0382d0d2375a5ca7ec9bc9b673a9bff84
stylefix: newThread button + Button
mix irving committed on 9/28/2017, 1:17:30 AMParent: 0107e46b337f0846775565435aaf8a90f95b1955
Files changed
| app/html/context.js | changed |
| styles/button.mcss | changed |
| app/html/context.js | ||
|---|---|---|
| @@ -74,9 +74,9 @@ | ||
| 74 | 74 | ]) |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | function LevelTwoContext () { |
| 78 | - const { key, value, feed: targetUser } = location | |
| 78 | + const { key, value, feed: targetUser, page } = location | |
| 79 | 79 | const root = get(value, 'content.root', key) |
| 80 | 80 | if (!targetUser) return |
| 81 | 81 | |
| 82 | 82 | var threads = MutantArray() |
| @@ -93,10 +93,11 @@ | ||
| 93 | 93 | ) |
| 94 | 94 | |
| 95 | 95 | return h('div.level.-two', [ |
| 96 | 96 | Option({ |
| 97 | + selected: page === 'threadNew', | |
| 97 | 98 | location: {page: 'threadNew', feed: targetUser}, |
| 98 | - label: h('Button', strings.threadNew.action.new) | |
| 99 | + label: h('Button', strings.threadNew.action.new), | |
| 99 | 100 | }), |
| 100 | 101 | map(threads, thread => { |
| 101 | 102 | return Option({ |
| 102 | 103 | selected: thread.key === root, |
| styles/button.mcss | ||
|---|---|---|
| @@ -1,29 +1,32 @@ | ||
| 1 | 1 | Button { |
| 2 | 2 | font-family: arial |
| 3 | 3 | text-align: center |
| 4 | 4 | |
| 5 | - cursor: pointer | |
| 5 | + $backgroundPrimary | |
| 6 | 6 | |
| 7 | + min-width: 6rem | |
| 7 | 8 | padding: .2rem 1rem |
| 8 | - min-width: 6rem | |
| 9 | + | |
| 9 | 10 | border: 1px #b9b9b9 solid |
| 10 | 11 | border-radius: 10rem |
| 11 | 12 | |
| 13 | + cursor: pointer | |
| 14 | + | |
| 12 | 15 | -subtle { |
| 13 | 16 | color: #b9b9b9 |
| 14 | 17 | :hover { |
| 15 | 18 | color: #222 |
| 16 | 19 | } |
| 17 | 20 | } |
| 21 | + | |
| 18 | 22 | -primary { |
| 19 | 23 | $colorPrimary |
| 24 | + border: none | |
| 20 | 25 | |
| 21 | 26 | :hover { |
| 22 | 27 | opacity: .9 |
| 23 | 28 | } |
| 24 | - | |
| 25 | - border: 1px solid #3dc8c3 | |
| 26 | 29 | } |
| 27 | 30 | |
| 28 | 31 | -showMore { |
| 29 | 32 | width: 100% |
Built with git-ssb-web