Skip to content

Commit 429f28f

Browse files
authored
Merge branch 'master' into mui-styles-migration
2 parents c31fc31 + b0d9f08 commit 429f28f

File tree

4 files changed

+20
-15
lines changed

4 files changed

+20
-15
lines changed

.prettierrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
"useTabs": false,
1414
"semi": true,
1515
"bracketSpacing": true,
16-
"jsxBracketSameLine": false
16+
"bracketSameLine": false
1717
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
"electron-webpack": "^2.8.2",
111111
"nodemon": "^3.1.10",
112112
"npm-run-all": "^4.1.5",
113-
"prettier": "^2.8.8",
113+
"prettier": "^3.6.2",
114114
"shx": "^0.4.0",
115115
"typescript": "^5.8.3",
116116
"wait-on": "^8.0.3"

src/app/App.js

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import ModifiedDialog from './components/ModifiedDialog';
3636

3737
import './App.css';
3838

39-
// Styled components for main layout
4039
const VerticalHeading = styled(Typography)(({ theme }) => ({
4140
writingMode: 'vertical-rl',
4241
textOrientation: 'upright',
@@ -82,7 +81,7 @@ const App = () => {
8281
));
8382

8483
function fileModifiedSnack(run) {
85-
let message = "Something happened"
84+
let message = 'Something happened';
8685
if (run.converted) {
8786
message = `Converted your ${run.convertedAlignmentFrom} alignment into fasta!`;
8887
}
@@ -389,10 +388,18 @@ const App = () => {
389388
<IconButton
390389
onClick={() => store.config.setDarkMode(!store.config.isDarkMode)}
391390
size="small"
392-
title={store.config.isDarkMode ? 'Switch to Light Mode' : 'Switch to Dark Mode'}
391+
title={
392+
store.config.isDarkMode
393+
? 'Switch to Light Mode'
394+
: 'Switch to Dark Mode'
395+
}
393396
sx={{ mr: 2, color: 'inherit' }}
394397
>
395-
{store.config.isDarkMode ? <LightModeIcon fontSize="small" /> : <DarkModeIcon fontSize="small" />}
398+
{store.config.isDarkMode ? (
399+
<LightModeIcon fontSize="small" />
400+
) : (
401+
<DarkModeIcon fontSize="small" />
402+
)}
396403
</IconButton>
397404
<Box display="flex">
398405
{/* In dev mode the app version shown is from electron, in production it is ours */}
@@ -444,11 +451,9 @@ const App = () => {
444451
severity={run.exitCode === 0 ? 'success' : 'info'}
445452
sx={{ width: '100%' }}
446453
>
447-
{
448-
run.exitCode === 0
449-
? 'Calculation finished!'
450-
: `Calculation cancelled!`
451-
}
454+
{run.exitCode === 0
455+
? 'Calculation finished!'
456+
: `Calculation cancelled!`}
452457
</Alert>
453458
</Snackbar>
454459
{fileModifiedSnack(run)}

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12218,10 +12218,10 @@ prepend-http@^2.0.0:
1221812218
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
1221912219
integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==
1222012220

12221-
prettier@^2.8.8:
12222-
version "2.8.8"
12223-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
12224-
integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
12221+
prettier@^3.6.2:
12222+
version "3.6.2"
12223+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.6.2.tgz#ccda02a1003ebbb2bfda6f83a074978f608b9393"
12224+
integrity sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==
1222512225

1222612226
pretty-bytes@^4.0.2:
1222712227
version "4.0.2"

0 commit comments

Comments
 (0)