Newest version with new fonts

This commit is contained in:
Nadine Eunuos 2023-09-19 17:47:26 +02:00
parent 6699c230ca
commit 7486b5d17c
13 changed files with 548 additions and 226 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

103
index.css
View File

@ -1,15 +1,20 @@
@import url("https://fonts.googleapis.com/css2?family=Inter:wght@300&family=Rubik:wght@300&display=swap");
@font-face {
font-family: 'univers';
src: url('/fonts/UniversforUniS55Rm-Regular.ttf') format('truetype');
}
body {
margin: 0;
padding: 0;
font-family: "Rubik", sans-serif;
font-family: "univers";
color:#323232
}
.top-nav {
padding: 10px 20px;
background-color: black;
padding: 15px 20px;
background-color: #323232;
color: white;
}
.navbar {
@ -49,20 +54,33 @@ body {
.side-bar li {
display: block;
color: #000;
padding: 17px 30px;
color: #323232;
text-decoration: none;
text-size: 16;
}
.side-bar li a {
display: block;
height: 100%;
width: 100%;
box-sizing: border-box;
padding:17px 30px;
text-decoration: none;
color: black
#fsfw-click {
}
#fsfw-click
#sat-click {
background-color: #555;
color: white;
}
.side-bar li:hover {
background-color: #555;
.side-bar li a:hover {
background-color: #606060;
color: white;
}
.side-bar-container {
@ -74,11 +92,17 @@ body {
.container {
display: flex;
flex-direction: row;
gap: 20px;
}
.logo {
margin-top:60px;
margin-bottom: 60px;
width : auto
}
.fsfw-desc {
margin-top: 60px;
margin-top:60px;
text-align: justify;
}
@ -87,15 +111,14 @@ body {
text-align: justify;
}
#fsfw-content,
div#sat-rs-content {
.content {
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: center;
padding-right: 170px;
padding-left: 170px;
transform: translateY(50px);
//transform: translateY(50px);
}
#fsfw-content img {
@ -105,8 +128,8 @@ div#sat-rs-content {
height: auto;
}
#sat-rs-content img {
width: 30%;
.content img {
width: 40%;
object-fit: contain;
height: auto;
}
@ -119,21 +142,29 @@ div#sat-rs-content {
.develop a,
.master a,
.links a,
.sat-doc a,
.repo-container a {
display: block;
text-align: center;
width: 100%;
height: 100%;
text-decoration: none;
color: #000;
color: white;
background-color: #004191
}
.img-container {
width: 100%;
display: flex;
justify-content: center;
align-items: center;
}
.develop li,
.master li,
.links li {
.sat-doc li {
list-style: none;
border: 2px solid #000;
margin: 20px;
padding-left: 0;
padding-right: 0;
@ -153,8 +184,8 @@ div#sat-rs-content {
justify-content: center;
}
.repo-container {
border: 2px solid #000;
.repo-container p {
//border: 2px solid #000;
margin: 20px;
padding-left: 0;
padding-right: 0;
@ -168,15 +199,17 @@ div#sat-rs-content {
}
.develop ul,
.links ul {
.links ul,
.sat-doc ul,
.repo-container p {
padding-left: 0;
}
.develop li a:hover,
.master li a:hover,
.links li a:hover,
.repo-container a:hover {
background-color: black;
.repo-container p a:hover {
background-color: #323232;
color: white;
}
@ -185,31 +218,16 @@ div#sat-rs-content {
}
#sat-rs-content {
display: none;
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: center;
padding-right: 170px;
padding-left: 170px;
transform: translateY(90px);
}
#sat-rs-content.hidden {
display: none;
}
#sat-rs-content.visible {
display: none;
}
#fsfw-content.visable {
display: flex;
}
#fsfw-content.hidden {
display: none;
}
.footer {
background-color: black;
background-color: #323232;
color: white;
text-align: center;
width: 100%;
@ -218,6 +236,7 @@ div#sat-rs-content {
bottom: 0;
display: flex;
justify-content: center;
}
.footer li {

View File

@ -1,14 +1,16 @@
<!doctype html>
<!DOCTYPE html>
<html>
<head>
<head>
<title>IRS Software Projects</title>
<link rel="stylesheet" href="index.css" />
<script src="index.js" defer></script>
</head>
<body>
</head>
<body>
<nav class="top-nav">
<div class="navbar">
<img src="images/IRS_Uni_invers.jpg" clas="navbar-logo" />
<img src="images/unilogo_schriftzug_white.png" clas="navbar-logo" />
<p>IRS Satellite Software Projects</p>
<a href="#" class="contact">Contact</a>
@ -17,148 +19,60 @@
<div class="container">
<div class="side-bar-container">
<ul class="side-bar">
<li id="fsfw-click">FSFW</li>
<li id="sat-click">sat-rs</li>
<li id="fsfw-click"><a href="index.html">FSFW</a></li>
<li id="sat-click"><a href="sat-rs.html">sat-rs</a></li>
</ul>
</div>
<div class="content">
<div id="homepage" class="hidden">
<p></p>
<div id="sat-rs-content">
<div class="img-container">
<img class="logo" src="images/FSFW_Logo_V3_bw.png" />
</div>
<div id="fsfw-content" class="visible">
<img src="images/FSFW_Logo_V3_bw.png" />
<p class="fsfw-desc">
The Flight Software Framework is a C++ Object Oriented Framework for
unmanned, automated systems like Satellites.<br />
The Flight Software Framework is a C++ Object Oriented Framework for unmanned, automated systems like
Satellites.<br>
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.
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.
</p>
<h1>Documentation and Coverage</h1>
<div id="fsfw-links">
</h1>
<div class="develop">
<ul>
<li>
<a
href="https://documentation.irs.uni-stuttgart.de/fsfw/development/"
target="_blank"
>develop</a
>
</li>
<li>
<a
href="https://documentation.irs.uni-stuttgart.de/fsfw/coverage/development/"
target="_blank"
>&#8594; coverage</a
>
</li>
<li><a href="https://documentation.irs.uni-stuttgart.de/fsfw/development/" target="_blank">DEVELOPE</a></li>
<li><a href="https://documentation.irs.uni-stuttgart.de/fsfw/coverage/development/" target="_blank">&#8594;
COVERAGE</a></li>
</ul>
</div>
<div class="master">
<ul>
<li>
<a
href="https://documentation.irs.uni-stuttgart.de/fsfw/master/"
target="_blank"
>master</a
>
</li>
<li>
<a
href="https://documentation.irs.uni-stuttgart.de/fsfw/"
target="_blank"
>&#8594; coverage</a
>
</li>
<li><a href="https://documentation.irs.uni-stuttgart.de/fsfw/master/" target="_blank">MASTER</a></li>
<li><a href="https://documentation.irs.uni-stuttgart.de/fsfw/" target="_blank">&#8594; COVERAGE</a></li>
</ul>
</div>
</div>
<h1>Repository</h1>
<div class="repo-container">
<a
href="https://egit.irs.uni-stuttgart.de/fsfw/fsfw"
target="_blank"
class="repo"
>Repository</a
>
</div>
</div>
<div id="sat-rs-content" class="hidden">
<img src="images/sat-rs_logo.png" />
<p class="sat-rs-desc">
sat-rs is a framework with the primary goal to provide re-usable
components to write on-board software for remote systems like rovers
or satellites. It is specifically written for the special
requirements for these systems. A lot of the architecture and
general design considerations are based on the
<a href="index.html">FSFW</a>
C++ framework which has flight heritage through the 2 missions
<a
href="https://www.irs.uni-stuttgart.de/en/research/satellitetechnology-and-instruments/smallsatelliteprogram/flying-laptop/"
target="_blank"
>FLP</a
>
and
<a
href="https://www.irs.uni-stuttgart.de/en/research/satellitetechnology-and-instruments/smallsatelliteprogram/EIVE/"
target="_blank"
>EIVE</a
>.
</p>
<div id="sat-rs-links">
<div class="links">
<h1>Documentation</h1>
<div class="repo-container">
<a href="/projects/sat-rs" target="_blank" class="repo">book</a>
</div>
<div class="repo-container">
<a
href="https://docs.rs/satrs-core"
target="_blank"
class="repo"
>core API</a
>
</div>
<h1>Repository</h1>
<div class="repo-container">
<a
href="https://egit.irs.uni-stuttgart.de/rust/sat-rs"
target="_blank"
class="repo"
>Gitea</a
>
</div>
<div class="repo-container">
<a
href="https://github.com/us-irs/sat-rs"
target="_blank"
class="repo2"
>GitHub (Mirror)</a
>
</div>
</div>
<p><a href="https://egit.irs.uni-stuttgart.de/fsfw/fsfw" target="_blank" class="repo">REPOSITORY</a></p>
</div>
</div>
</div>
</div>
</div>
<footer class="footer">
<ul>
<li>
<a href="https://www.uni-stuttgart.de/impressum" target="_blank"
>imprint</a
>
</li>
<li>
<a
href="https://info.irs.uni-stuttgart.de/datenschutz/datenschutzWebmit.html"
target="_blank"
>protection of privacy</a
>
</li>
<li><a href="https://www.uni-stuttgart.de/impressum" target="_blank">imprint</a></li>
<li><a href="https://info.irs.uni-stuttgart.de/datenschutz/datenschutzWebmit.html" target="_blank">protection of
privacy</a></li>
<li>&copy; 2023 Website by Nadine Eunous</li>
</ul>
</footer>
</body>
</body>
</html>

View File

@ -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", () => {
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";
});

