diff --git a/FSFW_Logo_V3_bw.png b/FSFW_Logo_V3_bw.png new file mode 100644 index 0000000..99b9b4f Binary files /dev/null and b/FSFW_Logo_V3_bw.png differ diff --git a/IRS_Uni_invers.jpg b/IRS_Uni_invers.jpg new file mode 100644 index 0000000..5e309ff Binary files /dev/null and b/IRS_Uni_invers.jpg differ diff --git a/cat.jpg b/cat.jpg deleted file mode 100644 index 9b7106b..0000000 Binary files a/cat.jpg and /dev/null differ diff --git a/index.css b/index.css index ef548d2..3a4f227 100644 --- a/index.css +++ b/index.css @@ -1,11 +1,15 @@ +@import url("https://fonts.googleapis.com/css2?family=Inter:wght@300&family=Rubik:wght@300&display=swap"); + body { margin: 0; padding: 0; + font-family: "Rubik", sans-serif; } .top-nav { padding: 10px 20px; - background-color: #2c2c2c; + background-color: black; + color: white; } .navbar { @@ -14,48 +18,31 @@ body { align-items: center; margin: 0; padding: 0; + margin-right:20px; +} +.navbar p { + font-weight: bold; + font-size: 20px; } .navbar img { - width: 50px; height: 60px; display: inline-block; + } - -.top-nav ul { - list-style: none; - display: flex; - margin: 0; - padding: 0; -} - -.top-nav li { - font-size: 14px; - margin: 0; - display: flex; - align-items: center; -} - -.top-nav ul li:not(:last-child) { - margin-right: 40px; -} - -.top-nav a { +.contact { text-decoration: none; - color: #f5f5f5; - transition: color 0.3s ease-in-out; + color: white; } -.top-nav a:hover { - color: #ff6600; -} .side-bar { - width: 200px; + width: 280px; height: 100%; background-color: #f1f1f1; padding: 0; margin-top: 0; + margin-bottom: 0; } .side-bar ul { @@ -65,8 +52,14 @@ body { .side-bar li { display: block; color: #000; - padding: 8px 10px; + padding: 17px 30px; text-decoration: none; + text-size:16 +} + +#fsfw-click { + background-color: #555; + color: white; } .side-bar li:hover { @@ -86,29 +79,56 @@ body { gap: 20px; } - .fsfw-desc { margin-top: 60px; + text-align: justify; } -#fsfw-content, #sat-rs-content { +.sat-rs-desc { + margin-top: 40px; + text-align: justify; +} + +#fsfw-content, +div#sat-rs-content { display: flex; flex-direction: column; justify-content: flex-start; align-items: center; padding-right: 170px; padding-left: 170px; - transform: translateY(90px); + transform: translateY(50px); } -#fsfw-links, #sat-rs-links { +#fsfw-content img +{ + width:50%; + object-fit:contain; + + height:auto; +} + +#sat-rs-content img +{ + width:30%; + object-fit:contain; + height:auto; +} + +#fsfw-links, +#sat-rs-links { display: flex; align-items: center; } .develop a, .master a, -.links a { +.links a, +.repo-container a { + display: block; + text-align: center; + width: 100%; + height: 100%; text-decoration: none; color: #000; } @@ -130,9 +150,39 @@ body { transition: color 0.3s; } -.develop li:hover, -.master li:hover { - background-color: #00beff; +.links h1 { + margin:0; + margin-top:20px; + display:flex; + justify-content: center; +} + + +.repo-container { + border: 2px solid #000; + margin: 20px; + padding-left: 0; + padding-right: 0; + width: 160px; + height: 60px; + display: flex; + align-items: center; + justify-content: center; + line-height: 60px; + transition: color 0.3s; +} + +.develop ul, +.links ul { + padding-left: 0; +} + +.develop li a:hover, +.master li a:hover, +.links li a:hover, +.repo-container a:hover { + background-color: black; + color: white; } .develop li { @@ -140,7 +190,7 @@ body { } #sat-rs-content { - display:none; + display: none; flex-direction: column; justify-content: flex-start; align-items: center; @@ -149,7 +199,6 @@ body { transform: translateY(90px); } - #sat-rs-content.hidden { display: none; } @@ -157,10 +206,43 @@ body { display: none; } #fsfw-content.visable { - display:flex; + display: flex; } #fsfw-content.hidden { - display:none + display: none; +} + +.footer { + background-color: black; + color: white; + text-align: center; + width: 100%; + display: flex; + left: 0; + bottom: 0; + display: flex; + justify-content:center +} + +.footer li { + font-size: 14px; + margin: 0; + display: flex; + flex-direction + text-align: center; -} \ No newline at end of file + +} + +.footer ul li:not(:last-child) { + margin-right: 150px; +} + +.footer a { + text-decoration: none; + color: #f5f5f5; + transition: color 0.3s ease-in-out; +} + + diff --git a/index.html b/index.html index 87fe9e8..00476aa 100644 --- a/index.html +++ b/index.html @@ -1,19 +1,17 @@ - The IRS doc website + IRS Software Projects
@@ -24,40 +22,75 @@
+ +
-

FSFW blab la bl abla bla bl fff ff ff ff ffffff ffff ff ff fffff ffffs args dfd fg hdfh gdf tjgf kgi kkkkk kkkk kk kkfd sfd sfdsf dsfssr tzj hl zigfd fdsf fff ffff fff ff ff ff ff f ff fff f ff f ff ff ffff ff f

+ src="FSFW_Logo_V3_bw.png"/> +

+ The Flight Software Framework is a C++ Object Oriented Framework for unmanned, automated systems like Satellites.
+ + The initial version of the Flight Software Framework was developed during the Flying Laptop Project by the University of Stuttgart in cooperation with Airbus Defence and Space GmbH. +

+

Documentation and Coverage

+

Repository

+
- - -
+ + + diff --git a/index.js b/index.js index 38cc5aa..d4c9525 100644 --- a/index.js +++ b/index.js @@ -6,9 +6,21 @@ const fsfw_content = document.getElementById("fsfw-content"); fsfw_click.addEventListener("click", () => { fsfw_content.style.display = "flex"; sat_content.style.display = "none"; + + fsfw_click.style.backgroundColor = "#555" + fsfw_click.style.color = "white" + + sat_click.style.backgroundColor = "#f1f1f1" + sat_click.style.color = "#000" + }); sat_click.addEventListener("click", () => { fsfw_content.style.display = "none"; sat_content.style.display = "flex"; + + fsfw_click.style.backgroundColor = "#f1f1f1" + fsfw_click.style.color = "#000" + sat_click.style.backgroundColor = "#555" + sat_click.style.color = "white" }); diff --git a/sat-rs_logo.png b/sat-rs_logo.png new file mode 100644 index 0000000..8c91a7d Binary files /dev/null and b/sat-rs_logo.png differ diff --git a/test.css b/test.css deleted file mode 100644 index 3776ae0..0000000 --- a/test.css +++ /dev/null @@ -1,8 +0,0 @@ -/* CSS */ -#sat-rs-content.hidden { - display: none; -} - -#fsfw-content.visible { - display: block; -} diff --git a/test.html b/test.html deleted file mode 100644 index ea606aa..0000000 --- a/test.html +++ /dev/null @@ -1,45 +0,0 @@ - - - - The IRS doc website - - - - - -
-
- -

FSFW blab la bl abla bla bl fff ff ff ff ffffff ffff ff ff fffff ffffs args dfd fg hdfh gdf tjgf kgi kkkkk kkkk kk kkfd sfd sfdsf dsfssr tzj hl zigfd fdsf fff ffff fff ff ff ff ff f ff fff f ff f ff ff ffff ff f

- - - - - \ No newline at end of file diff --git a/test.js b/test.js deleted file mode 100644 index c30c38d..0000000 --- a/test.js +++ /dev/null @@ -1,25 +0,0 @@ - - const fsfw_click = document.getElementById("fsfw-click"); - const sat_click = document.getElementById("sat-click"); - const sat_content = document.getElementById("sat-rs-content"); - const fsfw_content = document.getElementById("fsfw-content"); - - fsfw_click.addEventListener("click", () => { - console.log("Clicked on FSFW"); - fsfw_content.classList.remove("hidden"); - fsfw_content.classList.add("visible"); - - sat_content.classList.remove("visible"); - sat_content.classList.add("hidden"); - }); - - sat_click.addEventListener("click", () => { - console.log("Clicked on sat-rs"); // Check if the click event is triggered - fsfw_content.classList.remove("visible"); - fsfw_content.classList.add("hidden"); - - sat_content.classList.remove("hidden"); - sat_content.classList.add("visible"); - console.log("fsfw_content.classList:", fsfw_content.classList); // Check the class changes - }); - \ No newline at end of file