git://git.onelab.eu / unfold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9b13fae)
first rough restoration of unfold1 unfold2 under boostrap v3
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 24 Sep 2013 09:20:41 +0000 (11:20 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 24 Sep 2013 09:20:41 +0000 (11:20 +0200)
views/templates/base.html patch | blob | history
views/templates/layout-unfold1.html patch | blob | history
views/templates/layout-unfold2.html patch | blob | history

diff --git a/views/templates/base.html b/views/templates/base.html
index ca7a969..3ee9ba2 100644 (file)
--- a/views/templates/base.html
+++ b/views/templates/base.html
@@ -21,18 +21,13 @@
 {% insert_str prelude "css/manifold.css" %}
 <body>
 {% block container %}
-<div id="container">
   {% block topmenu %}
   {% include 'widget-topmenu.html' %}
   {% endblock topmenu %}
-{% include 'messages.html' %}
-<div class="container-fluid">
-  <div class="row-fluid">
-
+{% include 'messages-transient.html' %}
+<div class="container"> <div class="row">
    {% block base_content%}{% endblock %}
-
-  </div><!--raw-fluid-->
-</div><!--container-fluid-->
+</div></div>
 {% endblock container %}
 </body>
 </html>
diff --git a/views/templates/layout-unfold1.html b/views/templates/layout-unfold1.html
index 851de44..002a023 100644 (file)
--- a/views/templates/layout-unfold1.html
+++ b/views/templates/layout-unfold1.html
@@ -1,9 +1,9 @@
 {% extends "base.html" %}
 
 {% block base_content %}
-    <div id="unfold1-main" class="span12 columns">
+    <div id="unfold1-main" class="col-md-12 columns">
       {% block unfold1_main %}
       "The main content area (define block 'unfold1_main')"
       {% endblock unfold1_main %}
-    </div><!--span12-->
+    </div><!--col-md-12-->
 {% endblock %}
diff --git a/views/templates/layout-unfold2.html b/views/templates/layout-unfold2.html
index 4754fa1..1d092c2 100644 (file)
--- a/views/templates/layout-unfold2.html
+++ b/views/templates/layout-unfold2.html
@@ -1,14 +1,14 @@
 {% extends "base.html" %}
 
 {% block base_content %}
-    <div id="unfold2-main" class="span9 columns">
+    <div id="unfold2-main" class="col-md-9 columns">
       {% block unfold2_main %}
       "The main content area (define block 'unfold2_main')"
       {% endblock unfold2_main %}
-    </div><!--span9-->
-    <div id='unfold2-margin' class='span3'>
+    </div><!--col-md-9-->
+    <div id='unfold2-margin' class='col-md-3'>
       {% block unfold2_margin %}
       "The related content area (define block 'related_main')"
       {% endblock unfold2_margin %}
-    </div><!--span3-->
+    </div><!--col-md-3-->
 {% endblock %}
myslice (django)