aboutsummaryrefslogtreecommitdiffstats
path: root/root
diff options
context:
space:
mode:
authorRomain d'Alverny <rda@mageia.org>2012-06-28 18:10:04 +0000
committerRomain d'Alverny <rda@mageia.org>2012-06-28 18:10:04 +0000
commit0cb3b9c686d6169bc0a0bc163451998c4a43362a (patch)
tree54197f67cc8e91b2836b623288942d6cb9b0a637 /root
parent07ba94db23d61493f28c7b12ab9210642615f2be (diff)
parent697c7a2a54e59cd91622ec220d0fdb7365e23f13 (diff)
downloadidentity-0cb3b9c686d6169bc0a0bc163451998c4a43362a.tar
identity-0cb3b9c686d6169bc0a0bc163451998c4a43362a.tar.gz
identity-0cb3b9c686d6169bc0a0bc163451998c4a43362a.tar.bz2
identity-0cb3b9c686d6169bc0a0bc163451998c4a43362a.tar.xz
identity-0cb3b9c686d6169bc0a0bc163451998c4a43362a.zip
Merge branch 'master' into stable
Diffstat (limited to 'root')
-rw-r--r--root/static/style/ttsite.css2
-rw-r--r--root/template/html25
2 files changed, 15 insertions, 12 deletions
diff --git a/root/static/style/ttsite.css b/root/static/style/ttsite.css
index 2d1c734..6136357 100644
--- a/root/static/style/ttsite.css
+++ b/root/static/style/ttsite.css
@@ -1,7 +1,9 @@
/* begin changes obgr_seneca */
html, body {
background: #ddd;
+ margin: 0; padding: 0;
}
+#mgnavdoc { margin: 10px; }
#doc {
-webkit-box-shadow: 0 0 10px #444;
diff --git a/root/template/html b/root/template/html
index 5aaa478..facc555 100644
--- a/root/template/html
+++ b/root/template/html
@@ -1,18 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" dir="ltr">
+<html lang="en" dir="ltr">
<head>
- <meta charset="utf-8" />
+ <meta charset="utf-8">
<title>[% template.title or site.title or c.config.apptitle %]</title>
- <meta name="description" content="Mageia.org online user account panel" />
- <meta name="keywords" content="mageia, user, account, password" />
- <meta name="robots" content="index,nofollow" />
- <link rel="stylesheet" type="text/css" href="/static/style/yui/reset-fonts-grids.css" />
- <link rel="stylesheet" type="text/css" href="/static/style/yui/base-min.css" />
- <link rel="stylesheet" type="text/css" href="/static/style/ttsite.css" />
- <link rel="icon" type="image/png" href="/g/favicon.png" />
+ <meta name="description" content="Mageia.org online user account panel">
+ <meta name="keywords" content="mageia, user, account, password">
+ <meta name="robots" content="index,nofollow">
+ <link rel="stylesheet" type="text/css" href="/static/style/yui/reset-fonts-grids.css">
+ <link rel="stylesheet" type="text/css" href="/static/style/yui/base-min.css">
+ <link rel="stylesheet" type="text/css" href="/static/style/ttsite.css">
+ <link rel="icon" type="image/png" href="/g/favicon.png">
</head>
-<body>
-[% content %]
+<body class="you">
+ <div id="mgnavdoc">[% content %]</div>
+
+ <script src="//nav.mageia.org/js/"></script>
</body>
</html>