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
  • !32
An error occurred while fetching the assigned milestone of the selected merge_request.

Prepare production

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Wolfgang Knopki requested to merge prepare_production into master 5 years ago
  • Overview 0
  • Commits 108
  • Pipelines 0
  • Changes 66

Merge new landing page etc. to production

  • Wolfgang Knopki @knopkiwg added 2 commits 5 years ago

    added 2 commits

    • db4009d1 - 1 commit from branch master
    • 2cb49313 - Merge branch 'master' into 'prepare_production'

    Compare with previous version

  • Wolfgang Knopki @knopkiwg merged 5 years ago

    merged

  • Wolfgang Knopki @knopkiwg mentioned in commit 0e6166ed 5 years ago

    mentioned in commit 0e6166ed

  • Loading
  • Loading
  • 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
  • version 1
    5694dcd3
    5 years ago

  • master (base)

and
  • latest version
    2cb49313
    108 commits, 5 years ago

  • version 1
    5694dcd3
    107 commits, 5 years ago

66 files
+ 5809
- 17310

    Preferences

    File browser
    Compare changes

Some changes are not shown

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

c‎ss‎
Contact-For‎m-Clean.css‎ +90 -0
Login-Form‎-Clean.css‎ +68 -0
Testimon‎ials.css‎ +94 -0
bootstrap‎-grid.css‎ +0 -3719
bootstrap-g‎rid.css.map‎ +0 -1
bootstrap-g‎rid.min.css‎ +0 -7
bootstrap-gri‎d.min.css.map‎ +0 -1
bootstrap-‎reboot.css‎ +0 -331
bootstrap-re‎boot.css.map‎ +0 -1
bootstrap-re‎boot.min.css‎ +0 -8
bootstrap-rebo‎ot.min.css.map‎ +0 -1
bootstra‎p.css.map‎ +0 -1
bootstra‎p.min.css‎ +0 -0
bootstrap.‎min.css.map‎ +0 -1
style‎s.css‎ +0 -0
down‎loads‎
Handout_Mailinglis‎ten_Abonnieren.pdf‎ +0 -0
Handout_Mailingli‎sten_Erstellen.pdf‎ +0 -0
fo‎nts‎
FontAwe‎some.otf‎ +0 -0
font-aweso‎me.min.css‎ +4 -0
fontawesome‎-webfont.eot‎ +0 -0
fontawesome‎-webfont.svg‎ +2671 -0
fontawesome‎-webfont.ttf‎ +0 -0
fontawesome-‎webfont.woff‎ +0 -0
fontawesome-‎webfont.woff2‎ +0 -0
ionico‎ns.eot‎ +0 -0
ionicons‎.min.css‎ +11 -0
ionico‎ns.svg‎ +2230 -0
ionico‎ns.ttf‎ +0 -0
ionico‎ns.woff‎ +0 -0
i‎mg‎
foo‎ter‎
Innovative_Hochschule_In‎itiative_BMBF_GWK_RGB.png‎ +0 -0
M4_LAB_LOGO_G‎raustufen.png‎ +0 -0
hea‎der‎
Logozeile_‎Header.png‎ +0 -0
Anmeld‎en.png‎ +0 -0
Forschung‎_team1.jpg‎ +0 -0
Icon_Ha‎ken.png‎ +0 -0
Icon_Informatio‎nen_Verlauf.png‎ +0 -0
Icon_Sand‎clock.png‎ +0 -0
Icon_Zusammenarbe‎iten_ Verlauf.png‎ +0 -0
Konta‎kt.jpg‎ +0 -0
Logo_T‎V1.png‎ +0 -0
M4_LAB_‎LOGO.jpg‎ +0 -0
M4_LAB_‎LOGO.png‎ +0 -0
Mailingl‎isten.jpg‎ +0 -0
Projek‎te.png‎ +0 -0
Videokonfe‎renzen.jpg‎ +0 -0
incl‎udes‎
headfo‎ot.html‎ +227 -0
j‎s‎
bootstrap-‎collapse.js‎ +0 -892
bootstrap‎.bundle.js‎ +0 -7013
bootstrap.b‎undle.js.map‎ +0 -1
bootstrap.b‎undle.min.js‎ +0 -7
bootstrap.bun‎dle.min.js.map‎ +0 -1
bootst‎rap.js‎ +0 -4435
bootstra‎p.js.map‎ +0 -1
bootstra‎p.min.js‎ +6 -6
bootstrap.‎min.js.map‎ +0 -1
generalFu‎nction.js‎ +9 -0
headf‎oot.js‎ +89 -124
registr‎ation.js‎ +38 -0
secur‎ity.js‎ +30 -0
.gitlab‎-ci.yml‎ +7 -1
index‎.html‎ +91 -105
inde‎x.php‎ +0 -127
index_Projektse‎ite_M4_LAB.html‎ +0 -170
index_Projektseit‎e_SmartPollen.html‎ +0 -133
index_Projektsei‎te_agqual3d.html‎ +0 -171
videoconfe‎rence.html‎ +144 -51
css/Contact-Form-Clean.css 0 → 100644
+ 90
- 0
  • View file @ 2cb49313

  • Edit in single-file editor

  • Open in Web IDE

 
