From ba8fcbdc897b743ee60e13527b2a636a3f979655 Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Wed, 19 Jun 2019 09:41:36 +0200 Subject: [PATCH] removed TV logos, added spacer between sc media buttons --- .gitlab-ci.yml | 3 +-- css/bootstrap.css | 5 +++-- index.html | 10 +++++----- js/headfoot.js | 7 +------ 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 27ec7fa..9f8793a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,8 +11,7 @@ pages: - cp -r images .public - cp -r js .public - cp -r includes .public - - cp index.php .public - - cp index.html .public + - cp *.html .public - mv .public public - cp -r public/* "$EXPORT_PAGES_DIR" artifacts: diff --git a/css/bootstrap.css b/css/bootstrap.css index adf88c9..5fa7594 100644 --- a/css/bootstrap.css +++ b/css/bootstrap.css @@ -144,7 +144,8 @@ padding-right: 1em;} } .footer-unten {color: darkgrey; } -#socialmediabuttons a {color: darkgrey; +#socialmediabuttons a { +color: darkgrey; } #socialmediabuttons a:hover {color: black; @@ -6327,7 +6328,7 @@ a.close.disabled { .carousel-inner { position: relative; - width: 100%; + width: 80%; overflow: hidden; } diff --git a/index.html b/index.html index 04e8cbb..fdf709b 100644 --- a/index.html +++ b/index.html @@ -49,6 +49,11 @@ Erfahre mehr über unsere <a href="./" ><i class="fas fa-chevron-right"></i> Eve <li data-target="#carouselExampleIndicators" data-slide-to="1" class="active"></li> <li data-target="#carouselExampleIndicators" data-slide-to="2"></li> </ol> + <a class="carousel-control-prev" href="#carouselExampleIndicators" role="button" data-slide="prev"> + <i class="fas fa-chevron-left"></i> +<!-- <span class="carousel-control-prev-icon" aria-hidden="true"></span>--> + <span class="sr-only">Previous</span> + </a> <div class="carousel-inner" role="listbox"> <div class="carousel-item"> <img class="d-block w-100" src="./images/3DModell_Wermelskirchen_Startseite.jpg" alt="First slide"> @@ -72,11 +77,6 @@ Erfahre mehr über unsere <a href="./" ><i class="fas fa-chevron-right"></i> Eve </div> </div> </div> - <a class="carousel-control-prev" href="#carouselExampleIndicators" role="button" data-slide="prev"> - <i class="fas fa-chevron-left"></i> -<!-- <span class="carousel-control-prev-icon" aria-hidden="true"></span>--> - <span class="sr-only">Previous</span> - </a> <a class="carousel-control-next" href="#carouselExampleIndicators" role="button" data-slide="next"> <i class="fas fa-chevron-right"></i> <!-- <span class="carousel-control-next-icon" aria-hidden="true"></span>--> diff --git a/js/headfoot.js b/js/headfoot.js index e8eb9bc..e4c9ade 100644 --- a/js/headfoot.js +++ b/js/headfoot.js @@ -44,12 +44,6 @@ function head(){ link_m4lab.href = "https://transfer.hft-stuttgart.de/"; link_m4lab.innerHTML = "<img src='images/demo/m4lab_logo.jpg' alt='Logo Innovationslabor M4_LAB'>"; logos.appendChild(link_m4lab); - for (let i = 1; i<5; i++){ - let link_tv = document.createElement('a'); - link_tv.href = "https://www.hft-stuttgart.de/Forschung/M4-Lab/Teilvorhaben/Teilvorhaben-" + i; - link_tv.innerHTML = "<img src='images/M4_LAB_LOGO_TV_" + i + ".jpg' alt='Logo TV'>"; - logos.appendChild(link_tv); - }; navelements.appendChild(logos); for(let j = 0; j<menu.length; j++){ let headitem = document.createElement('li'); @@ -160,6 +154,7 @@ function foot(){ socialcontent.classList.add("fab", socialmedias[j].name); sociallink.appendChild(socialcontent); socialrow.appendChild(sociallink); + socialrow.innerHTML+=" "; } socialdiv.appendChild(socialrow); containerdiv.appendChild(socialdiv); -- GitLab