229
sat-rs.css Normal file
View File

@ -0,0 +1,229 @@
@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: black;
color: white;
}
.navbar {
display: flex;
justify-content: space-between;
align-items: center;
margin: 0;
padding: 0;
margin-right: 20px;
}
.navbar p {
font-weight: bold;
font-size: 20px;
}
.navbar img {
height: 60px;
display: inline-block;
}
.contact {
text-decoration: none;
color: white;
}
.side-bar {
width: 280px;
height: 100%;
background-color: #f1f1f1;
padding: 0;
margin-top: 0;
margin-bottom: 0;
}
.side-bar ul {
list-style-type: none;
}
.side-bar li {
display: block;
color: #000;
padding: 17px 30px;
text-decoration: none;
text-size: 16;
}
#fsfw-click {
background-color: #f1f1f1;
color: white;
}
#sat-click {
background-color: #555;
color: white;
}
.side-bar li:hover {
background-color: #555;
color: white;
}
.side-bar-container {
display: flex;
flex-direction: column;
height: 100vh;
}
.container {
display: flex;
flex-direction: row;
gap: 20px;
}
.fsfw-desc {
margin-top: 60px;
text-align: justify;
}
.sat-rs-desc {
margin-top: 40px;
text-align: justify;
}
.content {
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: center;
padding-right: 170px;
padding-left: 170px;
transform: translateY(50px);
}
#fsfw-content img {
width: 100%;
object-fit: contain;
height: auto;
}
.content img {
width: 30%;
object-fit: contain;
height: auto;
}
#fsfw-links,
#sat-rs-links {
display: flex;
align-items: center;
}
.develop a,
.master a,
.sat-doc a {
display: block;
text-align: center;
width: 100%;
height: 100%;
text-decoration: none;
color: #000;
}
.develop li,
.master li,
.sat-doc li {
list-style: none;
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;
}
.links h1 {
margin: 0;
margin-top: 20px;
display: flex;
justify-content: center;
}
.repo-container a {
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,
.sat-doc 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 {
margin-right: 60px;
}
#sat-rs-content {
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: center;
padding-right: 170px;
padding-left: 170px;
}
.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;
text-align: center;
}
.footer ul li:not(:last-child) {
margin-right: 150px;
}
.footer a {
text-decoration: none;
color: #f5f5f5;
transition: color 0.3s ease-in-out;
}

