Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
  • m4lab_landing_page m4lab_landing_page
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
    • Requirements
  • Merge requests 0
    • Merge requests 0
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test Cases
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Metrics
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Administrator
  • m4lab_landing_pagem4lab_landing_page
  • Merge requests
  • !83
An error occurred while fetching the assigned milestone of the selected merge_request.

Prepare prod

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Wolfgang Knopki requested to merge prepare_prod into master 4 years ago
  • Overview 0
  • Commits 22
  • Pipelines 0
  • Changes 10

deploy css jira, confluence, bwcloud changes to production.

  • Wolfgang Knopki @knopkiwg merged 4 years ago

    merged

  • Wolfgang Knopki @knopkiwg mentioned in commit 9df10ccd 4 years ago

    mentioned in commit 9df10ccd

  • Loading
  • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
Please register or sign in to reply
Compare
  • master (base)

and
  • latest version
    7e5704d6
    22 commits, 4 years ago

10 files
+ 1055
- 450

    Preferences

    File browser
    Compare changes

Some changes are not shown

For a faster browsing experience, some files are collapsed by default.

c‎ss‎
Login-Form‎-Clean.css‎ +9 -0
m4la‎b.css‎ +63 -1
he‎lp‎
mailingl‎ists.html‎ +474 -299
i‎mg‎
bwclo‎ud.png‎ +0 -0
j‎s‎
headf‎oot.js‎ +3 -3
bwclou‎d.html‎ +84 -0
conflue‎nce.html‎ +88 -0
info_partiz‎ipation.html‎ +146 -101
jira‎.html‎ +89 -0
videoconfe‎rence.html‎ +99 -46
css/Login-Form-Clean.css
+ 9
- 0
  • View file @ 7e5704d6

  • Edit in single-file editor

  • Open in Web IDE


@@ -66,3 +66,12 @@
text-decoration: none;
}
#homepage{
position:relative !important;
}
#header{
background: none;
height: fit-content;
}
css/m4lab.css
+ 63
- 1
  • View file @ 7e5704d6

  • Edit in single-file editor

  • Open in Web IDE


