Merge branch '299-link-to-source' into 'master'

Add link to gitlab in footer

Closes #299

See merge request !317

website/thaliawebsite/static/css/skin.scss

@@ -221,7 +221,7 @@ body {
     .circle-border {
         border-color: $inverted-color;
     }
-    div[class|="social-icon"] a {
+    div[class|="footer-icon"] a {
         background-color: $inverted-color;
     }
 

website/thaliawebsite/static/css/style.scss

@@ -1110,13 +1110,13 @@ body {
         text-align: center;
     }
     /* top footer social icons */
-    .social-icons {
+    .footer-icons {
         float: left;
         left: 50%;
         margin: 0 auto 24px;
         position: relative;
     }
-    div[class|="social-icon"] {
+    div[class|="footer-icon"] {
         float: left;
         margin: 0 3px 6px;
         height: 37px;
@@ -1125,14 +1125,14 @@ body {
         position: relative;
         width: 37px;
     }
-    div[class|="social-icon"] a {
+    div[class|="footer-icon"] a {
         background: #585858;
         display: block;
         height: 100%;
         position: relative;
         width: 100%;
     }
-    div[class|="social-icon"] a:before {
+    div[class|="footer-icon"] a:before {
         content: '';
         height: 100% !important;
         margin-top: 1px;
@@ -1141,34 +1141,22 @@ body {
         width: 100%;
         z-index: 0;
     }
-    .social-icon-twitter a:before {
+    .footer-icon-twitter a:before {
         background: #2ea9e4;
     }
-    .social-icon-facebook a:before {
+    .footer-icon-facebook a:before {
         background: #3c5a98;
     }
-    .social-icon-pinterest a:before {
-        background: #cb2028;
-    }
-    .social-icon-youtube a:before {
-        background: #df3434;
-    }
-    .social-icon-vimeo a:before {
-        background: #0ec4ef;
-    }
-    .social-icon-flickr a:before {
-        background: #ff0084;
-    }
-    .social-icon-linkedin a:before {
+    .footer-icon-linkedin a:before {
         background: #006699;
     }
-    .social-icon-rss a:before {
-        background: #fd6804;
-    }
-    .social-icon-tor a:before {
+    .footer-icon-tor a:before {
         background: #009933;
     }
-    div[class|="social-icon"] a {
+    .footer-icon-gitlab a:before {
+        background: #e24329;
+    }
+    div[class|="footer-icon"] a {
         display: block;
         -moz-transition: all 0.2s ease-in-out;
         -ms-transition: all 0.2s ease-in-out;
@@ -1176,17 +1164,17 @@ body {
         -webkit-transition: all 0.2s ease-in-out;
         transition: all 0.2s ease-in-out;
     }
-    div[class|="social-icon"] a:hover {
+    div[class|="footer-icon"] a:hover {
         margin-top: -38px;
     }
-    div[class|="social-icon"] a:hover img {
+    div[class|="footer-icon"] a:hover img {
         margin-top: 1px;
     }
-    div[class|="social-icon"] a img {
+    div[class|="footer-icon"] a img {
         position: relative;
         z-index: 1;
     }
-    div[class|="social-icon"] a img {
+    div[class|="footer-icon"] a img {
         width: 37px;
         height: 74px;
     }

website/thaliawebsite/templates/base.html

@@ -167,11 +167,12 @@
         <!-- #bottom -->
         <div id="bottom" class="wrapper">
             <div class="container">
-                <div class="social-icons">
-                    <div class="social-icon-twitter"><a href="https://twitter.com/svThalia"><img src="{% static "images/social_icons/social_twitter.png" %}" alt="twitter"></a></div>
-                    <div class="social-icon-facebook"><a href="https://www.facebook.com/svThalia"><img src="{% static "images/social_icons/social_facebook.png" %}" alt="facebook"></a></div>
-                    <div class="social-icon-linkedin"><a href="http://www.linkedin.com/groups?gid=54887"><img src="{% static "images/social_icons/social_linkedin.png" %}" alt="linkedin"></a></div>
-                    <div class="social-icon-tor"><a href="http://thaliawww7dzhrlu.onion"><img src="{% static "images/social_icons/tor.png" %}" alt="tor"></a></div>
+                <div class="footer-icons">
+                    <div class="footer-icon-twitter"><a href="https://twitter.com/svThalia"><img src="{% static "images/footer_icons/twitter.png" %}" alt="twitter"></a></div>
+                    <div class="footer-icon-facebook"><a href="https://www.facebook.com/svThalia"><img src="{% static "images/footer_icons/facebook.png" %}" alt="facebook"></a></div>
+                    <div class="footer-icon-linkedin"><a href="http://www.linkedin.com/groups?gid=54887"><img src="{% static "images/footer_icons/linkedin.png" %}" alt="linkedin"></a></div>
+                    <div class="footer-icon-tor"><a href="http://thaliawww7dzhrlu.onion"><img src="{% static "images/footer_icons/tor.png" %}" alt="tor"></a></div>
+                    <div class="footer-icon-gitlab"><a href="https://gitlab.science.ru.nl/thalia/"><img src="{% static "images/footer_icons/gitlab.png" %}" alt="gitlab"></a></div>
                 </div>
                 <div class="clearfix"></div>
                 <p class="copyright">Copyright {% now "Y" %} {% trans 'Study Association Thalia' %}</p>