summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-08-05 21:07:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:31:22 -0500
commite9737799b4a9742d32a20735ffa2034bcf6ed1a1 (patch)
tree82df09460159b2c85a23faba723b0feedcb5aeb2
parentdab115f69fc8c2a99bbb9c060c85e5a0b86f21ac (diff)
downloadsamba-e9737799b4a9742d32a20735ffa2034bcf6ed1a1.tar.gz
samba-e9737799b4a9742d32a20735ffa2034bcf6ed1a1.tar.bz2
samba-e9737799b4a9742d32a20735ffa2034bcf6ed1a1.zip
r9139: cleanup the layout a bit
(This used to be commit c21fe071e795888f8e4ed0f535dc1bbc8d0731a5)
-rw-r--r--swat/esptest/qooxdoo.esp2
-rw-r--r--swat/menu.js4
-rw-r--r--swat/scripting/header_columns.esp2
-rw-r--r--swat/style/columns.css54
-rw-r--r--swat/style/common.css47
5 files changed, 50 insertions, 59 deletions
diff --git a/swat/esptest/qooxdoo.esp b/swat/esptest/qooxdoo.esp
index 5ab39d807d..063fb7bd93 100644
--- a/swat/esptest/qooxdoo.esp
+++ b/swat/esptest/qooxdoo.esp
@@ -23,7 +23,7 @@
setWidth("40%");
setMinHeight(400);
setBottom(48);
- setMinWidth(700);
+ setMinWidth(500);
};
var gl = new QxGridLayout("auto,auto,auto,auto,auto", "100%");
diff --git a/swat/menu.js b/swat/menu.js
index 38052091d6..7e8281349f 100644
--- a/swat/menu.js
+++ b/swat/menu.js
@@ -56,6 +56,6 @@ swat_menus.docs = simple_menu(
"XHTML Spec", "http://www.w3.org/TR/xhtml1/",
"JavaScript Spec", "http://www.ecma-international.org/publications/files/ecma-st/ECMA-262.pdf",
"CSS Specs", "http://www.w3.org/Style/CSS/#specs",
- "CSS1/2 Reference", "http://www.w3schools.com/css/css_reference.asp");
-
+ "CSS1/2 Reference", "http://www.w3schools.com/css/css_reference.asp",
+ "qooxdoo info", "http://qooxdoo.sourceforge.net/");
diff --git a/swat/scripting/header_columns.esp b/swat/scripting/header_columns.esp
index 062e1ee483..2fd57c400c 100644
--- a/swat/scripting/header_columns.esp
+++ b/swat/scripting/header_columns.esp
@@ -77,9 +77,7 @@ filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/images/logo.png'
</div>
<div id="links">
- <div class="related">
<% swat_menus.docs.display(); %>
- </div>
</div>
diff --git a/swat/style/columns.css b/swat/style/columns.css
index c3be8cbf65..e78da9b3d7 100644
--- a/swat/style/columns.css
+++ b/swat/style/columns.css
@@ -10,60 +10,6 @@
*/
-/* Right-side column
-***********************************************************/
-#links {
- float:left;
- margin:115px 0 0 81%;
- padding:0;
- width:18%;
-}
-* html #links {
- position:absolute;
- top:115px;
- left:82%;
- float:none;
- width:17%;
- margin:0;
-}
-#links h4 {
- margin-top:10px;
- margin-left:1.5px;
- font-size:small;
-}
-#links ul {
- list-style-type:none;
- padding:0;
- padding-top:5px;
- margin-left:20px;
-}
-#links a {
- font-size:small;
-}
-#links p {
- margin-top:25px;
- margin-left:20px;
-}
-.releases {
- padding:2px;
- margin-top:35px;
- border:1px solid #CCC;
- background-color:#E5E9F5;
-}
-.beyond, .related, .intl {
- padding:2px;
- margin-top:25px;
- border:1px solid #CCC;
- background-color:#E5E9F5;
-}
-.beyond li {
- margin-bottom:10px;
-}
-.contacts li{
- list-style-type:disc;
-}
-
-
/* Middle content column
***********************************************************/
#content {
diff --git a/swat/style/common.css b/swat/style/common.css
index 6b4fa65a4c..545ffe930c 100644
--- a/swat/style/common.css
+++ b/swat/style/common.css
@@ -206,6 +206,53 @@ html>body .slogan { /**** Opera needs its own rule *********/
}
+/* links menu
+***********************************************************/
+#links {
+ position:absolute;
+ top:152px;
+ left:81%;
+ width:180px;
+ padding:0;
+ width:18%;
+ background-color:#F5F8FF;
+ border:2px groove #3878CD;
+ padding:0;
+ padding-bottom:5px;
+ margin:0;
+ z-index:1;
+}
+#links ul {
+ list-style-type:none;
+ text-align:center;
+ padding:0;
+ margin:0;
+}
+#links a,
+#links a:link,
+#links a:visited {
+ display:block;
+ height:20px;
+ font-size:small;
+ color:#2B5C9F;
+}
+#links a:hover {
+ color:#FFF;
+ background-color:#3878CD;
+}
+#links a:active {
+ color:#FFFF64;
+ background-color:#3878CD;
+ font-size:14px;
+}
+#links img {
+ padding:0;
+ margin:0;
+ width:180px;
+ height:30px;
+}
+
+
/* Text and alignment formats
***********************************************************/
.punch {