You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2005/09/26 06:33:19 UTC
svn commit: r291553 - in /incubator/roller/branches/roller_2.0/web/theme:
layout.css roller.css
Author: agilliland
Date: Sun Sep 25 21:33:15 2005
New Revision: 291553
URL: http://svn.apache.org/viewcvs?rev=291553&view=rev
Log:
moving #footer definition to layout.css
Modified:
incubator/roller/branches/roller_2.0/web/theme/layout.css
incubator/roller/branches/roller_2.0/web/theme/roller.css
Modified: incubator/roller/branches/roller_2.0/web/theme/layout.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/layout.css?rev=291553&r1=291552&r2=291553&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/layout.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/layout.css Sun Sep 25 21:33:15 2005
@@ -2,9 +2,6 @@
layout.css: Base CSS layout for Roller's web UI (position and sizing only)
====================================================================== */
-#wrapper {
- width: 100%;
-}
#banner {
margin: 0px;
padding: 0px 0px 0px 0px;
@@ -30,14 +27,40 @@
#menu {
padding: 0px 10px 0px 10px;
}
+#content {
+}
+/*
+ NOTE: these wrap divs are kinda lame, however they are necessary.
+ the problem is that when 2 divs are floated side-by-side then the
+ calculation of their widths does not include padding or margins.
+
+ so without the wrap divs then putting a margin or padding value in any
+ of the XXXcontent divs forces the width calculation to be > 100% and
+ the divs don't fit next to each other anymore :(
+
+ to get around this we put a XXXcontent_wrap around the XXXcontent divs
+ to do the float and set the width. margin, padding, borders, etc
+ should be applied directly to the XXXcontent div.
+*/
+#centercontent_wrap {
+ float: left;
+ display: inline;
+}
#centercontent {
- margin: 10px 10px 0px 10px;
+ margin: 10px;
+}
+#rightcontent_wrap {
+ float: right;
+ display: inline;
}
#rightcontent {
- position: absolute;
- top: 40px;
- right: 15px;
- width: 230px;
+ margin: 10px;
+}
+#footer {
+ clear: both;
+ padding: 15px 0px 15px 0px;
+ font-size: smaller;
+ text-align: center;
}
.prop {
height: 300px;
Modified: incubator/roller/branches/roller_2.0/web/theme/roller.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/roller.css?rev=291553&r1=291552&r2=291553&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/roller.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/roller.css Sun Sep 25 21:33:15 2005
@@ -85,12 +85,6 @@
width: 100%;
background: #f00;
}
-#footer {
- margin: 25px 0px 20px 0px;
- font-size: smaller;
- text-align: center;
- clear: both;
-}
.sidebarBodyHead h3, .searchSidebarBody h3 {
padding: 5px;
}
@@ -247,7 +241,6 @@
div.yourWeblogBox {
padding: 8px 0px 10px 0px;
- margin-right: 10px;
}
/* ----------------------------------------------------------------------
@@ -543,9 +536,11 @@
.padleft {
padding-left: 8px;
}
+#logo {
+ padding: 15px 0px 10px 15px;
+}
/* Transparent PNG fix for IE, thanks to Kenneth M. Kolano */
#logoshadow {
- position: relative;
top: 15px;
left: 15px;
width: 165px;