From: Thierry Parmentelat Date: Wed, 13 Nov 2013 09:48:27 +0000 (+0100) Subject: one single css file for both unfold-layout1.html and unfold-layout2.html X-Git-Tag: myslice-0.3-0~113^2~7^2~16 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=e18e0beea268c9cec7c00f529aaa8dbe3fc82a96 one single css file for both unfold-layout1.html and unfold-layout2.html it’s empty anyway for now --- diff --git a/ui/static/css/layout-unfold.css b/ui/static/css/layout-unfold.css new file mode 100644 index 00000000..43b8920e --- /dev/null +++ b/ui/static/css/layout-unfold.css @@ -0,0 +1,9 @@ +/* single column layout - layout-unfold1.html */ +#unfold1-main { +} +/* dual column layout - layout-unfold2.html */ +#unfold2-main { +} +#unfold2-margin { +/* trying to set a right padding here results in undesired results (spans beyond right end) */ +} diff --git a/ui/static/css/layout-unfold2.css b/ui/static/css/layout-unfold2.css deleted file mode 100644 index 9e068372..00000000 --- a/ui/static/css/layout-unfold2.css +++ /dev/null @@ -1,7 +0,0 @@ -/* this relates to the unfold-layout1 template */ -#unfold2-main { -} -#unfold2-margin { - padding: 10; -/* background-color: #fff2ff; */ -} diff --git a/ui/templates/base.html b/ui/templates/base.html index b551df76..f7787353 100644 --- a/ui/templates/base.html +++ b/ui/templates/base.html @@ -20,7 +20,7 @@ {% insert_str prelude "js/plugin.js" %} {% insert_str prelude "js/manifold.js" %} {% insert_str prelude "js/topmenu.js" %} -{% insert_str prelude "css/layout-unfold2.css" %} +{% insert_str prelude "css/layout-unfold.css" %} {% insert_str prelude "css/manifold.css" %} {% insert_str prelude "css/plugin.css" %} {% insert_str prelude "css/onelab_marko.css" %}