[Xfce4-commits] <www:nick/gettext> More style changes.
Nick Schermer
noreply at xfce.org
Mon Nov 29 20:26:01 CET 2010
Updating branch refs/heads/nick/gettext
to 186fc35d6ac14436048c88a01706e056e729eb7f (commit)
from 2626e46328de210ff4ffd68b4ae291b972c4f7fb (commit)
commit 186fc35d6ac14436048c88a01706e056e729eb7f
Author: Nick Schermer <nick at xfce.org>
Date: Mon Nov 29 20:24:19 2010 +0100
More style changes.
pages/download/index.php | 2 +-
pages/header.php | 40 ++++++++++++++-----
style/base.css | 93 ++++++++++++++++++++++++++++++----------------
style/img/external.png | Bin 0 -> 363 bytes
style/img/mail.png | Bin 0 -> 319 bytes
5 files changed, 91 insertions(+), 44 deletions(-)
diff --git a/pages/download/index.php b/pages/download/index.php
index ce6e5a1..21ea3d7 100644
--- a/pages/download/index.php
+++ b/pages/download/index.php
@@ -22,7 +22,7 @@ function print_servers($path)
<h1><?php echo $head['title'] ?></h1>
-<h2 id="stable"><?php printf (R_('Stable release %s'), $stable_version) ?></h1>
+<h2 id="stable"><?php printf (R_('Stable release %s'), $stable_version) ?></h2>
<p>
<?php E_('Most distributions ship with Xfce. But if you want a newer version or you want to build Xfce from scratch, you can find the packages below. You can also take a look at a list of Xfce-oriented distributions <a href="/download/distros">here</a>.') ?>
</p>
diff --git a/pages/header.php b/pages/header.php
index 770e77a..935b8fb 100644
--- a/pages/header.php
+++ b/pages/header.php
@@ -31,6 +31,7 @@ else
<div id="page-header">
<div>
<h1>Xfce</h1>
+ <h5 class="hidden">Sub domains</h5>
<ul>
<li><a href="http://www.xfce.org" title="Go to the homepage" class="active">Home</a></li>
<li><a href="http://docs.xfce.org" title="Official documentation">Docs</a></li>
@@ -47,15 +48,33 @@ else
<div id="page-wrap">
<div id="menu-main">
<div>
- <ul>
- <li><a href="/">Home</a></li>
- <li><a href="/about/">About</a></li>
- <li><a href="/download/">Download</a></li>
- <li><a href="/community/">Community</a></li>
- <li><a href="/projects/">Projects</a></li>
- <li><a href="/development/">Development</a></li>
- </ul>
+ <h5 class="hidden"><?php E_('Categories') ?></h5>
+ <ul>
+ <li><a href="/"><?php E_('Home') ?></a></li>
+ <li><a href="/about/"><?php E_('About') ?></a></li>
+ <li><a href="/download/"><?php E_('Download') ?></a></li>
+ <li><a href="/community/"><?php E_('Community') ?></a></li>
+ <li><a href="/projects/"><?php E_('Projects') ?></a></li>
+ <li><a href="/development/"><?php E_('Development') ?></a></li>
+ </ul>
</div>
+ <form id="languageform" action="" method="get">
+ <select name="lang" onchange="document.getElementById('languageform').submit(); return true;" title="<?php E_('Change language') ?>">
+<?php
+ foreach ($languages as $code => $name)
+ {
+ /* select active language */
+ if ($code == $lang || (empty ($lang) && $code == 'en'))
+ $selected = ' selected="selected"';
+ else
+ $selected = '';
+
+ echo "\t\t\t\t<option value=\"$code\"$selected>$name</option>\n";
+ }
+?>
+ </select>
+ <button type="submit" class="hidden"><?php E_('Change language') ?></button>
+ </form>
<div class="clearboth"></div>
</div>
@@ -64,9 +83,8 @@ else
{
?>
<div id="menu-sub">
- <div>
- <?php include ($toc['filename']) ?>
- </div>
+ <h5><?php E_('Category Pages') ?></h5>
+ <?php include ($toc['filename']) ?>
</div>
<?php
}
diff --git a/style/base.css b/style/base.css
index 3f6a63b..fe1ea83 100644
--- a/style/base.css
+++ b/style/base.css
@@ -2,9 +2,11 @@
body {
margin: 0;
padding: 0;
+ line-height: 1.7em;
+ font-family: Arial;
+ font-size: 90%;
- /* background: -moz-Field;
- color: -moz-FieldText; */
+ /* background: -moz-Field; color: -moz-FieldText; */
}
#page-header {
@@ -15,8 +17,11 @@ body {
color: #fff;
line-height: 50px;
margin: 0 0 0 15px;
+ padding: 0;
float: left;
- text-shadow: rgba(255, 255, 255, 0.5) 0px 1px 3px;
+ border: 0;
+ font-size: 200%;
+ text-shadow: #69f 0px 1px 3px;
}
#page-header ul {
float: right ;
@@ -38,23 +43,25 @@ body {
padding: 0 15px 0 15px;
}
#page-header ul li a:hover {
- color: #0C6AD4;
+ color: #69f;
}
#page-header .active {
- color: #0C6AD4;
+ color: #69f;
}
#page-wrap {
margin: auto;
padding: 1em 0 1em 0;
+ margin: 0 1em 0 1em;
text-align: left;
+
min-width: 650px;
max-width: 1280px;
}
#page-contents {
- margin-right: 180px;
+ margin-right: 205px;
}
#menu-main ul {
@@ -64,7 +71,7 @@ body {
}
#menu-main ul li {
- border-left: 1px solid #e0e0e0;
+ border-left: 1px solid #ccc;
float: left;
padding: 0 1em 0 1em;
margin: 0;
@@ -80,7 +87,10 @@ body {
}
#menu-main ul li a:hover {
- color: #0C6AD4;
+ color: #06c;
+}
+#menu-main select {
+ float: right;
}
#menu-sub {
@@ -88,21 +98,24 @@ body {
width: 170px;
margin-top: 2em;
background: #eee;
- border: 1px solid #e0e0e0;
- padding: 0.6em 0;
+ border: 1px solid #ccc;
+ padding: 10px;
}
#menu-sub ul {
-
- line-height: 1.6em;
list-style: none;
margin: 0;
- padding: 0 0.8em;
+ padding: 0 0;
}
#menu-sub ul li {
background: transparent url('img/bullit.gif') 0 0.6em no-repeat;
padding-left: 10px;
}
-
+#menu-sub ul li li {
+ background: none;
+}
+#menu-sub a {
+ display: block;
+}
table th {
text-align: left;
@@ -111,34 +124,50 @@ table th {
table tr:nth-child(even) {
background: #ccc;
}
+table td {
+ padding: 0.2em;
+}
-#page-contents h1, #page-contents h2, #page-contents h3, #page-contents h4 {
- color: #505050;
- border-bottom: 1px solid #e0e0e0;
+h1, h2, h3, h4, h5 {
+ color: #666;
+ border-bottom: 1px solid #ccc;
font-weight: normal;
margin: 0 0 1em 0;
padding: 0.5em 0 0 0;
}
+h3, h4, h5 {
+ border-bottom: none;
+ margin: 0 0 0.2em 0;
+ padding: 0.2em 0 0 0;
+}
+h1 { font-size: 180%; }
+h2 { font-size: 160%; }
+h3 { font-size: 140%; }
+h4 { font-size: 120%; }
+h5 { font-size: 100%; }
-#page-contents h1
-{
- font-size: 180%;
-}
-#page-contents h2
-{
- font-size: 170%;
+ul {
+ list-style-type: square;
+ color: #666;
}
-#page-contents h3
-{
- border-bottom: none;
- font-size: 160%;
+
+a {
+ color: #06c;
+ text-decoration: none;
}
-#page-contents h4
-{
- border-bottom: none;
- font-size: 150%;
+
+a:hover {
+ color: #f00;
}
.clearboth {
clear: both;
}
+.external {
+ background: url('img/external.png') no-repeat 100% 50%;
+ padding: 0 15px 0 0;
+ margin: 0 5px 0 0;
+}
+.hidden {
+ display: none;
+}
diff --git a/style/img/external.png b/style/img/external.png
new file mode 100644
index 0000000..04248ed
Binary files /dev/null and b/style/img/external.png differ
diff --git a/style/img/mail.png b/style/img/mail.png
new file mode 100644
index 0000000..4bf576d
Binary files /dev/null and b/style/img/mail.png differ
More information about the Xfce4-commits
mailing list