=== modified file 'page.tpl.php' --- page.tpl.php 2009-05-21 18:56:33 +0000 +++ page.tpl.php 2009-05-21 19:31:19 +0000 @@ -48,12 +48,8 @@
-
-
-
- -
-
+
+
=== modified file 'style.css' --- style.css 2009-05-21 18:56:33 +0000 +++ style.css 2009-05-21 21:06:06 +0000 @@ -1159,153 +1159,76 @@ padding: none; } + +/* outer container, after #header */ #container { position: relative; background-color: #ffffff; z-index: 2; } -#container0{ - float: left; - width: 100%; - position: relative; - right: 75%; -} - -#container1{ - float: left; - width: 100%; - position: relative; - right: 75%; -} - -#container2 { - float: left; - width: 100%; - position: relative; +/* inner container */ +#container1 { + width: 100%; + padding: 15px; +} + +/* let inner elements stack horizontally */ +#container1 div { + float: left; overflow: hidden; } +/* reset inner elements float to default @testme */ +#container1 div * { + float:none; +} + #col1 { - float: left; width: 23%; - position: relative; - left: 76%; - overflow: hidden; + left: 0; } #col2 { - float: left; - width: 73%; - position: relative; - left: 78%; - overflow: hidden; + width: auto; /* this should occupy all free space ... @testme */ + margin: 0 15px; } #col3 { - float: left; - width: 73%; - position: relative; - left: 80%; - overflow: hidden; + width: 23%; + right: 0; } -/* - * layout2: overriding values according to sidebars presence - * section generated by a slightly modified copy of ubuntudrupal_columnsheets() - * @see tools/columns-css.php - * Values unchanged. Kept erroneous case where no sidebar is present. - * - * | sidebars | column | firstcolumn | secondcolumn | center | lastcolumn | padding | - * ------------------------------------------------------------------------------------------ - * | left && right | 3 | 20 | 60 | 60 | 20 | 1 | - * | !left && right | 2 | 75 | 25 | 0 | 25 | 1 | - * | left && !right | 2 | 25 | 75 | 0 | 75 | 1 | - * | !left && !right | 0 | 0 | 0 | 0 | 0 | 0 | - * - */ - /* sidebar left: ''; sidebar right: '' */ -body.with-no-sidebar #container { - float:left; width:100%; position:relative; overflow:hidden; -} -body.with-no-sidebar #container-1 { - float:left; width:100%; position:relative; right:%; -} -body.with-no-sidebar #container-2 { - float:left; width:100%; position:relative; right:%; -} -body.with-no-sidebar #col1 { - float:left; width:0%; position:relative; left:0%; overflow:hidden; +body.with-no-sidebar #container1 { + width:90%; /* sample property, for demo */ } body.with-no-sidebar #col2 { - float:left; width:0%; position:relative; left:0%; overflow:hidden; -} -body.with-no-sidebar #col3 { - float:left; width:0%; position:relative; left:0%; overflow:hidden; -} - + width:100%; /* sample property */ +} /* sidebar left: 'yes'; sidebar right: '' */ -body.with-sidebar-left #container2 { - float:left; width:100%; position:relative; overflow:hidden; -} -body.with-sidebar-left #container1 { - float:left; width:100%; position:relative; right:75%; -} -body.with-sidebar-left #container0 { - float:left; width:100%; position:relative; right:75%; } body.with-sidebar-left #col1 { - float:left; width:23%; position:relative; left:76%; overflow:hidden; -} -body.with-sidebar-left #col2 { - float:left; width:73%; position:relative; left:78%; overflow:hidden; -} -body.with-sidebar-left #col3 { - float:left; width:73%; position:relative; left:80%; overflow:hidden; + width:25%;; /* sample property, for demo */ } /* sidebar left: 'yes'; sidebar right: 'yes' */ -body.with-both-sidebars #container3 { - float:left; width:100%; position:relative; overflow:hidden; -} -body.with-both-sidebars #container2 { - float:left; width:100%; position:relative; right:20%; -} body.with-both-sidebars #container1 { - float:left; width:100%; position:relative; right:60%; } -body.with-both-sidebars #col1 { - float:left; width:18%; position:relative; left:81%; overflow:hidden; +body.with-both-sidebars #col1, +body.with-both-sidebars #col3 { + width:18%; } body.with-both-sidebars #col2 { - float:left; width:58%; position:relative; left:83%; overflow:hidden; -} -body.with-both-sidebars #col3 { - float:left; width:18%; position:relative; left:85%; overflow:hidden; + width:58%; } /* sidebar left: ''; sidebar right: 'yes' */ -body.with-sidebar-right #container2 { - float:left; width:100%; position:relative; overflow:hidden; -} -body.with-sidebar-right #container1 { - float:left; width:100%; position:relative; right:25%; -} -body.with-sidebar-right #container0 { - float:left; width:100%; position:relative; right:25%; -} -body.with-sidebar-right #col1 { - float:left; width:73%; position:relative; left:26%; overflow:hidden; -} -body.with-sidebar-right #col2 { - float:left; width:23%; position:relative; left:28%; overflow:hidden; -} body.with-sidebar-right #col3 { - float:left; width:23%; position:relative; left:30%; overflow:hidden; + width:25%; ; /* sample property, for demo */ } - /* end of layout */ + #content { position: relative; background-color: #ffffff;