More cleanups... just trying to simplify a bit.

Move history.css and support.css styles into wide.css
Make some style adjustments to help our 3-column view look
better on smaller screens.  We can now collopase quite small,
without overlapping text, borders, etc.

deryck

git-svn-id: file:///home/svn/samba-web/trunk@704 44aeb9d7-1cd8-0310-b257-a505e0beeac2

diff --git a/history/header_history.html b/history/header_history.html
index 4ffe158f34122366587c9be49b4251014f3f3b67..61a0f7c152e93ffe73fe25734ab90d69ae47e5c8 100755 (executable)
--- a/history/header_history.html
+++ b/history/header_history.html
@@ -1,6 +1,6 @@
 
 <link rel="stylesheet" href="/samba/style/common.css" type="text/css" media="all" />
-<link rel="stylesheet" href="/samba/style/history.css" type="text/css" media="all" />
+<link rel="stylesheet" href="/samba/style/wide.css" type="text/css" media="all" />
 <link rel="shortcut icon" href="/samba/images/favicon.ico" />
 
 <!--[if gte IE 5.5]>

diff --git a/history/index.html b/history/index.html
index e26ae6e615fbd4f373dd98b4af1be914a72a263e..84d34198c5811ad6fabfd50ab13fe14e0706a826 100755 (executable)
--- a/history/index.html
+++ b/history/index.html
@@ -2,7 +2,7 @@
   <title>Samba Release History</title>
 <!--#include virtual="header_history.html" -->
 
-<p>Previous release announcements are archived here for historical purposes.</p>
+<p class="intro">Previous release announcements are archived here for historical purposes.</p>
 
 <div class="latest"> 
   <ul>

diff --git a/images/stripes.png b/images/stripes.png
new file mode 100644 (file)
index 0000000..5c5941f
Binary files /dev/null and b/images/stripes.png differ

diff --git a/style/columns.css b/style/columns.css
index 26870d22bd1b87c7ea7369ee661f5954c7fc0a85..5c8e981145fe28306a31be7f604d418f5398945e 100644 (file)
--- a/style/columns.css
+++ b/style/columns.css
@@ -13,10 +13,10 @@
 /* Right-side column 
 ***********************************************************/
 #links {
-       float:right;
-       margin:115px 1em 0 0;  
+       float:left;
+       margin:115px 0 0 81%;  
        padding:0;
-    width:173px;
+    width:18%;
 }
 * html #links {        /* Applies to IE5/6 only */
        margin:115px .5% 0 0;
@@ -62,15 +62,16 @@
 /* Middle content column
 ***********************************************************/
 #content {
-       margin:0 22% 0 175px;
-       padding-top:130px;
+       position:absolute;
+       top:100px;
+       margin:0 20% 0 175px;
+       padding-top:30px;
        padding-left:35px;
        padding-bottom:50px;
        padding-right:15px;
        background-color:#FFF;
        border-left:1px solid #FFFF64;
        border-right:1px solid #FFFF64;
-       z-index:-1;
 }
 #content ul {
        list-style-type:none;

diff --git a/style/common.css b/style/common.css
index cbbcc8eb89aeb93b223d963ba3c31fabb19795d0..b3edadca821d51f0629dc88503c4125880bae77c 100644 (file)
--- a/style/common.css
+++ b/style/common.css
@@ -14,6 +14,7 @@
 /* Base elements
 ***********************************************************/
 body {
+       background:url(/samba/images/stripes.png) repeat-x 0 0;
        margin:0;
        padding:0;
        background-color:#E5E9F5;
@@ -32,6 +33,7 @@ img {
 }
 
 
+
 /* Headings
 ***********************************************************/
 h1 {
@@ -101,10 +103,10 @@ a:link:hover {
        position:absolute;
        top:0;
        left:0;
-       height:90px;
+       height:95px;
        width:100%;
        padding-top:4px;
-       background-color:#FFFF64;
+       z-index:1;
 }
 .srch {
        text-align:right;
@@ -113,16 +115,6 @@ a:link:hover {
 .srch form {
        display:inline;
 }
-.stripe {
-       position:absolute;
-       top:40px;
-       left:0;
-       height:55px;
-       width:100%;
-       background-color:#3878CD;
-       border-top:2px solid #575756;
-       border-bottom:2px solid #575756;
-}
 
 
 /* Slogan ("Opening windows to a wider world")
@@ -158,6 +150,7 @@ html>body .slogan {         /**** Opera needs its own rule *********/
        height:119px;
        padding:0;
        margin:0;
+       z-index:1;
 }
 .logo_hack a:hover {
        background:transparent;

diff --git a/style/history.css b/style/history.css
deleted file mode 100755 (executable)
index 8bdcd1e..0000000
--- a/style/history.css
+++ /dev/null
@@ -1,40 +0,0 @@
-               /* for left border links*/
-.notes {
-       position:absolute;
-       top:265px;
-       left:0;
-}
-.notes h6 {
-    text-align:left;
-    margin:10px 5px;
-}
-.notes ul {
-       list-style-type:none;
-       text-align:left;
-       padding-left:12px;
-       margin:0 0 0 10px;
-       font-size:10px;
-}
-               /* Styles for main content (center column) */
-#content {
-       margin:0 1% 0 175px;
-       padding-top:150px;
-       padding-left:35px;
-       padding-bottom:50px;
-       padding-right:15px;
-       background-color:#FFF;
-       border-left:1px solid #FFFF64;
-       border-right:1px solid #FFFF64;
-}
-.headline {
-       margin-left:40px;
-       font-style:italic;
-}
-#content h4 {
-       font-weight:bold;
-       margin:50px 10px 15px 0;
-}
-.latest ul {
-       list-style-type:none;
-       margin-left:40px;
-}

diff --git a/style/support.css b/style/support.css
deleted file mode 100755 (executable)
index 64ee006..0000000
--- a/style/support.css
+++ /dev/null
@@ -1,40 +0,0 @@
-               /* Styles for main content (center column) */
-#content {
-       margin:0 1% 0 175px;
-       padding-top:150px;
-       padding-left:35px;
-       padding-bottom:50px;
-       padding-right:15px;
-       background-color:#FFF;
-       border-left:1px solid #FFFF64;
-       border-right:1px solid #FFFF64;
-}
-.disclaimer {
-       margin:30px;
-       font-style:italic;
-}
-.info {
-       margin:75px 15px 15px 15px;
-       padding:10px;
-       font-size:small;
-       border-top:1px dotted #3878CD;
-       border-bottom:1px dotted #3878CD;
-}
-                       /*style for countries list */
-#countries {
-       float:left;
-       margin:240px 0 0 5px;
-       padding:0;
-       background-color:#E5E9F5;
-}
-#countries ul {
-       list-style-type:none;
-}
-#countries a {
-       font-size:small;
-}
-#countries h4 {
-       margin-top:10px;
-       margin-left:1px;
-       font-size:small;
-}

