small fixes

diff --git a/panikweb_templates/static/css/specifics.css b/panikweb_templates/static/css/specifics.css
index 51744ffc91f6c342de2914c0486d57b5a8465ea9..bc8cbbf3f52ad9f35df9028a85c35b4d8d7434c3 100644 (file)
--- a/panikweb_templates/static/css/specifics.css
+++ b/panikweb_templates/static/css/specifics.css
@@ -49,12 +49,6 @@
 }
 .iconLabel{margin-left:0.1em;}
 
-/****************************************************/
-.wrapper {max-width: 1024px; margin:auto;}
-.wrapper.text {max-width: 780px; margin:auto;}
-.wrapper.half {max-width: 510px; margin:auto;}
-
-
 .sectionLabel, .label {
     text-transform: uppercase;
     font-family: "Reglo";
@@ -68,6 +62,29 @@
     color:white;
     padding:5px 7px 0px 7px;
 }
+
+/****************************************************/
+/* WRAPPER */
+/****************************************************/
+.wrapper {max-width: 1260px; margin:auto;}
+.wrapper.text {max-width: 780px; margin:auto;}
+.wrapper.half {max-width: 510px; margin:auto;}
+.wrapper.sided{                max-width:1260px;       }
+
+@media screen and (min-width: 600px) {
+       .wrapper.sided .leftPart,
+         .wrapper.sided .rightPart{
+               width:45%;
+       }
+       .wrapper.sided .leftPart{
+               float:left;
+       }
+       .wrapper.sided .rightPart{
+               float:right;
+       }
+}
+
+
 button.control, button.symbol{background:transparent;border:none;margin:0;padding:0;}
 nav.menu{
        width:100%;
@@ -671,13 +688,25 @@ body{
        margin:none;
        padding:none;
 }
-.newsRoll .absolute{
+.newsRoll .title{
        background:black;
        color:white;
        bottom:0px;
        width:100%;
        opacity:0.8;
 }
+.newsRoll .labels{
+}
+.newsRoll .labels .item{
+       display:block;
+       background:#003446;
+       color:white;
+       margin:0.1em;
+       font-size:0.9em;
+       padding:0.3em;
+       opacity:0.9;
+       border-radius:0.3em;
+}
 .newsRoll h5{
        font-size:1em;
        color:white;
@@ -708,9 +737,6 @@ ul.newsSpecial{
 }
 @media (min-width: 800px) {
 }
-.news.detail .description{
-       margin-top:1em;
-}
 
 /****************************************************/
 /**** Home & ****/
@@ -883,22 +909,6 @@ body { font-size: 16px;}
     body #All{ font-size: 100%; }
 }
 
-@media screen and (min-width: 600px) {
-       .wrapper.sided{
-               max-width:1000px;
-       }
-       .wrapper.sided .leftPart,
-         .wrapper.sided .rightPart{
-               width:45%;
-       }
-       .wrapper.sided .leftPart{
-               float:left;
-       }
-       .wrapper.sided .rightPart{
-               float:right;
-       }
-}
-
 #subscribe-form {
   position: relative;
 }

diff --git a/panikweb_templates/templates/emissions.html b/panikweb_templates/templates/emissions.html
index eddeaf2a6a01633c1ee6038b24809cc1c58c8a67..ef32d507fbd87a1a41ae929f471fb8f756349c24 100644 (file)
--- a/panikweb_templates/templates/emissions.html
+++ b/panikweb_templates/templates/emissions.html
@@ -7,11 +7,13 @@
 {% endblock %}
 {% block main %}
 <div class="emissions padded">
+       <div class="wrapper">
                <ul class="custom list columns padded">
                {% for emission in emissions %}
                        <li class="item  {% if emission.categories.all.count = 0 %}nocat{% endif %} {% for category in emission.categories.all %} {{ category|slugify }}{% endfor %}{% if emission.archived %} archived{% endif %}"
                        >{% emission_resume %}</li>
                {% endfor %}
                </ul>
+       </div>
 </div>
 {% endblock %}

diff --git a/panikweb_templates/templates/emissions/resume.html b/panikweb_templates/templates/emissions/resume.html
index 57a3fd40a81b341c26a5a480ebfe22d79f5b350f..183bc18602ae9233e270e8e0fca8733a70799fa7 100644 (file)
--- a/panikweb_templates/templates/emissions/resume.html
+++ b/panikweb_templates/templates/emissions/resume.html
@@ -5,9 +5,9 @@
                <a class="block" href="{% url 'emission-view' slug=emission.slug %}">
                        <div class="logo left">
                                {% if emission.image %}
-                                       <img width="50" height="50" src="{{ emission.image|thumbnail:'50x50' }}"/>
+                                       <img width="60" height="60" src="{{ emission.image|thumbnail:'60x60' }}"/>
                                {% else %}
-                                       <img  class="smooth" width="50" height="50" src="{% static "img/defaultLogo.png" %}"/>
+                                       <img  class="smooth" width="60" height="60" src="{% static "img/defaultLogo.png" %}"/>
                                {% endif %}
                        </div>
                        <div class="title ellipsis">

diff --git a/panikweb_templates/templates/episodes/resume.html b/panikweb_templates/templates/episodes/resume.html
index 4d8950635e1b412dedd5d7077caf84cbdecf14d3..be8070f91c306aa5214e0220603e0d9453f2e1c7 100644 (file)
--- a/panikweb_templates/templates/episodes/resume.html
+++ b/panikweb_templates/templates/episodes/resume.html
@@ -24,11 +24,11 @@
        {% endif %}
        <div class="logo">
                {% if model = "inline" and episode.image %}
-                       <img src="{{ episode.image|thumbnail:'50x50' }}"/>
+                       <img src="{{ episode.image|thumbnail:'60x60' }}"/>
                {% elif model = "inline" and episode.emission.image %}
-                       <img src="{{ episode.emission.image|thumbnail:'50x50' }}"/>
+                       <img src="{{ episode.emission.image|thumbnail:'60x60' }}"/>
                {% elif model = "inline" %}
-                       <img class="smooth"  width="50" height="50" src="{% static "img/defaultLogo.png" %}"/>
+                       <img class="smooth"  width="60" height="60" src="{% static "img/defaultLogo.png" %}"/>
                {% elif episode.image %}
                        <img src="{{ episode.image|thumbnail:'150x150' }}"/>
                {% elif episode.emission.image %}

diff --git a/panikweb_templates/templates/episodes/search_result.html b/panikweb_templates/templates/episodes/search_result.html
index aec789c595942008948b3e3e75256843d66ce6bf..55536492bca653b973b44c9c9283bdd104fe87eb 100644 (file)
--- a/panikweb_templates/templates/episodes/search_result.html
+++ b/panikweb_templates/templates/episodes/search_result.html
@@ -1,5 +1,5 @@
 <a href="{% url 'episode-view' emission_slug=result.object.emission.slug slug=result.object.slug %}">
-       <span class="icon-headphones" ></span>
+       <span class="icon-volume-off " ></span>
        <strong>{{ result.object.title }}</strong>
        <br />
        <span class="smooth">{{ result.object.emission.title }}</span>

diff --git a/panikweb_templates/templates/listen.html b/panikweb_templates/templates/listen.html
index 32bc3d86a2528cb11bfb3a493dc3ad6fb90736ba..6794e0755f30ea5b90c18b2b68d505ada087fc90 100644 (file)
--- a/panikweb_templates/templates/listen.html
+++ b/panikweb_templates/templates/listen.html
@@ -5,13 +5,15 @@
 {% endblock %}
 {% block main %}
 <div class="">
-       <ul class="padded custom columns list">
-       {% for episode in episodes %}
-               <li class="item {% if episode.emission.categories.all.count = 0 %}nocat{% endif %} {% for category in episode.emission.categories.all %} {{ category|slugify }}{% endfor %}">
-                       {% episode_resume model="inline" klass="standalone" %}                  
-               </li>
-       {% endfor %}
-       </ul>
+       <div class="wrapper">
+               <ul class="padded custom columns list">
+               {% for episode in episodes %}
+                       <li class="item {% if episode.emission.categories.all.count = 0 %}nocat{% endif %} {% for category in episode.emission.categories.all %} {{ category|slugify }}{% endfor %}">
+                               {% episode_resume model="inline" klass="standalone" %}                  
+                       </li>
+               {% endfor %}
+               </ul>
+       </div>
 </div>
 {% endblock %}
 

diff --git a/panikweb_templates/templates/news/roll.html b/panikweb_templates/templates/news/roll.html
index 2679f41ab593472b9d65ba9abfe62762f7f23404..a9c8f8dca2ef003924e1940805d8a278ecf5bc54 100644 (file)
--- a/panikweb_templates/templates/news/roll.html
+++ b/panikweb_templates/templates/news/roll.html
@@ -2,16 +2,24 @@
 <div id="newsRoll">
        <div class="newsRoll center wrapper">
                <ul class="custom distributed">
-                       <li class="title">
+                       <li class="rollLabel">
                                <h4 class="label vertical">{% trans 'News' %}</h4>
                        </li>
                        {% for content in news %}
                                <li class="{% if forloop.counter > 3 %}largeScreens{% endif %}">
                                        <a title="{{content.title|striptags|addslashes}}" class="block news relative" href="{% url 'news-view' slug=content.slug %}">                                   
-                                               {% if content.image %}          
-                                               <div class="absolute">
-                                                       <h5 class="title ellipsis">{{ content.date|date:"D m/m" }}</h5>
-                                               </div>
+                                               {% if content.image %}  
+                                                       <!--
+                                                       <div class="labels absolute">
+                                                               <span class="item inBlock">Cd-Dvd</span>
+                                                               <span class="item inBlock">Concours</span>
+                                                               <span class="item inBlock">Fête</span>
+                                                       </div>  
+                                                       -->
+                                                       <div class="absolute title ">
+                                                               <h5 class="ellipsis">{{ content.date|date:"D m/m" }}</h5>
+                                                       </div>  
+
                                                <img class="logo" src="{{ content.image|thumbnail:'240x320' }}"/>       
                                                {% endif %}                             
                                        </a>