Skip to content

Commit

Permalink
Merge pull request #44 from bornova/dev
Browse files Browse the repository at this point in the history
v4.5.4
  • Loading branch information
bornova committed Feb 16, 2024
2 parents 8c92dc4 + 8a0c5e5 commit 060db54
Show file tree
Hide file tree
Showing 10 changed files with 80 additions and 68 deletions.
4 changes: 2 additions & 2 deletions build/css/app.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/css/dark.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/css/light.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions build/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@
<h2 class="uk-modal-title uk-text-center">Save Calculation</h2>
<div><input id="saveTitle" class="textBox" type="text" maxlength="36" placeholder="Title (Optional)" /></div>
<div uk-grid>
<div class="dialog-buttons uk-width-1-2 uk-flex-left">
<div class="dialog-buttons uk-width-1-3 uk-flex-left">
<a id="dialog-save-export" class="exportButton" title="Export Calculations">
<i data-lucide="file-output"></i>Export
</a>
</div>
<div class="dialog-buttons uk-width-1-2 uk-flex-right">
<div class="dialog-buttons uk-width-2-3 uk-flex-right">
<button class="uk-button uk-button-default uk-modal-close uk-button-small">Cancel</button>
<button id="dialog-save-save" class="uk-button uk-button-primary uk-button-small">Save</button>
</div>
Expand All @@ -84,12 +84,12 @@ <h2 class="uk-modal-title uk-text-center">Save Calculation</h2>
<h2 class="uk-modal-title uk-text-center">Open Calculation</h2>
<div id="dialog-open-body" class="dialog-open-body uk-overflow-auto"></div>
<div uk-grid>
<div class="dialog-buttons uk-width-1-2 uk-flex-left">
<div class="dialog-buttons uk-width-1-3 uk-flex-left">
<a id="dialog-save-import" class="importButton" title="Import Calculations">
<i data-lucide="file-input"></i>Import
</a>
</div>
<div class="dialog-buttons uk-width-1-2 uk-flex-right">
<div class="dialog-buttons uk-width-2-3 uk-flex-right">
<button id="dialog-open-deleteAll" class="uk-button uk-button-danger uk-button-small">Delete All</button>
<button class="uk-button uk-button-primary uk-modal-close uk-button-small">Close</button>
</div>
Expand Down Expand Up @@ -488,7 +488,7 @@ <h3>Currency Conversion</h3>
<a id="defaultSettingsButton" class="defSettingsButton" title="Restore default settings" uk-tooltip>
<i data-lucide="undo-dot"></i>
</a>
<a id="resetSizeButton" class="resetSizeButton" title="Restore window size" uk-tooltip>
<a id="resetSizeButton" class="resetSizeButton" title="Reset window size" uk-tooltip>
<i data-lucide="scaling"></i>
</a>
</div>
Expand Down
40 changes: 20 additions & 20 deletions build/js/app.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/js/app.js.map

Large diffs are not rendered by default.

66 changes: 39 additions & 27 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "numara",
"productName": "Numara",
"description": "Numara Calculator",
"version": "4.5.3",
"version": "4.5.4",
"author": {
"name": "Timur Atalay",
"email": "[email protected]",
Expand All @@ -28,7 +28,7 @@
"@formulajs/formulajs": "^4.4.1",
"codemirror": "^5.65.16",
"deep-diff": "^1.0.2",
"electron": "^28.2.2",
"electron": "^28.2.3",
"electron-builder": "^24.9.1",
"esbuild": "^0.20.0",
"esbuild-plugin-polyfill-node": "^0.3.0",
Expand All @@ -42,7 +42,7 @@
"mousetrap": "^1.6.5",
"mousetrap-global-bind": "^1.1.0",
"prettier": "^3.2.5",
"uikit": "^3.18.2"
"uikit": "^3.18.3"
},
"dependencies": {
"electron-store": "^8.1.0",
Expand Down
Loading

0 comments on commit 060db54

Please sign in to comment.