Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
ChugunovRoman committed Sep 4, 2019
2 parents ac013a5 + 0f37329 commit 5bb948d
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 37 deletions.
16 changes: 8 additions & 8 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "figma-linux",
"version": "0.5.4",
"version": "0.5.5",
"description": "Figma is the first interface design tool based in the browser, making it easier for teams to create software.",
"main": "src/main/index.js",
"repository": "git@github.com:ChugunovRoman/figma-linux.git",
Expand Down Expand Up @@ -56,7 +56,7 @@
"clean-webpack-plugin": "^0.1.19",
"copy-webpack-plugin": "^4.5.2",
"css-loader": "^0.28.11",
"electron": "^4.2.9",
"electron": "^3.0.16",
"electron-builder": "^20.40.2",
"electron-rebuild": "^1.8.2",
"electron-webpack": "^2.6.1",
Expand Down
2 changes: 1 addition & 1 deletion src/main/window/Tabs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default class Tabs {
webPreferences: {
nodeIntegration: false,
contextIsolation: true,
webSecurity: false,
webSecurity: true,
webgl: true,
experimentalFeatures: false,
zoomFactor: Settings.get('ui.scaleFigmaUI') as number
Expand Down
2 changes: 1 addition & 1 deletion src/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "figma-linux",
"version": "0.5.4",
"version": "0.5.5",
"description": "Figma is the first interface design tool based in the browser, making it easier for teams to create software.",
"main": "main/main.js",
"repository": "git@github.com:ChugunovRoman/figma-linux.git",
Expand Down
1 change: 0 additions & 1 deletion src/utils/Main/Menu/menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ export const item = (label: string, accelerator: string, params: Menu.Params) =>

if (accelerator) {
props.accelerator = accelerator;
props.registerAccelerator = false;
}

return new E.MenuItem(props);
Expand Down
1 change: 0 additions & 1 deletion src/utils/Render/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
* Utils only for Renderer process
*/
export * from './webBindingsHelpers';
export * from './session';
23 changes: 0 additions & 23 deletions src/utils/Render/session.ts

This file was deleted.

0 comments on commit 5bb948d

Please sign in to comment.