Skip to content

Commit

Permalink
Icons and build assets.
Browse files Browse the repository at this point in the history
  • Loading branch information
steveruizok committed Feb 11, 2021
1 parent 28f5c59 commit 8b7e054
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 14 deletions.
2 changes: 1 addition & 1 deletion app/background.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/background.js.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions main/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ if (isProd) {

mainWindow.setIgnoreMouseEvents(true, { forward: true })
mainWindow.setAlwaysOnTop(true, "floating")
mainWindow.maximize()

if (isProd) {
await mainWindow.loadURL("app://./home.html")
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"private": true,
"name": "my-nextron-app",
"description": "My application description",
"version": "1.0.0",
"author": "Yoshihide Shiono <[email protected]>",
"name": "telestrator",
"description": "A drawing app for streaming.",
"version": "0.1.0",
"author": "Steve Ruiz @steveruizok",
"main": "app/background.js",
"scripts": {
"dev": "nextron",
Expand Down
13 changes: 7 additions & 6 deletions renderer/components/controls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,14 @@ const ControlsContainer = styled.div<{ showActive: boolean }>`
opacity: ${({ showActive }) => (showActive ? 1 : 0.2)};
transition: all 0.25s;
border-radius: 2px 20px 0 0;
background-color: rgba(255, 255, 255, 0);
background-color: rgba(144, 144, 144, 0);
transform: ${({ showActive }) =>
showActive ? "translate(0px 0px)" : "translate(-48px, 0px)"};
:hover {
opacity: 1;
transform: translate(0px, 0px);
background-color: rgba(255, 255, 255, 0.05);
background-color: rgba(144, 144, 144, 0.1);
}
button {
Expand Down Expand Up @@ -153,11 +153,12 @@ const ColorButton = styled.button<{ isSelected: boolean; color: string }>`
background-color: ${({ color }) => color};
height: 100%;
width: 100%;
transform: scale(${({ isSelected }) => (isSelected ? 0.5 : 0.2)});
transform: scale(${({ isSelected }) => (isSelected ? 0.68 : 0.4)});
transition: transform 0.12s;
}
&:hover:after {
border: 1px solid rgba(144, 144, 144, 0);
transform: scale(1);
}
`
Expand Down Expand Up @@ -229,7 +230,7 @@ const ToolButton = styled.button<{
&:enabled:hover {
opacity: 1;
color: rgba(255, 255, 255, 1);
color: rgba(144, 144, 144, 1);
}
&::before {
Expand All @@ -243,11 +244,11 @@ const ToolButton = styled.button<{
transform: scale(0.85);
transition: all 0.16s;
z-index: -1;
background-color: rgba(255, 255, 255, 0);
background-color: rgba(144, 144, 144, 0);
}
&:enabled:hover::before {
transform: scale(1);
background-color: rgba(255, 255, 255, 0.3);
background-color: rgba(144, 144, 144, 0.2);
}
`
2 changes: 1 addition & 1 deletion renderer/lib/defaults.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const colors = [
"#42a6f6",
"#74eff7",
// "#94afc2",
"#f4f4f4",
"#ffffff",
"#1a1c2c",
// "#566c86",
// "#343d57",
Expand Down
2 changes: 1 addition & 1 deletion renderer/lib/state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const state = createState({
data: {
isDragging: false,
refs: undefined as Refs | undefined,
color: "red",
color: "#42a6f6",
size: 16,
marks: [] as Mark[],
currentMark: undefined as Mark | undefined,
Expand Down
Binary file modified resources/icon.icns
Binary file not shown.
Binary file modified resources/icon.ico
Binary file not shown.

0 comments on commit 8b7e054

Please sign in to comment.