.contact-clean {
 
background: #f1f7fc;
 
padding: 80px 0;
 
}
 
 
@media (max-width:767px) {
 
.contact-clean {
 
padding: 20px 0;
 
}
 
}
 
 
.contact-clean form {
 
max-width: 480px;
 
width: 90%;
 
margin: 0 auto;
 
background-color: #ffffff;
 
padding: 40px;
 
border-radius: 4px;
 
color: #505e6c;
 
box-shadow: 1px 1px 5px rgba(0,0,0,0.1);
 
}
 
 
@media (max-width:767px) {
 
.contact-clean form {
 
padding: 30px;
 
}
 
}
 
 
.contact-clean h2 {
 
margin-top: 5px;
 
font-weight: bold;
 
font-size: 28px;
 
margin-bottom: 36px;
 
color: inherit;
 
}
 
 
.contact-clean .form-group:last-child {
 
margin-bottom: 5px;
 
}
 
 
.contact-clean form .form-control {
 
background: #fff;
 
border-radius: 2px;
 
box-shadow: 1px 1px 1px rgba(0,0,0,0.05);
 
outline: none;
 
color: inherit;
 
padding-left: 12px;
 
height: 42px;
 
}
 
 
.contact-clean form .form-control:focus {
 
border: 1px solid #b2b2b2;
 
}
 
 
.contact-clean form textarea.form-control {
 
min-height: 100px;
 
max-height: 260px;
 
padding-top: 10px;
 
resize: vertical;
 
}
 
 
.contact-clean form .btn {
 
padding: 16px 32px;
 
border: none;
 
background: none;
 
box-shadow: none;
 
text-shadow: none;
 
opacity: 0.9;
 
text-transform: uppercase;
 
font-weight: bold;
 
font-size: 13px;
 
letter-spacing: 0.4px;
 
line-height: 1;
 
outline: none !important;
 
}
 
 
.contact-clean form .btn:hover {
 
opacity: 1;
 
}
 
 
.contact-clean form .btn:active {
 
transform: translateY(1px);
 
}
 
 
.contact-clean form .btn-primary {
 
background-color: #055ada !important;
 
margin-top: 15px;
 
color: #fff;
 
}
 
css/Login-Form-Clean.css 0 → 100644
+ 68
- 0
  • View file @ 2cb49313

  • Edit in single-file editor

  • Open in Web IDE

 
