From: Thierry Parmentelat Date: Mon, 10 Dec 2012 16:16:23 +0000 (+0100) Subject: fluid layout X-Git-Tag: myslice-django-0.1-1~153 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4cbfed0032bfb74c91f7dc6c8e47e75f526c7176;p=unfold.git fluid layout --- diff --git a/static/css/myslice.css b/static/css/myslice.css index 2e469040..a6167d28 100644 --- a/static/css/myslice.css +++ b/static/css/myslice.css @@ -1,14 +1,6 @@ #content-main { - margin: 60 200 0 0; - padding: 0; } #content-related { - margin-top: 60; - padding: 0; - width: 200; - position: fixed; - display: block; - right: 0px; - top: 0px; - background-color: #d0d0f8; + padding: 10; + background-color: #fff2ff; } diff --git a/static/css/topmenu.css b/static/css/topmenu.css new file mode 100644 index 00000000..ac3d29a3 --- /dev/null +++ b/static/css/topmenu.css @@ -0,0 +1,5 @@ +/* this is to get the content below the navbar */ +body { + padding-top: 60px; + padding-bottom: 40px; +} diff --git a/templates/layout-myslice.html b/templates/layout-myslice.html index d3a7436b..3a9cba2a 100644 --- a/templates/layout-myslice.html +++ b/templates/layout-myslice.html @@ -26,25 +26,28 @@ {% block container %} -
+
- {% block topmenu %} - {% include 'widget-topmenu.html' %} - {% endblock topmenu %} + + {% block topmenu %} + {% include 'widget-topmenu.html' %} + {% endblock topmenu %} -
+
+
+
{% block content_main %} - "The main content area (set block 'content_main')" + "The main content area (define block 'content_main')" {% endblock content_main %} -
- -
+
+ +
{% block content_related %} - "The related content area (set block 'related_main')" + "The related content area (define block 'related_main')" {% endblock content_related %} -
- -
+
+
+
{% endblock container %} diff --git a/templates/widget-login.html b/templates/widget-login.html new file mode 100644 index 00000000..7f4a3a88 --- /dev/null +++ b/templates/widget-login.html @@ -0,0 +1,13 @@ + + +
+ {% csrf_token %} + {% if next %} + + {% endif %} + username: +
+ password: +
+ +
diff --git a/templates/widget-topmenu.html b/templates/widget-topmenu.html index 70cc1492..930cca3e 100644 --- a/templates/widget-topmenu.html +++ b/templates/widget-topmenu.html @@ -1,6 +1,6 @@ {# #} {# {% insert_str prelude "js/mymenu.js" %} #} -{# {% insert_str prelude "css/mymenu.css" %} #} +{% insert_str prelude "css/topmenu.css" %}