]> git.parisson.com Git - diggersdigest.git/commitdiff
projects / diggersdigest.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: db01805)
cleanup style
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 11 Sep 2015 13:28:06 +0000 (15:28 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 11 Sep 2015 13:28:06 +0000 (15:28 +0200)
diggersdigest/static/css/dig2.css patch | blob | history
diggersdigest/templates/base.html patch | blob | history
diggersdigest/templates/shop/product.html patch | blob | history

diff --git a/diggersdigest/static/css/dig2.css b/diggersdigest/static/css/dig2.css
index 8a6968aa8397920c68a4be34d9e94cbfb26a9ec7..906af8217512e23154e2ff3d9eea48e79892b5d0 100644 (file)
--- a/diggersdigest/static/css/dig2.css
+++ b/diggersdigest/static/css/dig2.css
@@ -9,7 +9,7 @@
 }
 
 body {
-    padding-top: 300px;
+/* padding-top: 300px; */
 }
 
 hr {
@@ -20,3 +20,12 @@ hr {
     margin: 1em 0;
     padding: 0;
 }
+
+.lp-desc {
+    background-color: white;
+    padding: 1em 1em 1em 2em;
+}
+
+.navbar-default {
+    background: white;
+}
diff --git a/diggersdigest/templates/base.html b/diggersdigest/templates/base.html
index 7117c27aaf68ed54fbf00e4eb33288dd7d36816c..c1669f44b342034509e410770fe8b99996587ad8 100644 (file)
--- a/diggersdigest/templates/base.html
+++ b/diggersdigest/templates/base.html
@@ -44,11 +44,6 @@
 <script src="{% static "js/respond.min.js" %}"></script>
 <![endif]-->
 
-{% block extra_head %}{% endblock %}
-</head>
-
-<body id="{% block body_id %}body{% endblock %}">
-<div id="fb-root"></div>
 <script>(function(d, s, id) {
   var js, fjs = d.getElementsByTagName(s)[0];
   if (d.getElementById(id)) return;
@@ -57,6 +52,11 @@
   fjs.parentNode.insertBefore(js, fjs);
   }(document, 'script', 'facebook-jssdk'));
 </script>
+
+{% block extra_head %}{% endblock %}
+</head>
+
+<body id="{% block body_id %}body{% endblock %}">
 <div class="navbar navbar-default navbar-fixed-top" role="navigation">
   <div class="container ">
     <div class="navbar-header">
@@ -66,9 +66,8 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      {% if settings.SITE_TITLE %}<a class="navbar-brand" href="/"><img class="pull-left" src="{% static "img/diggersdigest_400.png" %}"alt={{ settings.SITE_TITLE }}  ></a>{% endif %}
+      {% if settings.SITE_TITLE %}<a class="navbar-brand" href="/"><img class="pull-left" width="180" src="{% static "img/diggersdigest_400.png" %}"alt={{ settings.SITE_TITLE }}  ></a>{% endif %}
       {% if settings.SITE_TAGLINE %}<p class="navbar-text visible-lg">{{ settings.SITE_TAGLINE }}</p>{% endif %}
-    
     </div>
     <div class="navbar-collapse collapse">
       {% search_form "all" %}
@@ -78,9 +77,6 @@
   </div>
 
 </div>
-    
-
-
 
 <div class="container">
 
@@ -110,13 +106,7 @@
 <div class="container">
 <div class="row">
 
-<div class="col-md-2 left">
-    {% block left_panel %}
-    <div class="panel panel-default tree">{% page_menu "pages/menus/tree.html" %}</div>
-    {% endblock %}
-</div>
-
-<div class="col-md-7 middle">
+<div class="col-md-9 middle">
     {% block main %}{% endblock %}
 </div>
 
@@ -140,8 +130,8 @@
 </div>
 
 <footer>
-<div class="container">
-{% page_menu "pages/menus/footer.html" %}
+<div>
+<!-- {% page_menu "pages/menus/footer.html" %} -->
 
 <div class="row">
 <p class="site-info text-center">
diff --git a/diggersdigest/templates/shop/product.html b/diggersdigest/templates/shop/product.html
index 37b385d75fd50c3a8fa2ecde62f7bdfa151fbed0..9d2f5f1a182fc4b4638ef1f1746f8467474d347f 100644 (file)
--- a/diggersdigest/templates/shop/product.html
+++ b/diggersdigest/templates/shop/product.html
@@ -86,8 +86,7 @@ $(function () {
 {% endspaceless %}
 {% endif %}
 
-
-<ul>
+<ul class="lp-desc">
   <li><strong>{{ product.record.artist }}</strong></li>
   <li><em>{{ product.record.title }}</em></li>
   <li>
@@ -125,12 +124,14 @@ $(function () {
   </a>
   </li>
 </ul>
+</div>
 {% if product.record.audio_file %}
 <audio controls>
     <source src="{{ MEDIA_URL }}{{ product.record.audio_file }}">
 </audio>
 {% endif %}
 
+<br/>
 {% editable product.content %}
 {{ product.content|richtext_filters|safe }}
 {% endeditable %}
Unnamed repository; edit this file 'description' to name the repository.