[Xfce4-commits] <www:nick/gettext> Push some style changes.
Nick Schermer
noreply at xfce.org
Sun Nov 28 20:38:01 CET 2010
Updating branch refs/heads/nick/gettext
to 2626e46328de210ff4ffd68b4ae291b972c4f7fb (commit)
from ef08f02cd0372d9e25d9b8c5976bf5d35f53bb19 (commit)
commit 2626e46328de210ff4ffd68b4ae291b972c4f7fb
Author: Nick Schermer <nick at xfce.org>
Date: Sun Nov 28 20:35:57 2010 +0100
Push some style changes.
index.php | 10 ++--
pages/footer.php | 4 +-
pages/frontpage.php | 3 -
pages/header.php | 25 +++++++++--
style/base.css | 116 ++++++++++++++++++++++++++++++++++++++++++++------
style/img/bullit.gif | Bin 0 -> 49 bytes
6 files changed, 130 insertions(+), 28 deletions(-)
diff --git a/index.php b/index.php
index 55f875a..f109eb2 100644
--- a/index.php
+++ b/index.php
@@ -24,13 +24,13 @@ ob_start ();
include ($content_file);
$contents = ob_get_clean ();
-/* load the page header */
-include ('pages/header.php');
-
/* load the category navigation if there is one */
$navigation_file = dirname ($content_file) . '/nav.php';
if (is_file ($navigation_file))
- include ($navigation_file);
+ $toc['filename'] = $navigation_file;
+
+/* load the page header */
+include ('pages/header.php');
/* write the contents */
echo $contents;
@@ -39,6 +39,6 @@ echo $contents;
include ('pages/footer.php');
$timer_end = microtime_float ();
-echo "Execution time: ". round ($timer_end - $timer_start, 4) ." second";
+echo "<!-- Execution time: ". round ($timer_end - $timer_start, 4) ." second -->";
?>
diff --git a/pages/footer.php b/pages/footer.php
index 88bf8f3..c6be8dd 100644
--- a/pages/footer.php
+++ b/pages/footer.php
@@ -1,5 +1,5 @@
-
-</div> <!-- pagewrap -->
+ </div> <!-- page-contents -->
+</div> <!-- page-wrap -->
</body>
</html>
diff --git a/pages/frontpage.php b/pages/frontpage.php
index 5221e72..7b79028 100644
--- a/pages/frontpage.php
+++ b/pages/frontpage.php
@@ -1,8 +1,5 @@
<?php
- $head['title'] = R_('Frontpage');
$head['description'] = 'Xfce Desktop Environment';
$head['keywords'] = 'desktop environment, window manager, desktop, speed, lightweight, gtk+, open source, xforms common environment';
?>
-<h1><?php echo $head['title'] ?></h1>
-
diff --git a/pages/header.php b/pages/header.php
index 38a3763..770e77a 100644
--- a/pages/header.php
+++ b/pages/header.php
@@ -28,7 +28,7 @@ else
<body id="top">
-<div id="xfce-header">
+<div id="page-header">
<div>
<h1>Xfce</h1>
<ul>
@@ -41,11 +41,12 @@ else
<li><a href="http://translations.xfce.org" title="Help translating the Xfce project">Translate</a></li>
</ul>
</div>
- <div id="xfce-header-clear"></div>
+ <div class="clearboth"></div>
</div>
-<div id="pagewrap">
- <div>
+<div id="page-wrap">
+ <div id="menu-main">
+ <div>
<ul>
<li><a href="/">Home</a></li>
<li><a href="/about/">About</a></li>
@@ -54,4 +55,20 @@ else
<li><a href="/projects/">Projects</a></li>
<li><a href="/development/">Development</a></li>
</ul>
+ </div>
+ <div class="clearboth"></div>
</div>
+
+<?php
+ if (isset($toc['filename']))
+ {
+?>
+ <div id="menu-sub">
+ <div>
+ <?php include ($toc['filename']) ?>
+ </div>
+ </div>
+<?php
+ }
+?>
+ <div id="page-contents">
diff --git a/style/base.css b/style/base.css
index 55fa339..3f6a63b 100644
--- a/style/base.css
+++ b/style/base.css
@@ -7,43 +7,100 @@ body {
color: -moz-FieldText; */
}
-#xfce-header {
- border-bottom: 5px #09c solid;
- background: #000;
+#page-header {
+ /*border-bottom: 5px #0C6AD4 solid;*/
+ background: #333;
}
-#xfce-header h1 {
+#page-header h1 {
color: #fff;
line-height: 50px;
margin: 0 0 0 15px;
float: left;
+ text-shadow: rgba(255, 255, 255, 0.5) 0px 1px 3px;
}
-#xfce-header ul {
+#page-header ul {
float: right ;
list-style: none;
margin: 0;
padding: 0 15px 0 0;
- background: #000;
+ background: #333;
}
-#xfce-header ul li {
+#page-header ul li {
float: left;
font-weight: bold;
line-height: 50px;
}
-#xfce-header a {
+#page-header a {
color: #fff;
text-decoration: none;
display: block;
float: right;
padding: 0 15px 0 15px;
}
-#xfce-header ul li a:hover {
- color: #09c;
+#page-header ul li a:hover {
+ color: #0C6AD4;
}
-#xfce-header .active {
- color: #09c;
+#page-header .active {
+ color: #0C6AD4;
}
-#xfce-header-clear {
- clear: both;
+
+
+#page-wrap {
+ margin: auto;
+ padding: 1em 0 1em 0;
+ text-align: left;
+ min-width: 650px;
+ max-width: 1280px;
+}
+
+#page-contents {
+ margin-right: 180px;
+}
+
+#menu-main ul {
+ list-style: none;
+ margin: 0;
+ padding: 0;
+
+}
+#menu-main ul li {
+ border-left: 1px solid #e0e0e0;
+ float: left;
+ padding: 0 1em 0 1em;
+ margin: 0;
+ font-weight: bold;
+}
+#menu-main ul li:first-child {
+ border-left: 0;
+ padding-left: 0;
+}
+#menu-main ul li a {
+ color: #666;
+ text-decoration: none;
+
+}
+#menu-main ul li a:hover {
+ color: #0C6AD4;
+}
+
+#menu-sub {
+ float: right;
+ width: 170px;
+ margin-top: 2em;
+ background: #eee;
+ border: 1px solid #e0e0e0;
+ padding: 0.6em 0;
+}
+#menu-sub ul {
+
+ line-height: 1.6em;
+ list-style: none;
+ margin: 0;
+ padding: 0 0.8em;
+}
+#menu-sub ul li {
+ background: transparent url('img/bullit.gif') 0 0.6em no-repeat;
+ padding-left: 10px;
}
@@ -54,3 +111,34 @@ table th {
table tr:nth-child(even) {
background: #ccc;
}
+
+#page-contents h1, #page-contents h2, #page-contents h3, #page-contents h4 {
+ color: #505050;
+ border-bottom: 1px solid #e0e0e0;
+ font-weight: normal;
+ margin: 0 0 1em 0;
+ padding: 0.5em 0 0 0;
+}
+
+#page-contents h1
+{
+ font-size: 180%;
+}
+#page-contents h2
+{
+ font-size: 170%;
+}
+#page-contents h3
+{
+ border-bottom: none;
+ font-size: 160%;
+}
+#page-contents h4
+{
+ border-bottom: none;
+ font-size: 150%;
+}
+
+.clearboth {
+ clear: both;
+}
diff --git a/style/img/bullit.gif b/style/img/bullit.gif
new file mode 100644
index 0000000..27c6a7f
Binary files /dev/null and b/style/img/bullit.gif differ
More information about the Xfce4-commits
mailing list