Merge branch 'devel_varun' into 'testing'

Devel varun

See merge request !79

css/m4lab.css

@@ -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;
+}
+

js/headfoot.js

@@ -177,11 +177,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");

videoconference.html

@@ -42,7 +42,7 @@
         <div class="container">
             <div
                 class="row flex-row justify-content-start align-items-start align-content-stretch align-self-stretch flex-wrap align-items-lg-start">
-                <div class="col-auto col-md-6 col-lg-6 text-center flex-column"
+                <div class="col-md-6 text-center d-flex flex-column justify-content-center align-items-md-center"
                     style="padding-right: 5px;padding-left: 0px;margin-top: 15px;">
                     <h2 class="text-center" style="color: #708090;"><strong>Jitsi</strong><br></h2>
                     <p class="text-center"><strong>Für alle Nutzer des Portals</strong><br><br></p>
@@ -77,7 +77,7 @@
                     </ul><a class="btn btn-primary text-center flex-grow-1 flex-shrink-1 flex-fill justify-content-center" role="button" style="background-color: rgb(228,228,228);color: rgb(89,89,89);padding-bottom: 6px;width: 309px;margin-right: 0;margin-bottom: 15px;"
                         href="#AdobeConnect_Text"><strong>Mehr Infos zu Adobe Connect</strong><i class="fa fa-arrow-down d-lg-flex justify-content-lg-center"></i></a><a class="btn btn-primary text-center align-self-center mx-auto" role="button" style="background-color: #E0001B;width: 309px;"
                         href="https://webconf.vc.dfn.de/dfnvc/disco/index.html?entityID=https%3A%2F%2Fwebconf.vc.dfn.de%2Fshibboleth&amp;return=https%3A%2F%2Fwebconf.vc.dfn.de%2FShibboleth.sso%2FLogin%3FSAMLDS%3D1%26target%3Dss%253Amem%253A91a559f6fe23a4cf2047736a346176afdde2eee7c554b2fb1cddbc35aea5aec6"><strong>Zugang über DFNconf</strong></a></div> -->
-                <div class="col-lg-4 text-center d-flex flex-column justify-content-center align-items-md-center"
+                <div class="col-md-6 text-center d-flex flex-column justify-content-center align-items-md-center"
                     style="padding: 0;margin: 0;margin-right: 0px;margin-left: 0px;padding-right: 0px;padding-left: 5px;margin-top: 15px;">
                     <h2 class="text-center" style="color: #708090;"><strong>GoToMeeting</strong><br></h2>
                     <p class="text-center"><strong>Für Mitglieder der HFT</strong><br><br></p>