Merge pull request #1 from JanluOfficial/main

Retheming and system.version()
AzuSystem · Dec 10, 2024 · 7ab3e1f · 7ab3e1f
2 parents 3eed2a2 + da39e78
commit 7ab3e1f
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 48 deletions.
diff --git a/assets/logo_black.svg b/assets/logo_black.svg
diff --git a/assets/logo_white.svg b/assets/logo_white.svg
diff --git a/libs/system/sdk.js b/libs/system/sdk.js
@@ -313,4 +313,10 @@ const element = {
 			resolve(elementObject);
 		});
 	}
-};
+};
+
+const system = {
+    version: () => {
+        return 8;
+    }
+}
diff --git a/pkgs/apps/desktop/notification.js b/pkgs/apps/desktop/notification.js
@@ -4,7 +4,7 @@
 */
 
 const notificationcss = (`
-  background-color: hsla(270, 44%, 12%, 75%);
+  background-color: hsla(270, 0%, 12%, 75%);
   outline: 1px solid rgba(255, 255, 255, 0.125);
   position: fixed;
   bottom: 60px;

diff --git a/pkgs/apps/desktop/taskbar.js b/pkgs/apps/desktop/taskbar.js
@@ -4,46 +4,46 @@
 */
 
 const taskbarcss = (`
-	  background-color: hsla(270, 44%, 12%, 75%);
-	  outline: 1px solid rgba(255, 255, 255, 0.125);
-	  /*border-radius: 4px;*/
-	  position: fixed;
-	  bottom: 0px;
-	  width: 80%;
-	  margin: 15px;
-	  height: 45px;
-	  padding: 0px;
-	  left: 0;
-	  right: 0;
-	  margin-left: auto;
-	  margin-right: auto;
-	  box-shadow: 0 0 10px 2px #000000cc;
-	  display: flex;
-	  z-index: 50;
-	  backdrop-filter: blur(16px) saturate(200%);
-	  -webkit-backdrop-filter: blur(16px) saturate(180%);
-	  border-radius: 12px;
-	  display: flex;
-	  flex-direction: row;
-	  align-items: center;
-	  justify-content: left;
-	  text-align: center;
+	background-color: hsla(270, 0%, 12%, 75%);
+	outline: 1px solid rgba(255, 255, 255, 0.125);
+	/*border-radius: 4px;*/
+	position: fixed;
+	bottom: 0px;
+	width: 80%;
+	margin: 15px;
+	height: 45px;
+	padding: 0px;
+	left: 0;
+	right: 0;
+	margin-left: auto;
+	margin-right: auto;
+	box-shadow: 0 0 10px 2px #000000cc;
+	display: flex;
+	z-index: 50;
+	backdrop-filter: blur(16px) saturate(200%);
+	-webkit-backdrop-filter: blur(16px) saturate(180%);
+	border-radius: 12px;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: left;
+	text-align: center;
 `)
 
 const taskbarcomponent = (`
-  border: 0px;
-  border-radius: 0px;
-  /* width: 45px; */
-  height: 45px;
-  padding: 5px 5px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  text-align: center;
-  z-index: 50;
-  background: none;
-  border: 0;
-  transition-duration: 0.1s
+  	border: 0px;
+  	border-radius: 0px;
+  	/* width: 45px; */
+  	height: 45px;
+  	padding: 5px 5px;
+  	display: flex;
+  	align-items: center;
+  	justify-content: center;
+  	text-align: center;
+  	z-index: 50;
+  	background: none;
+  	border: 0;
+  	transition-duration: 0.1s
 `)
 
 const taskbarstart = (`
@@ -92,7 +92,7 @@ element.create('button', '', 'start-btn').then(elm => elm
 );
 
 element.create('img', '', '').then(elm => elm
-	.src('assets/logo.svg')
+	.src('assets/logo_white.svg')
 	.width(30)
 	.height(30)
 	.dropshadow('0px 4px 5px #00000050')

diff --git a/pkgs/apps/desktop/watermark.js b/pkgs/apps/desktop/watermark.js
@@ -3,14 +3,17 @@
 	Written by: MTSyntho @ AzuSystem 2024
 */
 
+// Gets system version
+var systemversion = system.version().toString();
+
 // Create a <p> element
 var watermark = document.createElement('p');
 
 // Set the class attribute
 watermark.className = 'sysver';
 
 // Set the inner HTML
-watermark.innerHTML = 'AzuOS Alpha 8<br>By AzuSystem';
+watermark.innerHTML = 'AzuOS Alpha ' + systemversion + '<br>By AzuSystem';
 
 // Add to desktop
 var desktop = document.getElementById('desktop');

diff --git a/pkgs/apps/dynamic-test.js b/pkgs/apps/dynamic-test.js
@@ -1,3 +1,5 @@
+var systemversion = system.version().toString();
+
 win.create("sdk testing", "root2").then(win => win
 	.setWidth(700)
 	.setHeight(500)
@@ -20,7 +22,7 @@ element.create('p', 'This script is used to test the AzuOS SDK', "tes").then(elm
 	.textalign('center')
 );
 
-element.create('p', 'Copyright @ AzuSystem 2024 - AzuOS Alpha 7', "tes").then(elm => elm
+element.create('p', 'Copyright @ AzuSystem 2024 - AzuOS Alpha ' + systemversion, "tes").then(elm => elm
 	.window("root2")
 	.textalign('center')
 );
diff --git a/pkgs/apps/sysver.js b/pkgs/apps/sysver.js
@@ -5,6 +5,8 @@
 // 	type: "process"
 // }
 
+var systemversion = system.version().toString();
+
 win.create("About AzuOS", "root").then(win => win
 	.setWidth(700)
 	.setHeight(500)
@@ -64,7 +66,7 @@ element.create('p', 'AzuOS is an Operating System written primarily with Web Tec
 	.parent('contents')
 );
 
-element.create('p', 'Copyright @ AzuSystem 2024 - AzuOS Alpha 8', "tes").then(elm => elm
+element.create('p', 'Copyright @ AzuSystem 2024 - AzuOS Alpha ' + systemversion, "tes").then(elm => elm
 	.parent('contents')
 );
 

diff --git a/stylesheets/index.css b/stylesheets/index.css
@@ -3,7 +3,7 @@ body {
 }
 
 .desktop {
-  background-image: url('../assets/wallpapers/palm tree near dome.jpg');
+  background-image: url('../assets/wallpapers/dark\ waves.jpg');
   background-size: cover;
   background-attachment: fixed;
   top: 0px;

diff --git a/stylesheets/window.css b/stylesheets/window.css
@@ -35,9 +35,9 @@
 }
 
 .winbox {
-    backdrop-filter: blur(16px) saturate(180%);
-    -webkit-backdrop-filter: blur(16px) saturate(180%);
-    background-color: rgba(30, 17, 44, 0.75);
+    -webkit-backdrop-filter: blur(16px) /* saturate(180%) */;
+    backdrop-filter: blur(16px) /* saturate(180%) */;
+    background-color: hsla(269, 0%, 12%, 0.75);
     border-radius: 12px;
     border: 1px solid rgba(255, 255, 255, 0.125);
     box-shadow: 0px 0px 30px #000000;
@@ -52,7 +52,7 @@
 
 .wb-body {
     /* set the width of window border via margin: */
-    background: #150d1f50;
+    background: hsla(267, 0%, 9%, 0.0); /* Originally 0.314 */
 }
 
 @font-face {