91
sat-rs.html Normal file
View File

@ -0,0 +1,91 @@
<!DOCTYPE html>
<html>
<head>
<title>IRS Software Projects</title>
<link rel="stylesheet" href="index.css"/>
</head>
<body>
<nav class="top-nav">
<div class="navbar">
<img src="images/unilogo_schriftzug_white.png" clas="navbar-logo" />
<p>IRS Satellite Software Projects</p>
<a href="#" class="contact">Contact</a>
</div>
</nav>
<div class="container">
<div class="side-bar-container">
<ul class="side-bar">
<li id="fsfw-click"><a href="index.html">FSFW</a></li>
<li id="sat-click"><a href="sat-rs.html">sat-rs</a></li>
</ul>
</div>
<div class="content">
<div id="sat-rs-content">
<img class="logo" src="images/sat-rs_logo.png" />
<p class="sat-rs-desc">sat-rs is a framework with the primary goal to provide re-usable components
to write on-board software for remote systems like rovers or satellites. It is specifically written for the
special requirements for these systems.
A lot of the architecture and general design considerations are based on the
<a href="index.html">FSFW</a>
C++ framework which has flight heritage through the 2 missions <a
href="https://www.irs.uni-stuttgart.de/en/research/satellitetechnology-and-instruments/smallsatelliteprogram/flying-laptop/"
target="_blank">FLP</a>
and <a
href="https://www.irs.uni-stuttgart.de/en/research/satellitetechnology-and-instruments/smallsatelliteprogram/EIVE/"
target="_blank">EIVE</a>.
</p>
<h1>Documentation </h1>
<div id="fsfw-links">
</h1>
<div class="develop">
<ul>
<li><a href="/projects/sat-rs" target="_blank">BOOK</a></li>
</ul>
</div>
<div class="master">
<ul>
<li><a href="https://docs.rs/satrs-core">CORE API</a></li>
</ul>
</div>
</div>
<h1>Repository</h1>
<div id="fsfw-links">
</h1>
<div class="develop">
<ul>
<li><a href="https://egit.irs.uni-stuttgart.de/rust/sat-rs" target="_blank">GITEA</a></li>
</ul>
</div>
<div class="master">
<ul>
<li><a href="https://github.com/us-irs/sat-rs">GITHUB (MIRROR)</a></li>
</ul>
</div>
</div>
</div>
</div>
</div>
<footer class="footer">
<ul>
<li><a href="https://www.uni-stuttgart.de/impressum" target="_blank">imprint</a></li>
<li><a href="https://info.irs.uni-stuttgart.de/datenschutz/datenschutzWebmit.html" target="_blank">protection of
privacy</a></li>
<li>&copy; 2023 Website by Nadine Eunous</li>
</ul>
</footer>
</body>
</html>

93
static/font-rubik/OFL.txt Normal file
View File

@ -0,0 +1,93 @@
Copyright 2015 The Rubik Project Authors (https://github.com/googlefonts/rubik)
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.
"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).
"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).
"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.
"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:
1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.
5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are
not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.

Binary file not shown.

Binary file not shown.

1
static/font-univers/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/*.ttf