Merge remote-tracking branch 'upstream/main' into eunous

This commit is contained in:
Nadine Eunuos 2023-10-10 18:23:04 +02:00
commit ed35258ddf
4 changed files with 44 additions and 22 deletions

8
.htaccess Normal file
View File

@ -0,0 +1,8 @@
RewriteEngine on
RewriteCond %{THE_REQUEST} /([^.]+)\.html [NC]
RewriteRule ^ /%1 [NC,L,R]
RewriteCond %{REQUEST_FILENAME}.html -f
RewriteRule ^ %{REQUEST_URI}.html [NC,L]

View File

@ -128,10 +128,10 @@ body {
align-items: center; align-items: center;
} }
.develop a, .left-box a,
.master a, .right-box a,
.sat-doc a, .sat-doc a,
.repo-container a { .single-box a {
display: block; display: block;
text-align: center; text-align: center;
width: 100%; width: 100%;
@ -149,8 +149,8 @@ body {
align-items: center; align-items: center;
} }
.develop li, .left-box li,
.master li, .right-box li,
.sat-doc li { .sat-doc li {
list-style: none; list-style: none;
margin: 20px; margin: 20px;
@ -171,7 +171,7 @@ body {
justify-content: center; justify-content: center;
} }
.repo-container p { .single-box p {
//border: 2px solid #000; //border: 2px solid #000;
margin: 20px; margin: 20px;
padding-left: 0; padding-left: 0;
@ -185,22 +185,22 @@ body {
transition: color 0.3s; transition: color 0.3s;
} }
.develop ul, .left-box ul,
.links ul, .links ul,
.sat-doc ul, .sat-doc ul,
.repo-container p { .single-box p {
padding-left: 0; padding-left: 0;
} }
.develop li a:hover, .left-box li a:hover,
.master li a:hover, .right-box li a:hover,
.links li a:hover, .links li a:hover,
.repo-container p a:hover { .single-box p a:hover {
background-color: #323232; background-color: #323232;
color: white; color: white;
} }
.develop li { .left-box li {
margin-right: 60px; margin-right: 60px;
} }

View File

@ -10,7 +10,9 @@
<body> <body>
<nav class="top-nav"> <nav class="top-nav">
<div class="navbar"> <div class="navbar">
<a href="https://www.irs.uni-stuttgart.de/" target="_blank"><img src="images/unilogo_schriftzug_white.png" clas="navbar-logo" /></a> <a href="https://www.irs.uni-stuttgart.de/" target="_blank"
><img src="images/unilogo_schriftzug_white.png" clas="navbar-logo"
/></a>
<p>Software Projects</p> <p>Software Projects</p>
<a href="#" class="contact">Contact</a> <a href="#" class="contact">Contact</a>
@ -47,7 +49,7 @@
<h1>Documentation and Coverage</h1> <h1>Documentation and Coverage</h1>
<div id="fsfw-links"> <div id="fsfw-links">
<div class="develop"> <div class="left-box">
<ul> <ul>
<li> <li>
<a <a
@ -65,7 +67,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="master"> <div class="right-box">
<ul> <ul>
<li> <li>
<a <a
@ -85,7 +87,7 @@
</div> </div>
</div> </div>
<h1>Repository</h1> <h1>Repository</h1>
<div class="repo-container"> <div class="single-box">
<p> <p>
<a <a
href="https://egit.irs.uni-stuttgart.de/fsfw/fsfw" href="https://egit.irs.uni-stuttgart.de/fsfw/fsfw"

View File

@ -47,21 +47,21 @@
>. >.
</p> </p>
<h1>Documentation</h1> <h1>Documentation</h1>
<div id="fsfw-links"> <div id="sat-rs-links">
<div class="develop"> <div class="left-box">
<ul> <ul>
<li><a href="/projects/sat-rs" target="_blank">BOOK</a></li> <li><a href="/projects/sat-rs" target="_blank">BOOK</a></li>
</ul> </ul>
</div> </div>
<div class="master"> <div class="right-box">
<ul> <ul>
<li><a href="https://docs.rs/satrs-core">CORE API</a></li> <li><a href="https://docs.rs/satrs-core">CORE API</a></li>
</ul> </ul>
</div> </div>
</div> </div>
<h1>Repository</h1> <h1>Repository</h1>
<div id="fsfw-links"> <div id="sat-rs-links">
<div class="develop"> <div class="left-box">
<ul> <ul>
<li> <li>
<a <a
@ -72,7 +72,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="master"> <div class="right-box">
<ul> <ul>
<li> <li>
<a href="https://github.com/us-irs/sat-rs">GITHUB (MIRROR)</a> <a href="https://github.com/us-irs/sat-rs">GITHUB (MIRROR)</a>
@ -80,6 +80,18 @@
</ul> </ul>
</div> </div>
</div> </div>
<h1>Examples</h1>
<div id="sat-rs-links">
<div class="single-box">
<p>
<a
href="https://egit.irs.uni-stuttgart.de/rust/sat-rs/src/branch/main/satrs-example"
target="_blank"
>EXAMPLE APP</a
>
</p>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>