Restyling after merge GIT error

panikweb_templates/static/css/general.css

@@ -279,8 +279,8 @@ nav a.active, nav button.active{
 	-webkit-break-inside: avoid-column;
 	-moz-break-inside: avoid-column;
 }
-@media only screen and (min-width: 640px) {	.columns{column-count: 2;	-webkit-column-count: 2;	-moz-column-count: 2;}	}
-@media only screen and (min-width: 1160px) {	.columns{column-count: 3;	-webkit-column-count: 3;	-moz-column-count: 3;}	}
+@media only screen and (min-width: 600px) {	.columns{column-count: 2;	-webkit-column-count: 2;	-moz-column-count: 2;}	}
+@media only screen and (min-width: 900px) {	.columns{column-count: 3;	-webkit-column-count: 3;	-moz-column-count: 3;}	}
 
 /**
  * For modern browsers
@@ -307,3 +307,4 @@ nav a.active, nav button.active{
 .wrapper, .cf {
     *zoom: 1;
 }
+

panikweb_templates/static/css/specifics.css

@@ -412,8 +412,7 @@ button.tag {
 	color:#1663d5;
 }
 #Grid .heure {
-	width:300px !important;
-	padding:0.5em 0 0.5em 0;
+	height:100px !important;
 }
 #Grid .heure.vertical {
 	padding:1.5em 0;
@@ -425,12 +424,16 @@ button.tag {
 	color:#CCC;
 }
 #Grid .item{
-	padding:1em 0.2em 1em 0.2em;
+	padding:0.5em 0.2em 0.5em 0.2em;
 }
 #Grid .cell hr {
 	border:1px dotted #ddd;
-	margin:1em;
+	margin:0.3em;
 }
+#Grid .time-label{
+	margin-top:0.5em;
+}
+
 #Grid .highlighted,#Grid .highlighted  *{
 	background:#FF0096 !important;
 	color:white !important;
@@ -486,3 +489,4 @@ body { font-size: 16px;}
 #player.simple *, #Player a, #Player button{	color:white !important;}
 
 
+

panikweb_templates/templates/grid.html

@@ -38,7 +38,7 @@
 			  <td class="small cell {% if cell.schedules|length > 1 %}many {% endif %}{% if cell.schedules %}scheduled{% else %}nonstop{% endif %}" {% if cell.w > 1 %}colspan="{{cell.w}}"{% endif %}
 				      {% if cell.h > 1 %}rowspan="{{cell.h}}"{% endif %}>
 					{% if cell.time_label %}
-						<div class="cell-time-label">{{ cell.time_label }}</div>
+						<div class="time-label">{{ cell.time_label }}</div>
 					{% endif %}
 				      {% if cell.schedules %}
 					{% for schedule in cell.schedules %}
@@ -69,3 +69,4 @@
 
 {% block news %}
 {% endblock %}
+

panikweb_templates/templates/includes/audio.html

@@ -9,8 +9,7 @@
 	{% if preload %}preload="{{ preload }}"{% endif%}
 	class="{{ class }}" 
 	src="{{ file.url }}" 
-controls="{{ controls }}"
-	{% if controls %}{% endif%}
+	{% if controls %}controls="{{ controls }}"{% endif%}
 	
 	></audio>  
 {% else %}

panikweb_templates/templates/listen.html

@@ -5,7 +5,9 @@
 	<ul class="small custom list columns padded">
 	{% for sound in sounds %}
 		<li class="item ellipsis">
+			{% include "includes/audio.html" with src=sound.file %}
 			{{ sound.episode }}
+			
 		</li>
 	{% endfor %}
 	</ul>