.login-clean {
 
background: #f1f7fc;
 
padding: 80px 0;
 
}
 
 
.login-clean form {
 
max-width: 320px;
 
width: 90%;
 
margin: 0 auto;
 
background-color: #ffffff;
 
padding: 40px;
 
border-radius: 4px;
 
color: #505e6c;
 
box-shadow: 1px 1px 5px rgba(0,0,0,0.1);
 
}
 
 
.login-clean .illustration {
 
text-align: center;
 
padding: 0 0 20px;
 
font-size: 100px;
 
color: rgb(244,71,107);
 
}
 
 
.login-clean form .form-control {
 
background: #f7f9fc;
 
border: none;
 
border-bottom: 1px solid #dfe7f1;
 
border-radius: 0;
 
box-shadow: none;
 
outline: none;
 
color: inherit;
 
text-indent: 8px;
 
height: 42px;
 
}
 
 
.login-clean form .btn-primary {
 
background: #f4476b;
 
border: none;
 
border-radius: 4px;
 
padding: 11px;
 
box-shadow: none;
 
margin-top: 26px;
 
text-shadow: none;
 
outline: none !important;
 
}
 
 
.login-clean form .btn-primary:hover, .login-clean form .btn-primary:active {
 
background: #eb3b60;
 
}
 
 
.login-clean form .btn-primary:active {
 
transform: translateY(1px);
 
}
 
 
.login-clean form .forgot {
 
display: block;
 
text-align: center;
 
font-size: 12px;
 
color: #6f7a85;
 
opacity: 0.9;
 
text-decoration: none;
 
}
 
 
.login-clean form .forgot:hover, .login-clean form .forgot:active {
 
opacity: 1;
 
text-decoration: none;
 
}
 
css/Testimonials.css 0 → 100644
+ 94
- 0
  • View file @ 2cb49313

  • Edit in single-file editor

  • Open in Web IDE

 
.testimonials-clean {
 
color: #313437;
 
background-color: #eef4f7;
 
}
 
 
.testimonials-clean p {
 
color: #7d8285;
 
}
 
 
.testimonials-clean h2 {
 
font-weight: bold;
 
margin-bottom: 40px;
 
padding-top: 40px;
 
color: inherit;
 
}
 
 
@media (max-width:767px) {
 
.testimonials-clean h2 {
 
margin-bottom: 25px;
 
padding-top: 25px;
 
font-size: 24px;
 
}
 
}
 
 
.testimonials-clean .intro {
 
font-size: 16px;
 
max-width: 500px;
 
margin: 0 auto;
 
}
 
 
.testimonials-clean .intro p {
 
margin-bottom: 0;
 
}
 
 
.testimonials-clean .people {
 
padding: 50px 0 20px;
 
}
 
 
.testimonials-clean .item {
 
margin-bottom: 32px;
 
}
 
 
@media (min-width:768px) {
 
.testimonials-clean .item {
 
height: 220px;
 
}
 
}
 
 
.testimonials-clean .item .box {
 
padding: 30px;
 
background-color: #fff;
 
position: relative;
 
}
 
 
.testimonials-clean .item .box:after {
 
content: '';
 
position: absolute;
 
left: 30px;
 
bottom: -24px;
 
width: 0;
 
height: 0;
 
border: 15px solid transparent;
 
border-width: 12px 15px;
 
border-top-color: #fff;
 
}
 
 
.testimonials-clean .item .author {
 
margin-top: 28px;
 
padding-left: 25px;
 
}
 
 
.testimonials-clean .item .name {
 
font-weight: bold;
 
margin-bottom: 2px;
 
color: inherit;
 
}
 
 
.testimonials-clean .item .title {
 
font-size: 13px;
 
color: #9da9ae;
 
}
 
 
.testimonials-clean .item .description {
 
font-size: 15px;
 
margin-bottom: 0;
 
}
 
 
.testimonials-clean .item img {
 
max-width: 40px;
 
float: left;
 
margin-right: 12px;
 
margin-top: -5px;
 
}
 
css/bootstrap-grid.css deleted 100755 → 0
+ 0
- 3719
  • View file @ db4009d1

Files with large changes are collapsed by default.

css/bootstrap-grid.css.map deleted 100755 → 0
+ 0
- 1
  • View file @ db4009d1

Changes are too large to be shown.

View file @ db4009d1
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_production

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