Skip to content

Commit

Permalink
Squashed 'keyconjurer-v2/' changes from 4beb889..7c2fb08
Browse files Browse the repository at this point in the history
7c2fb08 Fix version bug in makefile
18b1913 Fix image changing size between tabs
80591e6 Correct typo
3e7c1c6 Apply formatting changes

git-subtree-dir: keyconjurer-v2
git-subtree-split: 7c2fb08
  • Loading branch information
punmechanic committed Nov 7, 2023
1 parent 5d7cb9e commit 28fdcb0
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@ frontend/build/index.html: frontend/node_modules
@test $${FRONTEND_URL?is not set}
@test $${API_URL?is not set}
cd frontend && \
REACT_APP_VERSION='$$(git rev-parse --short HEAD)-$(RELEASE)' \
REACT_APP_VERSION='$(shell git rev-parse --short HEAD)-$(RELEASE)' \
REACT_APP_API_URL=${API_URL} \
REACT_APP_DOCUMENTATION_URL=${REACT_APP_DOCUMENTATION_URL} \
REACT_APP_CLIENT=webUI npm run-script build
npm run-script build

### CLI Build Targets
cli/keyconjurer-linux-arm64 cli/keyconjurer-linux:
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/App.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
display: initial;
grid-row: 2;
grid-column: 1;
max-width: 600px;
width: 600px;
}

.Usage {
Expand Down
4 changes: 1 addition & 3 deletions frontend/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ const Usage = () => {
{
menuItem: "Windows",
render: () => (
<TabPane
dangerouslySetInnerHTML={{ __html: windowsUsageDocument }}
/>
<TabPane dangerouslySetInnerHTML={{ __html: windowsUsageDocument }} />
),
},
{
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/articles/WindowsUsage.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ We're still waiting for a brave explorer to write this section for us, as we don

# Download

* Windows (x64) (./keyconjurer-windows.exe)
* Windows (x64) [keyconjurer-windows.exe](./keyconjurer-windows.exe)

0 comments on commit 28fdcb0

Please sign in to comment.