Merge branch 'feat_9'

# Conflicts:
#	.gitignore
#	css/style.css

.gitignore

@@ -1,11 +1,15 @@
 csv2json/node_modules
 
+<<<<<<< HEAD
 # Created by https://www.gitignore.io/api/macos,jekyll
 
 ### Jekyll ###
 wahlprogramme/_site/
 wahlprogramme/.sass-cache/
 wahlprogramme/.jekyll-metadata
+=======
+# Created by https://www.gitignore.io/api/macos
+>>>>>>> feat_9
 
 ### macOS ###
 *.DS_Store

css/style.css

@@ -10,6 +10,11 @@ body {
   min-height: 135px;
 }
 
+.btn.btn-block.listanswer {
+    border: 0px;
+    cursor: default;
+}
+
 #thesesbox{
 	min-height: 150px;
 }
@@ -38,6 +43,7 @@ body {
   border-color: #00CC66;
 }
 
+<<<<<<< HEAD
 .mt-5 {
   margin-top: 5px;
 }
@@ -46,4 +52,9 @@ body {
 }
 .mt-50 {
   margin-top: 50px;
-}
+}
+=======
+.m-t-5 {
+    margin-top: 5px;
+}
+>>>>>>> feat_9

includes/elements.php

@@ -7,9 +7,12 @@ function print_result_detail_table($answers, $data){
 	echo "<th class='hidden-xs hidden-sm'>Deine Wahl</th>";
 	for($i = 0; $i < sizeof($data['lists']); $i = $i + 1) {
 		$classname = string_to_css_classname($data['lists'][$i]['name']);
+        $list_name_short = $data['lists'][$i]['name_x'];
+        $list_logo = $data['lists'][$i]['logo'];
 		echo "
     <th class='hidden-xs hidden-sm list-$classname'>
-      {$data['lists'][$i]['name_x']} (".calculate_points($data['answers'][$i], $answers).")
+      <img class='img-responsive img-list-logo-small' src='img/lists/$list_logo' title='$list_name_short Logo'>
+      (".calculate_points($data['answers'][$i], $answers).")
     </th>";   
   }
   echo "</tr>\n";