@@ -125,7 +125,6 @@ h1, .h1 {
.projectimg {
display: inline-block;
float: ;
background-color: none;
width: 100%;
height: auto;
@@ -322,3 +321,66 @@ justify-content:space-evenly;}
.heading {
color: #708090;
}
.background_dadada {
background-color: #dadada;
}
.background_ffffff {
background-color: #ffffff;
}
.background_e0001b {
background-color: #E0001B;
}
.margin_top_30 {
margin-top: 30px;
}
.margin_bottom_30 {
margin-bottom: 30px;
}
.width_100 {
width: 100%;
}
.margin_top_40 {
margin-top: 40px;
}
.margin_bottom_40 {
margin-bottom: 40px;
}
.m_top_0 {
margin-top: 0px;
}
.m_bottom_0 {
margin-bottom: 0px;
}
.p_top_20 {
padding-top: 20px;
}
.p_top_20 {
padding-top: 20px;
}
.p_bottom_20 {
padding-bottom: 20px;
}
.p_top_15 {
padding-bottom: 15px;
}
.mailinglist_heading {
padding-top: 15px;
color: #708090;
}
help/mailinglists.html
+ 474
- 299
  • View file @ 7e5704d6

  • Edit in single-file editor

  • Open in Web IDE

Files with large changes are collapsed by default.

img/bwcloud.png 0 → 100644
+ 0
- 0
  • View file @ 7e5704d6

Files with large changes are collapsed by default.

js/headfoot.js
+ 3
- 3
  • View file @ 7e5704d6

  • Edit in single-file editor

  • Open in Web IDE


var menu = [{'name':'Informationen', 'combos':[{'name':'Projektinformationen', 'link':'/projektinformationen'},{'name':'Projektcode und -daten', 'link':'/projektdaten'}, {'name':'Über das M4_LAB', 'link':'/projectoverview?projectID=1'},{'name':'Kontakt', 'link':'/account/contact'}], 'type':'dropdown', 'link':'#'},{'name':'Zusammenarbeit', 'combos':[{'name':'Mailinglisten', 'link':'/mailinglists'},{'name':'Videokonferenzen', 'link':'/videoconference.html'},/* {'name':'...', 'link':'#'}*/], 'type':'dropdown', 'link':'#'},{'name':'Events', 'combos':[{'name':'Veranstaltungen der HfT', 'link':'http://www.hft-stuttgart.de/Aktuell/Veranstaltungen/'},{'name':'Veranstaltungen der HfT Forschung', 'link':'https://www.hft-stuttgart.de/forschung/veranstaltungen'}], 'type':'dropdown', 'link':'#'},{'name':'Bürgerbeteiligung', 'combos':[{'name':'Infos zur Bürgerbeteiligung', 'link':'/info_partizipation.html'},{'name':'Zum M4_Lab Showcase', 'link':'/partizipation/'}], 'type':'dropdown', 'link':'#'},{'name':'<i class="fa fa-question-circle" aria-hidden="true"></i>', 'combos': [], 'type':'', 'link':'/help/'},{'name':'<i class="fa fa-user-circle" aria-hidden="true"></i>', 'combos': [], 'type':'', 'link':'/account/'}];
var menu = [{'name':'Informationen', 'combos':[{'name':'Projektinformationen', 'link':'/projektinformationen'},{'name':'Projektcode und -daten', 'link':'/projektdaten'}, {'name':'Über das M4_LAB', 'link':'/projectoverview?projectID=1'},{'name':'Kontakt', 'link':'/account/contact'}], 'type':'dropdown', 'link':'#'},{'name':'Zusammenarbeit', 'combos':[{'name':'Mailinglisten', 'link':'/mailinglists'},{'name':'Videokonferenzen', 'link':'/videoconference.html'},{'name':'Wissensaustausch', 'link':'/confluence.html'},{'name':'Aufgabenmanagement', 'link':'/jira.html'},{'name':'Dateibearbeitung', 'link':'/bwcloud.html'}], 'type':'dropdown', 'link':'#'},{'name':'Events', 'combos':[{'name':'Veranstaltungen der HfT', 'link':'http://www.hft-stuttgart.de/Aktuell/Veranstaltungen/'},{'name':'Veranstaltungen der HfT Forschung', 'link':'https://www.hft-stuttgart.de/forschung/veranstaltungen'}], 'type':'dropdown', 'link':'#'},{'name':'Bürgerbeteiligung', 'combos':[{'name':'Infos zur Bürgerbeteiligung', 'link':'/info_partizipation.html'},{'name':'Zum M4_Lab Showcase', 'link':'/partizipation/'}], 'type':'dropdown', 'link':'#'},{'name':'<i class="fa fa-question-circle" aria-hidden="true"></i>', 'combos': [], 'type':'', 'link':'/help/'},{'name':'<i class="fa fa-user-circle" aria-hidden="true"></i>', 'combos': [], 'type':'', 'link':'/account/'}];
var hft_links = [{'url':'/account/contact', 'name':'Kontakt'},{'url':'https://www.hft-stuttgart.de/impressum', 'name':'Impressum'},{'url':'https://www.hft-stuttgart.de/datenschutz', 'name':'Datenschutz'}]
@@ -164,11 +164,11 @@ function foot() {
//bmbf
let bmbf = document.createElement('div');
bmbf.classList.add("col-md-auto");
bmbf.innerHTML = "<img src='/img/footer/Innovative_Hochschule_Initiative_BMBF_GWK_RGB.png' alt='Innovative Hochschule' style='height:90px'/>"
bmbf.innerHTML = "<img src='/img/footer/Innovative_Hochschule_Initiative_BMBF_GWK_RGB.png' alt='Innovative Hochschule' height='90'/>"
//m4labgrau
let m4labgrau = document.createElement('div');
m4labgrau.classList.add("col-md-auto");
m4labgrau.innerHTML = "<img src='/img/footer/M4_LAB_LOGO_Graustufen.png' alt='M4_LAB' style='height:80px'/>"
m4labgrau.innerHTML = "<img src='/img/footer/M4_LAB_LOGO_Graustufen.png' alt='M4_LAB' height='80' />"
// socmed
let socialdiv = document.createElement('div');
socialdiv.classList.add("col-md-auto");
Assignee
Wolfgang Knopki's avatar
Wolfgang Knopki
Assign to
0 Reviewers
None
Request review from
Labels
0
None
0
None
    Assign labels
  • Manage project labels

Milestone
No milestone
None
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
0
0 participants
Reference:
Source branch: prepare_prod

Menu

Explore Projects Groups Snippets

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal