Skip to content

Commit

Permalink
style fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Moebits committed Aug 13, 2021
1 parent 564da2b commit 478a2e3
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 10 deletions.
3 changes: 2 additions & 1 deletion components/PhotoViewer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const PhotoViewer: React.FunctionComponent = (props) => {
const [resetHover, setResetHover] = useState(false)
const [previousHover, setPreviousHover] = useState(false)
const [nextHover, setNextHover] = useState(false)
const [image, setImage] = useState(noImage)
const [image, setImage] = useState("")
const [hover, setHover] = useState(false)
const initialCropState = {unit: "%", x: 0, y: 0, width: 100, height: 100, aspect: undefined}
const [cropState, setCropState] = useState(initialCropState)
Expand Down Expand Up @@ -152,6 +152,7 @@ const PhotoViewer: React.FunctionComponent = (props) => {
const copyAddress = () => {
clipboard.writeText(image)
}
if (!image) setImage(noImage)
ipcRenderer.on("copy-image", copyImage)
ipcRenderer.on("copy-address", copyAddress)
ipcRenderer.on("save-img-context", save)
Expand Down
12 changes: 12 additions & 0 deletions components/TitleBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ const TitleBar: React.FunctionComponent = (props) => {
document.documentElement.style.setProperty("--text-color", "#3177f5")
document.documentElement.style.setProperty("--button-color", "#090409")
document.documentElement.style.setProperty("--button-text", "#4486ff")
document.documentElement.style.setProperty("--version-color", "#090409")
document.documentElement.style.setProperty("--version-text", "#3a8fff")
document.documentElement.style.setProperty("--version-accept", "#090409")
document.documentElement.style.setProperty("--version-reject", "#090409")
document.documentElement.style.setProperty("--version-accept-text", "#4486ff")
document.documentElement.style.setProperty("--version-reject-text", "#338bff")
setTheme("dark")
ipcRenderer.invoke("save-theme", "dark")
} else {
Expand All @@ -119,6 +125,12 @@ const TitleBar: React.FunctionComponent = (props) => {
document.documentElement.style.setProperty("--text-color", "black")
document.documentElement.style.setProperty("--button-color", "#4486ff")
document.documentElement.style.setProperty("--button-text", "black")
document.documentElement.style.setProperty("--version-color", "#3a8fff")
document.documentElement.style.setProperty("--version-text", "black")
document.documentElement.style.setProperty("--version-accept", "#4486ff")
document.documentElement.style.setProperty("--version-reject", "#338bff")
document.documentElement.style.setProperty("--version-accept-text", "black")
document.documentElement.style.setProperty("--version-reject-text", "black")
setTheme("light")
ipcRenderer.invoke("save-theme", "light")
}
Expand Down
6 changes: 6 additions & 0 deletions index.less
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
--button-text: black;
--selection-color: #3491fc;
--bg-color: #7294cf;
--version-color: #3a8fff;
--version-text: black;
--version-accept: #4486ff;
--version-reject: #338bff;
--version-accept-text: black;
--version-reject-text: black;
}

* {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "photo-viewer",
"version": "0.0.2",
"version": "0.0.3",
"description": "An image/GIF viewer that can apply various resizing and color effects.",
"main": "dist/main.js",
"scripts": {
Expand Down
16 changes: 8 additions & 8 deletions styles/versiondialog.less
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
width: 35%;
height: 30%;
border-radius: 10px;
background-color: #3a8fff;
background-color: var(--version-color);
padding: 10px;
display: flex;
flex-direction: column;
Expand All @@ -37,7 +37,7 @@
}

.version-dialog-text {
color: black;
color: var(--version-text);
cursor: text;
user-select: text;
font-size: 20px;
Expand All @@ -59,11 +59,11 @@
padding-bottom: 7px;
padding-left: 14px;
padding-right: 14px;
color: black;
color: var(--version-reject-text);
font-size: 20px;
font-family: "Maven Pro", sans-serif;
background-color: #338bff;
border: 3px solid black;
background-color: var(--version-reject);
border: 3px solid var(--version-reject-text);
&:hover {
color: white;
border: 3px solid white;
Expand All @@ -77,11 +77,11 @@
padding-bottom: 7px;
padding-left: 14px;
padding-right: 14px;
color: black;
color: var(--version-accept-text);
font-size: 20px;
font-family: "Maven Pro", sans-serif;
background-color: #4486ff;
border: 3px solid black;
background-color: var(--version-accept);
border: 3px solid var(--version-accept-text);
&:hover {
color: white;
border: 3px solid white;
Expand Down

0 comments on commit 478a2e3

Please sign in to comment.