diff --git a/style/wide.css b/style/wide.css
index 8ef87ba5ef57859f581736ca35e7844e8e095c4c..95e2764c97ae34bed8ebe95a7ceba99ff51cc781 100644 (file)
--- a/style/wide.css
+++ b/style/wide.css
@@ -1,15 +1,41 @@
-/* Styles for main content (center column) */
+/*
+       wide.css
+       by Deryck Hodge <deryck@samba.org>
+
+       An alternate two-column "wide" style for those pages
+       with lots and lots of text (download, devel, etc.)
+
+       You may freely use and modify the styles here, but if you 
+       intend to recreate the samba.org look exactly, please ask
+       permission first.
+*/
+
+
+/* Primary content section 
+***********************************************************/
 #content {
+       position:absolute;
+       top:100px;
        margin:0 1% 0 175px;
-       padding-top:130px;
+       padding-top:30px;
        padding-left:35px;
        padding-bottom:50px;
        padding-right:15px;
        background-color:#FFF;
        border-left:1px solid #FFFF64;
        border-right:1px solid #FFFF64;
-       z-index:-1;
 }
+#content h4 {
+       font-weight:bold;
+       margin:50px 10px 15px 0;
+}
+pre {
+    margin:15px 0 30px 5px;
+}    
+
+
+/* Team section
+***********************************************************/
 .teampic {
        text-align:center;
 }
@@ -17,7 +43,67 @@
        width:431px;
        height:300px;
 }
-    /* Set a global pre style for pages using wide.css */
-pre {
-    margin:15px 0 30px 20px;
-}    
+
+
+/* Release history/Release notes
+***********************************************************/
+.notes {
+       position:absolute;
+       top:265px;
+       left:0;
+}
+.notes h6 {
+    text-align:left;
+    margin:10px 5px;
+}
+.notes ul {
+       list-style-type:none;
+       text-align:left;
+       padding-left:12px;
+       margin:0 0 0 10px;
+       font-size:10px;
+}
+.intro {
+       margin-top:30px;
+}
+.headline {
+       margin-left:20px;
+       font-style:italic;
+}
+.latest ul {
+       list-style-type:none;
+       margin-left:40px;
+}
+
+
+/* Support providers pages
+***********************************************************/
+#countries {
+       float:left;
+       margin:240px 0 0 5px;
+       padding:0;
+       background-color:#E5E9F5;
+}
+#countries ul {
+       list-style-type:none;
+}
+#countries a {
+       font-size:small;
+}
+#countries h4 {
+       margin-top:10px;
+       margin-left:1px;
+       font-size:small;
+}
+.disclaimer {
+       margin:30px;
+       font-style:italic;
+}
+.info {
+       margin:75px 15px 15px 15px;
+       padding:10px;
+       font-size:small;
+       border-top:1px dotted #3878CD;
+       border-bottom:1px dotted #3878CD;
+}
+

diff --git a/support/header_support.html b/support/header_support.html
index a032fb03bf28d6e4ed7215fe51b92eb473cfd97a..4f21ec9d51c2f6be8ed985d27442f3607568c418 100755 (executable)
--- a/support/header_support.html
+++ b/support/header_support.html
@@ -1,6 +1,6 @@
 
 <link rel="stylesheet" href="/samba/style/common.css" type="text/css" media="all" />
-<link rel="stylesheet" href="/samba/style/support.css" type="text/css" media="all" />
+<link rel="stylesheet" href="/samba/style/wide.css" type="text/css" media="all" />
 <link rel="shortcut icon" href="/samba/images/favicon.ico" />
 
 <!--[if gte IE 5.5]>