Skip to content

Commit

Permalink
fix: place QR Code button to the left (#64)
Browse files Browse the repository at this point in the history
* fix: place QR Code button to the left

* chore: build

* chore: increment version

Co-authored-by: Johnny Almonte <[email protected]>
  • Loading branch information
johnny243 and johnny243 authored Sep 7, 2021
1 parent 65f5ed3 commit def61b9
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions app/components/EditEntry.js
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,12 @@ export default class EditEntry extends React.Component {
<div className="sk-panel-section-title sk-panel-row">
{id != null ? 'Edit entry' : 'Add new entry'}
<div className="sk-panel-section-title sk-panel-row">
{id == null && (
<QRCodeReader
onSuccess={this.onQRCodeSuccess}
onError={this.onQRCodeError}
/>
)}
{entry.color && (
<div className="sk-button danger" onClick={this.removeColor}>
<div className="sk-label">Clear color</div>
Expand All @@ -160,12 +166,6 @@ export default class EditEntry extends React.Component {
<div className="color-picker-swatch" onClick={this.handleSwatchClick}>
<div style={swatchStyle} />
</div>
{id == null && (
<QRCodeReader
onSuccess={this.onQRCodeSuccess}
onError={this.onQRCodeError}
/>
)}
</div>
</div>
<form onSubmit={this.onSave} autoComplete="off">
Expand Down
2 changes: 1 addition & 1 deletion app/stylesheets/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -401,5 +401,5 @@ html {
// }

.qr-code-reader-container {
margin-left: 15px;
margin-right: 15px;
}
2 changes: 1 addition & 1 deletion dist/dist.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/dist.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sn-token-vault",
"version": "2.0.2",
"version": "2.0.3",
"main": "dist/dist.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
Expand Down

0 comments on commit def61b9

Please sign in to comment.