Commit 5ca74a3c authored by Wolfgang Knopki's avatar Wolfgang Knopki
Browse files

Merge branch 'MLAB-292' into 'testing'

deleted inline styles from gitlab-pages help

See merge request !101
parents d5795ed8 5e1b787e
Pipeline #3218 passed with stage
in 8 seconds
......@@ -4,3 +4,21 @@ img{
ol.innerlisthpchelp {
list-style-type: lower-alpha;
}
.padding_top_bottom{
margin-bottom: 0;
padding-top: 20px;
padding-bottom: 20px;
}
.margin_top_bottom{
margin-top: 40px;
margin-bottom: 30px;
}
.margin_middle{
margin-top: 10px;
margin-bottom: 30px;
}
.borderblackblock{
border:1px solid black;
display: block;
}
......@@ -587,4 +587,4 @@ justify-content:space-evenly;}
background-color: #E0001B;
filter: invert(0%);
color: white;
}
\ No newline at end of file
}
......@@ -16,37 +16,37 @@
<body>
<div style="background-color: #dadada;">
<div class="background_dadada">
<div class="container" style="background-color: #ffffff;margin-bottom: 30px;">
<div class="container background_ffffff margin_bottom_30">
<div class="row">
</div>
</div>
<div id="Gitlab_Text" style="margin-top: 40px;margin-bottom: 30px;">
<div class="container" style="background-color: #ffffff;">
<div style="margin-bottom: 0;padding-top: 20px;padding-bottom: 20px;">
<div id="Gitlab_Text" class="margin_top_bottom">
<div class="container background_ffffff">
<div class="padding_top_bottom">
<div class="col-lg-12">
<h2 class="d-flex flex-column flex-shrink-1 justify-content-lg-start text-center" style="padding-top: 15px;color: #708090;"><strong>Gitlab-pages</strong></h2>
<h2 class="d-flex flex-column flex-shrink-1 justify-content-lg-start text-center mailinglist_heading"><strong>Gitlab-pages</strong></h2>
</div>
<div class="col-auto flex-row flex-grow-1 flex-fill" style="background-color: #ffffff;">
<div class="col-auto flex-row flex-grow-1 flex-fill background_ffffff">
<p><a href="https://de.wikipedia.org/wiki/GitLab">GitLab</a> ist eine umfangreiche Webanwendung zur Versionsverwaltung für Softwareprojekte auf Basis von <a href="https://de.wikipedia.org/wiki/Git">Git</a> die auch Wiki-Funktionen und Issue Tracking bietet. Das Transferportal der HFT-Stuttgart betreibt eine eigene GitLab-Instanz für die Hochschule für Technik Stuttgart und ihre Kooperationspartner unter einer Open-Access-Lizenz. Mit <a href="https://docs.gitlab.com/ee/user/project/pages/">GitLab Pages </a> besteht für Angehörige der HFT die Möglichkeit, eine öffentliche statische Projektwebsite aus einem GitLab-Projekt heraus zu erzeugen.
</p><p>
Die URL, unter der die Seite dann zu finden ist, lautet: <br/> <br/>
<p class="justify-content-lg-start text-center">https://transfer.hft-stuttgart.de/pages/EIGENTUEMER/PROJEKTNAME/</p>
</p>
</div>
<a class="btn btn-primary text-center d-inline-flex d-lg-flex flex-column flex-grow-1 flex-shrink-1 flex-fill justify-content-between align-items-baseline align-content-center align-self-baseline flex-wrap order-3 mb-auto justify-content-md-center align-items-md-end align-items-lg-center justify-content-xl-center mx-auto"
role="button" style="background-color: #E0001B;" href="https://transfer.hft-stuttgart.de/gitlab/explore/projects"><strong>Zugriff auf Gitlab</strong></a>
<a class="btn btn-primary text-center d-inline-flex d-lg-flex flex-column flex-grow-1 flex-shrink-1 flex-fill justify-content-between align-items-baseline align-content-center align-self-baseline flex-wrap order-3 mb-auto justify-content-md-center align-items-md-end align-items-lg-center justify-content-xl-center mx-auto background_e0001b"
role="button" href="https://transfer.hft-stuttgart.de/gitlab/explore/projects"><strong>Zugriff auf Gitlab</strong></a>
</div>
</div>
</div>
<div id="create_Text" style="margin-top: 10px;margin-bottom: 30px;">
<div class="container" style="background-color: #ffffff;">
<div style="margin-bottom: 0;padding-top: 20px;padding-bottom: 20px;">
<div id="create_Text" class="margin_middle">
<div class="container background_ffffff">
<div class="padding_top_bottom">
<div class="col-lg-12">
<h2 class="d-flex flex-column order-1 justify-content-lg-start text-center" style="padding-top: 15px;color: #708090;"><strong>Gitlab-pages Projekte</strong></h2>
<h2 class="d-flex flex-column order-1 justify-content-lg-start text-center mailinglist_heading"><strong>Gitlab-pages Projekte</strong></h2>
</div>
<div class="col-auto" style="background-color: #ffffff;">
<div class="col-auto background_ffffff">
<div class="help">
<div class="card">
<div class="card-header">
......@@ -160,13 +160,13 @@
</div>
</div>
<div id="error_Text" style="margin-top: 10px;margin-bottom: 30px;">
<div class="container" style="background-color: #ffffff;">
<div style="margin-bottom: 0;padding-top: 20px;padding-bottom: 20px;">
<div id="error_Text" class="margin_middle">
<div class="container background_ffffff">
<div class="padding_top_bottom">
<div class="col-lg-12">
<h2 class="d-flex flex-column order-1 justify-content-lg-start text-center" style="padding-top: 15px;color: #708090;"><strong>Häufige Fragen und Probleme</strong></h2>
<h2 class="d-flex flex-column order-1 justify-content-lg-start text-center mailinglist_heading"><strong>Häufige Fragen und Probleme</strong></h2>
</div>
<div class="col-auto" style="background-color: #ffffff;">
<div class="col-auto background_ffffff">
<p>
<ul>
<li>
......@@ -185,20 +185,20 @@
</ul>
</p>
</div>
<a class="btn btn-primary text-center d-inline-flex d-lg-flex flex-column flex-grow-1 flex-shrink-1 flex-fill justify-content-between align-items-baseline align-content-center align-self-baseline flex-wrap order-3 mb-auto justify-content-md-center align-items-md-end align-items-lg-center justify-content-xl-center mx-auto"
role="button" style="background-color: #E0001B;" href="mailto:support-transfer@hft-stuttgart.de"><strong>Administratorkontakt</strong></a>
<a class="btn btn-primary text-center d-inline-flex d-lg-flex flex-column flex-grow-1 flex-shrink-1 flex-fill justify-content-between align-items-baseline align-content-center align-self-baseline flex-wrap order-3 mb-auto justify-content-md-center align-items-md-end align-items-lg-center justify-content-xl-center mx-auto background_e0001b"
role="button" href="mailto:support-transfer@hft-stuttgart.de"><strong>Administratorkontakt</strong></a>
</div>
</div>
</div>
<div id="template_Text" style="margin-top: 10px;margin-bottom: 30px;">
<div class="container" style="background-color: #ffffff;">
<div style="margin-bottom: 0;padding-top: 20px;padding-bottom: 20px;">
<div id="template_Text" class="margin_middle">
<div class="container background_ffffff">
<div class="padding_top_bottom">
<div class="col-lg-12">
<h2 class="d-flex flex-column order-1 justify-content-lg-start text-center" style="padding-top: 15px;color: #708090;"><strong>Gitlab-pages Template <em>pages-basic</em> benutzen</strong></h2>
<h2 class="d-flex flex-column order-1 justify-content-lg-start text-center mailinglist_heading"><strong>Gitlab-pages Template <em>pages-basic</em> benutzen</strong></h2>
</div>
<div class="col-auto" style="background-color: #ffffff;">
<div class="col-auto background_ffffff">
<p>
Wir stellen eine Vorlage für Projektwebseiten zur Verfügung.
</p>
......@@ -396,11 +396,6 @@
</div>
</div>
</div>
<div class="container" style="background-color: #ffffff;margin-bottom: 30px;">
<div class="row">
</div>
</div>
</div>
</div>
......
......@@ -16,34 +16,34 @@
<body>
<div style="background-color: #dadada;">
<div class="background_dadada">
<div class="container" style="background-color: #ffffff;margin-bottom: 30px;">
<div class="container background_ffffff margin_bottom_30">
<div class="row">
</div>
</div>
<div id="Gitlab_Text" style="margin-top: 40px;margin-bottom: 30px;">
<div class="container" style="background-color: #ffffff;">
<div style="margin-bottom: 0;padding-top: 20px;padding-bottom: 20px;">
<div id="Gitlab_Text" class="margin_top_bottom">
<div class="container background_ffffff">
<div class="padding_top_bottom">
<div class="col-lg-12">
<h2 class="d-flex flex-column flex-shrink-1 justify-content-lg-start text-center" style="padding-top: 15px;color: #708090;"><strong>Gitlab</strong></h2>
<h2 class="d-flex flex-column flex-shrink-1 justify-content-lg-start text-center mailinglist_heading"><strong>Gitlab</strong></h2>
</div>
<div class="col-auto flex-row flex-grow-1 flex-fill" style="background-color: #ffffff;">
<div class="col-auto flex-row flex-grow-1 flex-fill background_ffffff">
<p><a href="https://de.wikipedia.org/wiki/GitLab">GitLab</a> ist eine umfangreiche Webanwendung zur Versionsverwaltung für Softwareprojekte auf Basis von <a href="https://de.wikipedia.org/wiki/Git">Git</a> die auch Wiki-Funktionen und Issue Tracking bietet. Das Transferportal der HFT-Stuttgart betreibt eine eigene GitLab-Instanz für die Hochschule für Technik Stuttgart und ihre Kooperationspartner unter einer Open-Access-Lizenz.
</p>
</div>
<a class="btn btn-primary text-center d-inline-flex d-lg-flex flex-column flex-grow-1 flex-shrink-1 flex-fill justify-content-between align-items-baseline align-content-center align-self-baseline flex-wrap order-3 mb-auto justify-content-md-center align-items-md-end align-items-lg-center justify-content-xl-center mx-auto"
role="button" style="background-color: #E0001B;" href="https://transfer.hft-stuttgart.de/gitlab/explore/projects"><strong>Zugriff auf Gitlab</strong></a>
<a class="btn btn-primary text-center d-inline-flex d-lg-flex flex-column flex-grow-1 flex-shrink-1 flex-fill justify-content-between align-items-baseline align-content-center align-self-baseline flex-wrap order-3 mb-auto justify-content-md-center align-items-md-end align-items-lg-center justify-content-xl-center mx-auto background_e0001b"
role="button" href="https://transfer.hft-stuttgart.de/gitlab/explore/projects"><strong>Zugriff auf Gitlab</strong></a>
</div>
</div>
</div>
<div id="help_Text" style="margin-top: 10px;margin-bottom: 30px;">
<div class="container" style="background-color: #ffffff;">
<div style="margin-bottom: 0;padding-top: 20px;padding-bottom: 20px;">
<div id="help_Text" class="margin_middle">
<div class="container" class="background_ffffff">
<div class="padding_top_bottom">
<div class="col-lg-12">
<h2 class="d-flex flex-column order-1 justify-content-lg-start text-center" style="padding-top: 15px;color: #708090;"><strong>Hilfestellung zu Gitlab</strong></h2>
<h2 class="d-flex flex-column order-1 justify-content-lg-start text-center mailinglist_heading" ><strong>Hilfestellung zu Gitlab</strong></h2>
</div>
<div class="col-auto" style="background-color: #ffffff;">
<div class="col-auto" class="background_ffffff">
<div class="help">
<div class="card">
<div class="card-header">
......@@ -158,12 +158,12 @@
<ul>
<li>
Um dem Projekt eine Projektbeschreibung hinzuzufügen, füllen Sie bitte beim Anlegen des Projekts das Feld <b>Project description</b> aus.
<img src="/img/help/projectlist-add-desc.png" width="85%" style="border:1px solid black; display: block;"/>
<img src="/img/help/projectlist-add-desc.png" width="85%" class="borderblackblock"/>
</li>
<li>
Um ein Bild/Logo hinzuzufügen, gehen Sie bitte in Ihrem Projekt auf <i>"Settings --> General"</i> und laden Sie das Bild/Logo unter <b>Project avatar</b> hoch.
<img src="/img/help/projectlist-setting-general.png" width="85%" style="border:1px solid black; display: block;"/>
<img src="/img/help/projectlist-add-avatar.png" width="85%" style="border:1px solid black; display: block;"/>
<img src="/img/help/projectlist-setting-general.png" width="85%" class="borderblackblock"/>
<img src="/img/help/projectlist-add-avatar.png" width="85%" class="borderblackblock"/>
</li>
</ul>
......@@ -184,7 +184,7 @@
</div>
</div>
</div>
<div class="container" style="background-color: #ffffff;margin-bottom: 30px;">
<div class="container background_ffffff margin_bottom_30">
<div class="row">
</div>
</div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment