Skip to content

Commit

Permalink
Merge pull request #115 from berlin/staging
Browse files Browse the repository at this point in the history
Staging to main
  • Loading branch information
ff6347 authored Apr 8, 2024
2 parents d2d9c4b + 05d1924 commit 761c51f
Show file tree
Hide file tree
Showing 14 changed files with 193 additions and 82 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @dnsos @vogelino
* @hanshack @raphael-arce @ff6347 @Jaszkowic
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.14.2
v20.10.0
48 changes: 31 additions & 17 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,42 @@
{
"workbench.colorCustomizations": {
"activityBar.activeBackground": "#5cd1b4",
"activityBar.activeBackground": "#77604e",
"activityBar.activeBorder": "#61666d",
"activityBar.background": "#29313b",
"activityBar.foreground": "#192e38",
"activityBar.inactiveForeground": "#61666d",
"activityBarBadge.background": "#5cd1b4",
"activityBarBadge.foreground": "#FFFFFF",
"statusBar.background": "#29313b",
"statusBar.foreground": "#d8dfe9",
"statusBarItem.hoverBackground": "#5cd1b4",
"titleBar.activeBackground": "#29313b",
"titleBar.activeForeground": "#d8dfe9",
"titleBar.inactiveBackground": "#1c222b",
"titleBar.inactiveForeground": "#61666d"
"activityBar.background": "#77604e",
"activityBar.foreground": "#e7e7e7",
"activityBar.inactiveForeground": "#e7e7e799",
"activityBarBadge.background": "#263a2f",
"activityBarBadge.foreground": "#e7e7e7",
"statusBar.background": "#58473a",
"statusBar.foreground": "#e7e7e7",
"statusBarItem.hoverBackground": "#77604e",
"titleBar.activeBackground": "#58473a",
"titleBar.activeForeground": "#e7e7e7",
"titleBar.inactiveBackground": "#58473a99",
"titleBar.inactiveForeground": "#e7e7e799",
"commandCenter.border": "#e7e7e799",
"editorGroup.border": "#77604e",
"panel.border": "#77604e",
"sash.hoverBorder": "#77604e",
"sideBar.border": "#77604e",
"statusBar.border": "#58473a",
"statusBar.debuggingBackground": "#3a4b58",
"statusBar.debuggingBorder": "#3a4b58",
"statusBar.debuggingForeground": "#e7e7e7",
"statusBarItem.remoteBackground": "#58473a",
"statusBarItem.remoteForeground": "#e7e7e7",
"tab.activeBorder": "#77604e",
"titleBar.border": "#58473a"
},
"workbench.colorTheme": "GitHub Dark",
"workbench.preferredDarkColorTheme": "GitHub Dark",

"editor.defaultFormatter": "rvest.vs-code-prettier-eslint",
"editor.formatOnPaste": false, // required
"editor.formatOnPaste": false, // required
"editor.formatOnType": false, // required
"editor.formatOnSave": true, // optional
"editor.formatOnSave": true, // optional
"editor.formatOnSaveMode": "file", // required to format on save
"files.autoSave": "onFocusChange" // optional but recommended

"files.autoSave": "onFocusChange",
"peacock.color": "#58473a" // optional but recommended

}
98 changes: 89 additions & 9 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@testing-library/user-event": "14.4.3",
"@types/d3": "7.4.0",
"@types/jest": "27.5.2",
"@types/node": "16.18.3",
"@types/node": "20.10.6",
"@types/react": "17.0.52",
"@types/react-dom": "17.0.18",
"@types/react-type-animation": "1.1.1",
Expand Down
Loading

0 comments on commit 761c51f

Please sign in to comment.