[Xfce4-commits] <www:master> Rework style a bit.
Nick Schermer
noreply at xfce.org
Fri Feb 24 17:20:01 CET 2012
Updating branch refs/heads/master
to 1a708771db20735be3484e89fdef9c42b1890b5b (commit)
from 46c3f9febbc80f5c40f0453c9d08ec95bd56ba85 (commit)
commit 1a708771db20735be3484e89fdef9c42b1890b5b
Author: Nick Schermer <nick at xfce.org>
Date: Fri Feb 24 17:17:52 2012 +0100
Rework style a bit.
pages/download/building.php | 264 -------------------------------------------
pages/download/nav.php | 2 +-
pages/getinvolved/index.php | 2 +-
style/base.css | 23 +++-
style/header.css | 36 +++---
style/img/logointro.png | Bin 7343 -> 7076 bytes
style/img/logosmall.png | Bin 7035 -> 4288 bytes
7 files changed, 38 insertions(+), 289 deletions(-)
diff --git a/pages/download/building.php b/pages/download/building.php
deleted file mode 100644
index 36fd873..0000000
--- a/pages/download/building.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-
-$head['title'] = R_('Building');
-
-$toc['anchors'] = array (
- 'version' => R_('Version'),
- 'source' => R_('Source'),
- 'dependencies' => R_('Dependencies'),
- 'building' => R_('Building'),
- 'help' => R_('Help'));
-?>
-
-
-<h1><?php echo $head['title'] ?></h1>
-
-<p>
- <?php E_('To compile a complete Xfce desktop from source requires some information about the dependency chain and the various configure options available in each module. This page will describe this in detail, so you can compile your own Xfce desktop; both system wide as well as in your $HOME directory.') ?>
-</p>
-
-<h2 id="version"><?php E_('Version') ?></h2>
-<p>
- <?php E_('First you need to decide which version of Xfce you want to compile. Version numbers are mostly build like this: 1.2.3 => major.minor.micro. If the minor version is an even number, it is a stable release, odd number are development snapshots. The micro number increases each release. Also keep the major.minor version the same for the core components (some packages don\'t follow those numbers) else you will most likely get dependency version problems during compiling.') ?>
-</p>
-
-<p>
- <?php E_('The latest releases available can be found on the <a href="/download">download page</a>. You can also build from the source repositories if you have enough experience, more about that below.') ?>
-</p>
-
-<h2 id="source"><?php E_('Source') ?></h2>
-<p>
- <?php E_('If you\'ve decided which version you want to compile, there are a couple of ways to download the source code. You can choose to build official released packages or clone the source repositories. Choosing the released packages is recommended here; the source repositories could be broken and are not suitable for production environments, but on the other hand always contains the latest features, bug fixes and translations.') ?>
-</p>
-
-<p>
- <?php E_('If your not sure what to choose: easiest is to start with the latest stable fat-tarball of a collection release.') ?>
-</p>
-
-<h3><?php E_('Released packages') ?></h3>
-<p>
- <?php E_('Xfce packages have two types of releases. Click the links to open the the download locations.') ?>
-</p>
-
-<ul>
- <li><a href="http://archive.xfce.org/xfce/" class="external"><?php E_('Collection releases of the core modules') ?></a>
- <p>
- <?php E_('From time to time a new collection release if Xfce is made. A collection release consists of a number of individual tarballs and a fat-tarball that contains all the individual tarballs.') ?>
- </p>
-
- <p>
- <?php E_('The collection releases always contain the correct versions to build the other packages in the release. If you want the latest version of each package, you can start with a collection release and then look for individual bug fix releases, explained in the item below.') ?>
- </p>
- </li>
-
- <li><a href="http://archive.xfce.org/src/xfce/" class="external"><?php E_('Individual releases') ?></a>
- <p>
- <?php E_('Each package in Xfce is allowed to make development and stable releases at any time, see the <a href="/about/releasemodel">release model</a> documentation for more information.') ?>
- </p>
- </li>
-</ul>
-
-<h3><?php E_('From the code repository') ?></h3>
-<p>
- <?php E_('For the latest code you need to make local copies of the GIT repositories, this is the place where developers submit their code. If you decide to use GIT, try to use the same branch for all the packages to avoid dependency version problems.') ?>
-</p>
-
-<p>
- <?php E_('You first need to make clones of each GIT repository, like the command below, where <em>$category</em> is for example <em>xfce</em> and <em>$module</em> <em>xfce4-panel</em>. If you click on a module in the online <a href="http://git.xfce.org/xfce" class="external">repository list</a> the clone uri is shown at the bottom of the page.') ?>
-</p>
-
-<p>
- <code>git clone git://git.xfce.org/$category/$module</code>
-</p>
-
-<p>
- <?php E_('After the repository is cloned you need to choose which branch you want to compile. By default the <em>master</em> branch is selected, but there are also branches for stable releases like <em>xfce-4.6</em>. The stable branches contain the latest bug fixes without any major new feature, the <em>master</em> branch is the development version for the next release of Xfce. Both should not be used in a production environment.') ?>
-</p>
-
-<p>
- <?php E_('To switch to another branch (<em>git branch -a</em> lists all available branches) run the following command inside the cloned directory to switch to, for example, the <em>xfce-4.6</em> branch:') ?>
-</p>
-
-<p>
- <code>git checkout --track origin/xfce-4.6</code>
-</p>
-
-<p>
- <?php E_('After this you can update your local copy of the repository with <em>git pull</em> and switch to another branch with <em>git checkout $branchname</em>. Read the <a href="http://git-scm.com/documentation" class="external">GIT manuals</a> for more information about using GIT.') ?>
-</p>
-
-<h2 id="dependencies"><?php E_('Dependencies')?></h2>
-
-<h3><?php E_('Build requirements')?></h3>
-<p>
- <?php E_('Before you can start compiling, you need a couple of packages that are required to compile Xfce. Use your distributions package manager to install those packages. Additional packages are required too for some modules, but we\'ll get to that later.') ?>
-</p>
-
-<ul>
- <li><a href="http://en.wikipedia.org/wiki/GNU_toolchain" class="external"><?php E_('A working GNU toolchain')?></a></li>
- <li><?php E_('Gtk+ and Glib headers, in some distributions called the <em>-devel</em> packages')?>
- <ul>
- <li><?php E_('Xfce 4.8 requires Gtk+ 2.14 and Glib 2.20')?></li>
- <li><?php E_('Xfce 4.6 requires Gtk+ 2.10 and Glib 2.12')?></li>
- </ul>
- </li>
- <li>pkgconfig</li>
- <li><?php E_('Coffee') ?></li>
-</ul>
-
-
-<h3><?php E_('Xfce\'s dependency chain') ?></h3>
-<p>
- <?php E_('The Xfce packages need to be built in a specific order. If you don\'t follow this, compile options might not be available or the configure stage will abort because of missing dependencies.') ?>
-</p>
-
-<ul>
- <li>xfce4-dev-tools (<?php E_('only required if you build from GIT') ?>)</li>
- <li>libxfce4util</li>
- <li>xfconf</li>
- <li>libxfce4ui (<?php E_('new in 4.8') ?>), libxfcegui4 (<?php E_('deprecated since 4.8') ?>), libxfce4menu (<?php E_('deprecated since 4.8') ?>), garcon (<?php E_('new in 4.8') ?>) & exo</li>
- <li>xfce4-panel</li>
- <li>thunar</li>
- <li>xfce4-settings, xfce4-session, xfdesktop, xfwm4, xfce-utils, xfce4-appfinder, ...</li>
-</ul>
-
-
-<h3><?php E_('Package specific dependencies') ?></h3>
-<p>
- <?php E_('Some core packages in Xfce have additional or optional dependencies, all are listed in the table below for the latest stable version. We only show the top package as dependency (so xfce4-panel also requires gtk+, but libxfce4ui already depends on that). Note that some of the package names may vary between distributions.') ?>
-</p>
-
-<table>
- <tr>
- <th>Package</th>
- <th>Dependency(-ies)</th>
- <th>Optional Dependency(-ies)</th>
- </tr>
- <tr>
- <td>xfce4-dev-tools</td>
- <td>autoconf, automake, intltool, pkgconfig</td>
- <td> </td>
- </tr>
- <tr>
- <td>libxfce4util</td>
- <td>glib</td>
- <td> </td>
- </tr>
- <tr>
- <td>xfconf</td>
- <td>libxfce4util, dbus-glib</td>
- <td> </td>
- </tr>
- <tr>
- <td>libxfce4ui</td>
- <td>libxfce4util, gtk+, xfconf</td>
- <td>libstartup-notification, libgladeui</td>
- </tr>
- <tr>
- <td>libxfcegui4</td>
- <td>libxfce4util, gtk+, libglade</td>
- <td>libstartup-notification, libgladeui, xfconf</td>
- </tr>
- <tr>
- <td>exo</td>
- <td>libxfce4util, gtk+, perl-uri</td>
- <td> </td>
- </tr>
- <tr>
- <td>xfce4-panel</td>
- <td>libxfce4ui, exo, garcon, libwnck</td>
- <td>libstartup-notification</td>
- </tr>
- <tr>
- <td>thunar</td>
- <td>libxfce4ui, exo, libpng, gtk+, glib</td>
- <td>libexif, dbus-glib, gconf, libstartup-notification, freetype, libjpeg, libxfce4panel, xfconf</td>
- </tr>
- <tr>
- <td>xfce4-settings</td>
- <td>libxfce4ui, exo, xfconf, dbus-glib, libXi, libXrandr</td>
- <td>libXcursor, libnotify</td>
- </tr>
- <tr>
- <td>xfce4-session</td>
- <td>libxfce4ui, perl-xml-parser, libwnck, dbus-glib</td>
- <td>gnome-keyring, gconf</td>
- </tr>
- <tr>
- <td>xfwm4</td>
- <td>libxfce4util, libxfce4ui, libxfconf, dbus-glib, libwnck</td>
- <td>libstartup-notification</td>
- </tr>
- <tr>
- <td>xfdesktop</td>
- <td>libxfce4ui, xfconf, libwnck</td>
- <td>exo, thunarx, garcon, libnotify</td>
- </tr>
- <tr>
- <td>xfce4-appfinder</td>
- <td>libxfce4ui, garcon</td>
- <td> </td>
- </tr>
- <tr>
- <td>xfce-utils</td>
- <td>libxfce4ui</td>
- <td>dbus-glib</td>
- </tr>
- <tr>
- <td nowrap="nowrap">gtk-xfce-engine-2</td>
- <td>gtk+</td>
- <td> </td>
- </tr>
-</table>
-
-<h2 id="building"><?php E_('Building') ?></h2>
-<h3><?php E_('Installation location and variables')?></h3>
-<p>
- <?php E_('Now it is finally time to start compiling the Xfce desktop. Last remaining thing is to choose an installation location. Possible examples are <em>/usr</em>, <em>/usr/local</em> and <em>/opt/xfce4</em> for a system-wide installation or <em>$HOME/local</em> if you want to install in your home directory (whatever you choose, never put spaces in the name). We will refer to this location as <em>${PREFIX}</em> in the code examples below!') ?>
-</p>
-
-<p>
- <?php E_('You need to make sure the <em>PKG_CONFIG_PATH</em> variable include the path to the *.pc files installed by the Xfce libraries:') ?>
-</p>
-
-<p>
- <code>export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:$PKG_CONFIG_PATH"</code>
-</p>
-
-<p>
- <?php E_('You can also set some optimization flags for the compiler. This may speed up Xfce, but can also make debugging impossible on some systems. Even worse, this can also cause gcc to generate broken code, so be carefull with this. The line below should be safe for most system.') ?>
-</p>
-
-<p>
- <code>export CFLAGS="-O2 -pipe"</code>
-</p>
-
-<h3><?php E_('Compiling and installing') ?></h3>
-<p>
- <?php E_('Next step is compiling the various packages following the dependency chain above. If you have downloaded the tarballs, you need to unpack them before going on. Inside each package directory you should run the following command:') ?>
-</p>
-
-<p>
- <code>./configure --prefix=${PREFIX} && make && make install</code>
-</p>
-
-<p>
- <?php E_('To build from GIT you need to install the xfce4-dev-tools package first, all other packages should be installed with this command:') ?>
-</p>
-
-<p>
- <code>./autogen.sh --enable-maintainer-mode --prefix=${PREFIX} && make && make install</code>
-</p>
-
-<p>
- <?php E_('Specific configure options for each package can be shown with <em>./configure --help</em>. Note that most packages benefit if you pass the configure option <em>--disable-debug</em>, however if you want to provide backtraces or test new code, no <em>CFLAGS</em>, no binary stripping and <em>--enable-debug=full</em> are recommended. Please note that <em>--disable-debug</em> is not available for xfce4-dev-tools. ') ?>
-</p>
-
-<h2 id="help"><?php E_('Help') ?></h2>
-<p>
- <?php E_('Hopefully everything went fine after reading this guide. If you still have problems or questions you can ask on the <a href="/community#mail">Xfce users mailing list</a>, the <a href="http://forum.xfce.org" class="external">forum</a> or ask distribution related questions on their forums and mailing lists.') ?>
-</p>
-
-<p>
- <?php E_('Have fun building Xfce!') ?>
-</p>
diff --git a/pages/download/nav.php b/pages/download/nav.php
index d299cca..dcf4ad3 100644
--- a/pages/download/nav.php
+++ b/pages/download/nav.php
@@ -4,11 +4,11 @@ include ('pages/versions.php');
$toc['menu'] = array (
'download' => R_('Download'),
- 'download/building' => R_('Building'),
'download/changelogs' => R_('Changelogs'),
'download/distros' => R_('Distributions'));
$toc['external'] = array (
+ 'http://docs.xfce.org/xfce/building' => R_('Building Xfce'),
'http://git.xfce.org/' => R_('Browse GIT repositories'),
'http://goodies.xfce.org' => R_('Xfce goodies'));
diff --git a/pages/getinvolved/index.php b/pages/getinvolved/index.php
index af07709..af7ae19 100644
--- a/pages/getinvolved/index.php
+++ b/pages/getinvolved/index.php
@@ -9,7 +9,7 @@
<?php E_('Possible tasks include testing, bug reporting; writing code, developing artwork, documentation or translations; or spreading the word and helping out with promotion and marketing both on line and at tradeshows and conferences.') ?>
</p>
-<h2><?php E_('Documentation') ?></h2>
+<h2><a href="http://docs.xfce.org/wiki/documentation"><?php E_('Documentation') ?></a></h2>
<p>
<?php E_('There\'s lots of people using and testing Xfce. By providing useful and up-to-date documentation, you will make a big impact on helping people understand how to make the most of the Xfce Desktop Environement.') ?>
</p>
diff --git a/style/base.css b/style/base.css
index ce58e26..b9f09af 100644
--- a/style/base.css
+++ b/style/base.css
@@ -1,21 +1,31 @@
body {
margin: 0;
padding: 0;
- font: 80% Verdana, Arial, Helvetica, sans-serif;
+ font-family: 80% 'Helvetica Neue Light', HelveticaNeue-Light, 'Helvetica Neue', Helvetica, Arial, sans-serif;
line-height: 1.7em;
+ background-color: #eee;
}
#page-wrap {
margin: auto;
- padding: 1em;
text-align: left;
+ margin-bottom: 3em;
min-width: 850px;
- max-width: 1100px;
+ max-width: 1000px;
}
.page_contents {
margin-right: 205px;
+ background: #fff;
+ padding: 1.2em;
+ box-shadow: 0 0 3px rgba(0, 0, 0, .25);
+ -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, .25);
+ -moz-box-shadow: 0 0 3px rgba(0, 0, 0, .25);
+}
+
+#menu-main {
+ padding: 6px 0;
}
#menu-main ul {
@@ -48,11 +58,13 @@ body {
#menu-sub {
float: right;
width: 170px;
- margin-top: 2em;
- background: #eee;
+ background: #fff;
border: 1px solid #ccc;
padding: 10px;
padding-top: 0;
+ box-shadow: 0 0 3px rgba(0, 0, 0, .25);
+ -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, .25);
+ -moz-box-shadow: 0 0 3px rgba(0, 0, 0, .25);
}
#menu-sub ul {
list-style: none;
@@ -85,7 +97,6 @@ body {
#footer {
color: #999;
font-size: small;
- margin-bottom: 5em;
}
#footer hr {
diff --git a/style/header.css b/style/header.css
index 5ef7d59..02945af 100644
--- a/style/header.css
+++ b/style/header.css
@@ -1,38 +1,40 @@
/* this file is used in various xfce subdomains! */
#xfce-header {
- /*border-bottom: 2px #69f solid;*/
- background: #333 url('img/logosmall.png') no-repeat 6px 55%;
- padding-left: 120px;
- min-height: 45px;
+ background: #333 url('img/logosmall.png') no-repeat 3px 50%;
+ padding-left: 75px;
box-shadow: 0 0 8px rgba(0, 0, 0, 0.5);
+
+ font-family: 'Helvetica Neue Light', HelveticaNeue-Light, 'Helvetica Neue', Helvetica, Arial, sans-serif;
+ font-size: 14px;
}
#xfce-header ul {
- float: right;
list-style: none;
- margin: 0;
- padding: 0 10px 0 0;
- background: #333;
+ float: right;
+ margin: 5px;
+ padding: 0;
+ line-height: 25px;
}
#xfce-header ul li {
float: left;
- font-weight: bold;
- margin: 0;
}
#xfce-header a {
- color: #fff;
+ color: #999;
text-decoration: none;
display: block;
- float: right;
- padding: 0 10px 0 10px;
- line-height: 4em;
- border: 0;
+ padding: 0 8px 0 8px;
+
+ transition: color 0.2s linear;
+ -moz-transition: color 0.2s linear;
+ -webkit-transition: color 0.2s linear;
+ -o-transition: color 0.2s linear;
}
#xfce-header ul li a:hover {
- color: #69f;
+ color: #fff;
+ text-decoration: underline;
}
#xfce-header .active {
- color: #69f;
+ color: #fff;
}
#xfce-header-clear {
clear: both;
diff --git a/style/img/logointro.png b/style/img/logointro.png
index 1b52153..a90e5b3 100644
Binary files a/style/img/logointro.png and b/style/img/logointro.png differ
diff --git a/style/img/logosmall.png b/style/img/logosmall.png
index 8b3a50c..5900c10 100644
Binary files a/style/img/logosmall.png and b/style/img/logosmall.png differ
More information about the Xfce4-commits
mailing list