diff --git a/src/pages/login/login.tsx b/src/pages/login/login.tsx
index 938c967..c559bdf 100644
--- a/src/pages/login/login.tsx
+++ b/src/pages/login/login.tsx
@@ -65,7 +65,7 @@ function login(){
navigate("main_page")}>Login
+ Login
{error}
diff --git a/src/pages/main_page/assets/TOCA2.mp4 b/src/pages/main_page/assets/TOCA2.mp4 index dd1f7ec..67f1360 100644 Binary files a/src/pages/main_page/assets/TOCA2.mp4 and b/src/pages/main_page/assets/TOCA2.mp4 differ diff --git a/src/pages/main_page/assets/terminal.png b/src/pages/main_page/assets/terminal.png index 6764228..df09d52 100644 Binary files a/src/pages/main_page/assets/terminal.png and b/src/pages/main_page/assets/terminal.png differ diff --git a/src/pages/main_page/internal_apps/App.css b/src/pages/main_page/internal_apps/App.css index 9ac02d3..f69e9a1 100644 --- a/src/pages/main_page/internal_apps/App.css +++ b/src/pages/main_page/internal_apps/App.css @@ -1,7 +1,10 @@ .frametest { position: relative; display: block; - border: 2px #0202022f; + border-top: 1px #02020200; + border-left: 2px #0202022f; + border-right: 2px #0202022f; + border-bottom: 1px #02020200; border-style: solid; z-index: 99; padding-left: 373px; @@ -14,7 +17,9 @@ align-items: flex-start; height: 37px; background-color: #2f2f2f; - + border-top-left-radius: 10px; + border-top-right-radius: 10px; + } @@ -23,22 +28,20 @@ position:sticky; } -.frametest { - border-radius: 20px; -} .frametest2{ border-radius: 20px; border-bottom-left-radius: 20px; border-bottom-right-radius: 20px; backdrop-filter: blur(30px); - + -webkit-backdrop-filter: blur(30px); background-color: #333333d3; height: 50svh; } .frametext2{ color: white; + margin-top: .3svh; font-weight: normal; } .frame-content { diff --git a/src/pages/main_page/internal_apps/apps/file_system.css b/src/pages/main_page/internal_apps/apps/file_system.css index 3fa1537..1aa51cc 100644 --- a/src/pages/main_page/internal_apps/apps/file_system.css +++ b/src/pages/main_page/internal_apps/apps/file_system.css @@ -46,13 +46,12 @@ display: flex; align-items: center; margin-bottom: 1px; - border-top: 2px #0202022f; + min-height: 5svh; + height: 5svh; + border-top: 1px #0202022f; border-left: 2px #0202022f; - border-top-right-radius: 20px; - border-top-left-radius: 20px; border-right: 2px #0202022f; - border-bottom: 2px #0202022f; - border-top: #2f2f2f; + border-bottom: 1px #0202022f; border-style: solid; cursor: move; font-size: 1em; @@ -65,9 +64,6 @@ .frametest2 { position: absolute; display: block; - margin-top: 1svh; - border: 2px #0000001e; - border-style: solid; cursor:context-menu; font-size: 1em; color: white; @@ -79,6 +75,8 @@ background-color: #333333df; height: 50svh; backdrop-filter: blur(10px); + -webkit-backdrop-filter: blur(10px); + } .buttoncontextmenu { @@ -101,8 +99,11 @@ } .backdir { - height: 3vh; + height: 3.5vh; width: 2vw; - margin-bottom: 0.7svh; + margin-bottom: 0.8svh; margin-right: 0.5svh; } +.filesystemtxt2{ + font-weight: 250; +} \ No newline at end of file diff --git a/src/pages/main_page/main_page.css b/src/pages/main_page/main_page.css index 7e8178d..5acc84b 100644 --- a/src/pages/main_page/main_page.css +++ b/src/pages/main_page/main_page.css @@ -20,6 +20,7 @@ z-index: 2000; height: 5svh; backdrop-filter: blur(50px); + -webkit-backdrop-filter: blur(50px); width: 100%; } @@ -50,6 +51,7 @@ justify-content: right; padding-right: 1svh; margin-left: 2svh; + margin-top: .5svh; } @@ -141,6 +143,7 @@ color: white; background-color: #3333338b; transition: all 0.1s ease-in-out; backdrop-filter: blur(50px); + -webkit-backdrop-filter: blur(50px); border-right: 2px #0202022f; border-top: 2px #0202022f; border-left: 2px #0202022f; @@ -170,7 +173,7 @@ color: white; .leave { float: right; z-index: 1; - margin-top: 39.5svh; + margin-top: 41svh; margin-right: 0.5svh; margin-left: 0.8svh; @@ -213,7 +216,7 @@ color: white; .exit { float: right; z-index: 1; - margin-top: 39.4svh; + margin-top: 41svh; margin-right: .5svh; transition: transform 250ms; diff --git a/src/pages/main_page/main_page.tsx b/src/pages/main_page/main_page.tsx index e8cadf9..6af08eb 100644 --- a/src/pages/main_page/main_page.tsx +++ b/src/pages/main_page/main_page.tsx @@ -4,6 +4,7 @@ import Grid from './Grid'; import folder from './assets/folder.png'; import menu_icon from './assets/computer-laptop-color-icon.webp'; import search from './assets/search.png'; +import terminal from './assets/terminal.png'; import file_system from './internal_apps/apps/file_system'; import ibetonhakari from './assets/TOCA2.mp4'; import { desktop_app } from './Grid'; @@ -58,6 +59,8 @@ export default function MainPage() {Exit ðŸ˜â€‹