Fixing wrap & nav

diff --git a/panikweb_templates/static/css/general.css b/panikweb_templates/static/css/general.css
index 01cc108db289ad07ef908a9e4ad4831dd6a964ff..2f82644b0bbbc887104fab0b7f4cf4dfe01bfcd0 100644 (file)
--- a/panikweb_templates/static/css/general.css
+++ b/panikweb_templates/static/css/general.css
@@ -146,7 +146,6 @@ dl.metadata dd {
     }
 
 button {display:inline-block;}
-
 nav button {
        font-family: "RegloBold";
        text-transform: uppercase;
@@ -165,15 +164,15 @@ nav ul li, ul.inline li{
 /******************/
 
 
-nav ul{
+ul.distributed{
        display:table;
        width:100%;
        text-align:center;
-       margin-bottom:2em;
+       margin:0;
+       padding:0;
 }
-nav ul li{
+ul.distributed li{
        display:table-cell;
-       width:14%;
        text-align:center;
 }
 

diff --git a/panikweb_templates/static/css/specifics.css b/panikweb_templates/static/css/specifics.css
index d36aa7c861750a31a068e3117457c30bbe6c926e..5adf185279156006415e6ae175b277128c4c10a1 100644 (file)
--- a/panikweb_templates/static/css/specifics.css
+++ b/panikweb_templates/static/css/specifics.css
@@ -56,11 +56,6 @@
 }
 #player .help{
 }
-#metaNav {
-       font-family: "Reglo";
-       text-transform: uppercase;
-       font-size: 0.9em;
-}
 h1.title{
 }
 .date, .dateBloc {
@@ -104,7 +99,7 @@ body {
 #Panik {background:white;}
 #Panik img{display:block;margin:auto;}
 .wrapper {max-width: 1024px; margin:auto;}
-.emission .wrapper{max-width:600px;margin:auto;}
+.wrapper.half{max-width:600px;margin:auto;}
 
  
 .symbol{
@@ -184,7 +179,9 @@ button.tag {
 
 #search-form{content:'Rechercher';}
 #search-form:focus{content:'';}
+
 #metaNav {
+       font-size: 0.9em;
        color:white;
        background-color: black;
        position:fixed;
@@ -192,38 +189,21 @@ button.tag {
        top:0px;
        width:100%;
 }
-#metaNav input {float:right;width:150px;max-width:25%;}
-#metaNav nav{
-       padding: 0.5em 0 0 0.5em;
+#metaNav li{
+       border-left:1px solid #333;
+       border-right:1px solid #333;
 }
-
-#metaNav nav{
-}
-#metaNav ul,#metaNav li{margin:0 !important;padding:0 !important;}
 #metaNav ul li{
-       display: inline-block;
-       max-width:20%;
        white-space: nowrap;
        text-overflow: ellipsis;
        overflow:hidden;
 }
-#metaNav button.toggler{color:white;display:none;}
 #metaNav ul li a{
        color:white;
-       margin-right:1em;
        letter-spacing:1px;
 }
 
 
-#siteNav > div {
-    float:left;
-    }
-
-#advanced > div {
-    float: left;
-}
-
-
 /****************************************************/
 /**** PLAYER ****/
 /*#Home #player{   float: left; } */

diff --git a/panikweb_templates/templates/emissions/emission_detail.html b/panikweb_templates/templates/emissions/emission_detail.html
index f1059dd27e11e52c7dc2d9c041a0024d2dcad60b..5fa52727370c84b5c32ee1856b55ae95e4959685 100644 (file)
--- a/panikweb_templates/templates/emissions/emission_detail.html
+++ b/panikweb_templates/templates/emissions/emission_detail.html
@@ -3,7 +3,7 @@
 {% block listen %}{% endblock %}
 {% block main %}
 <div class="emission">
-       <div class="wrapper">
+       <div class="wrapper half">
                <div id="Emission-tabs-detail">
                        {% include "emissions/detail.html" %} 
                </div>

diff --git a/panikweb_templates/templates/grid.html b/panikweb_templates/templates/grid.html
index 4056f3cfe99f22ec9d548f74c38ca144d43fa864..352650e4c6e8023f99c51a320fde2def70c12c6c 100644 (file)
--- a/panikweb_templates/templates/grid.html
+++ b/panikweb_templates/templates/grid.html
@@ -6,7 +6,7 @@
 {% block main %}
 <div id="grille">
        <nav>
-               <ul>
+               <ul class="distributed">
                        <li><button>Créations</button></li>
                        <li><button>Agendas</button></li>
                        <li><button>Info</button></li>

diff --git a/panikweb_templates/templates/includes/metaNav.html b/panikweb_templates/templates/includes/metaNav.html
index 4a9af97754177c80b9a077073c4e47ef6298d6f6..4b1f0aa0700bc5912da192fdb00bdaf0f3596faf 100644 (file)
--- a/panikweb_templates/templates/includes/metaNav.html
+++ b/panikweb_templates/templates/includes/metaNav.html
@@ -1,7 +1,6 @@
-<div id="metaNav">
-       <!--<input id="search-form" type="text" />-->
-        <nav class="contextual-menu wrapper">
-               <ul>
+<nav id="metaNav" class="contextual-menu">
+       <div class="wrapper">
+               <ul class="distributed">
                        <!--<li><a href="{% url 'get' %}">☰</a></li>-->
                        <li><a href="{% url 'home' %}">
                                <span class="icon-home" ></span>
@@ -31,5 +30,5 @@
                                <span class="iconLabel">About</span>
                        </a></li>
                </ul>
-       </nav>
-</div>
+       </div>
+</nav>

diff --git a/panikweb_templates/templates/program.html b/panikweb_templates/templates/program.html
index deb5e53ed382fc09569aef0c45ed9d5d67674f32..570fe18df2e53a2965d90928b665cb27dc3cdb55 100644 (file)
--- a/panikweb_templates/templates/program.html
+++ b/panikweb_templates/templates/program.html
@@ -4,7 +4,7 @@
 {% block main %}
 <div class="program tabs">
        <nav>
-               <ul class="days custom">
+               <ul class="days custom distributed">
                {% for day in days %}
                        <li class=""><button data-tab="#Program-tabs-{{ day.datetime|date:"w" }}">{{ day.datetime|date:"D d" }}</button></li>
                {% endfor %}