Skip to content

Commit

Permalink
Merge pull request #81 from MercuryWorkshop/workstore
Browse files Browse the repository at this point in the history
Seamless Ui
  • Loading branch information
MadjikDotPng authored Sep 11, 2023
2 parents c182648 + d82fc8c commit 7881658
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 17 deletions.
Binary file added public/assets/icons/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 25 additions & 1 deletion public/assets/icons/chrome.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/assets/icons/launcher.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 7 additions & 4 deletions src/Launcher.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,18 @@
}

#launcher-button {
background-color: gray;
opacity: 0.5;
background: rgba(255, 255, 255, 0.1);

border-radius: 50%;
height: 38px;
width: 38px;
height: 42px;
width: 42px;
}

#launcher-button img {
border-radius: 50%;
height: 15px;
width: 15px;
opacity: 100;
}
.hw-screen {
height: 100%;
Expand Down
4 changes: 2 additions & 2 deletions src/Launcher.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ class Launcher {
width: min(70%, 35em);
height: min(60%, 30em);
background-color: rgba(22, 22, 22, 0.8);
border: 1px solid rgba(0, 0, 0, 0.3);
border: 2px solid rgba(22, 22, 22, 0.6);
border-radius: 1em;
bottom: 5.25em;
bottom: 4.25em;
backdrop-filter: blur(5px);
display: flex;
flex-direction: column;
Expand Down
11 changes: 7 additions & 4 deletions src/Notifications.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@
.notif {
position: relative;
font-family: "Roboto";
background-color: rgba(28, 28, 28, 0.85);
background-color: rgba(22, 22, 22, 0.8);
border-radius: 7px;
color: white;
min-height: 115px;
width: 400px;
cursor: pointer;
margin: 10px;
left: 500px;
left: 525px;
animation: slideIn 0.5s ease-in-out forwards;
opacity: 1;
transition: 350ms ease-in-out;
border: 1px solid rgba(0, 0, 0, 1);
box-shadow: inset 0 0 0 1px #3e3e3e;
}

@keyframes slideIn {
Expand Down Expand Up @@ -55,12 +57,13 @@
padding-top: 10px;
padding-left: 10px;
padding-bottom: 10px;
font-size: 18px;
font-size: 16px;
}
.notif-title {
font-size: 24px;
font-size: 18px;
padding-left: 10px;
padding-top: 10px;
font-weight: bold;
}
.notif-close-indicator {
position: absolute;
Expand Down
8 changes: 4 additions & 4 deletions src/Taskbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@
background-color: rgba(255, 255, 255, 0.15);
aspect-ratio: 1/1;
padding: 0.1em;
padding-left: 1em;
padding-left: 1.5em;

padding-right: 1em;
padding-right: 1.5em;
/* width: 5em; */
right: 1em;
right: 0.3em;
top: 50%;
transform: translateY(-50%);

border-radius: 1em;
border-radius: 25px;
display: flex;
align-items: center;
justify-content: center;
Expand Down
4 changes: 3 additions & 1 deletion src/anura.css
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,10 @@ footer {
width: 100%;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
/* background-color: rgba(0, 0, 0, 0.55); */
background-color: rgba(22, 22, 22, 0.8);
border: 2px solid rgba(22, 22, 22, 0.6);
border: 1px solid rgba(0, 0, 0, 0.3);
box-shadow: inset 0 0 0 1px #3e3e3e;
border-bottom: none;
backdrop-filter: blur(5px);
}
Expand Down

0 comments on commit 7881658

Please sign in to comment.