Commits

Horst Gutmann committed 355c0b6

Moved body@id setting into its own template-block "pageid" and fixed the style accordingly

Comments (0)

Files changed (5)

hgscm/media/css/styles.css

  */
 h1, h2, h3 { font-size: 1em; font-family: Georgia, Times, "Times New Roman", serif ; margin: 0 0 .5em 0; font-weight: normal; }
 h4, h5, h6 { font-size: 1em; margin: 0 0 .5em 0; }
-h1 { font-size: 2em; }
+h1 { font-size: 48px; line-height: 1em; margin: 0 0 20px 0; font-weight: normal; }
+h2, h3 { line-height: 1.2em; margin-bottom: 20px; font-weight: normal; }
 h2 { font-size: 1.6em; }
-h3 { font-size: 1.3em; }
+h3 { font-size: 1.4em; }
 
 /*
  * WIP warning, can be removed once the site is 'finished'
  */
 #home #logo { margin-bottom: 0 !important; }
 #home dl { margin: 0 30px; font-family: Verdana, Helvetica, Arial, sans-serif; font-size: .80em; line-height: 1.4em; }
-#home h1 { font-size: 48px; line-height: 1em; margin: 0 0 20px 0; font-weight: normal; }
-#home h2, #home h3 { font-size: 22px; line-height: 1.2em; margin-bottom: 20px; font-weight: normal; }
+#home h2 { margin: 0; }
 #home h4 { font-weight: normal; margin: 0; }
 #home h4 a { text-decoration: none; }
 #home h4 a:hover, #home h4 a:focus { text-decoration: underline; }

hgscm/templates/about.html

 {% extends "base.html" %}
-
+{% block pageid %}about{% endblock %}
 {% load extras %}
 {% block content %}
 

hgscm/templates/base.html

 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<link href="{{ MEDIA_URL }}css/styles.css" type="text/css" rel="stylesheet">
-		<script type="text/javascript" src="{{ MEDIA_URL }}javascript/typeface.js"></script>
-		<script type="text/javascript" src="{{ MEDIA_URL }}javascript/optimer_regular.typeface.js"></script>
 		<link rel="shortcut icon" type="image/x-icon" href="{{ MEDIA_URL }}images/favicon.ico">
 
 		<title>Mercurial SCM</title>
 	</head>
-	<body id="home">
+    <body id="{% block pageid %}{% endblock %}">
 	        <div class="wip-warning">Please note that this site is <em>work in progress and incomplete</em>! You probably want to <a href="http://www.selenic.com/mercurial" style="color: #3d3dfa">visit the official mercurial homepage</a> instead.</div>
 				
 		<h1 id="logo"><a href="/">mercurial</a></h1>
 			
-		<ul id="nav" class="typeface-js">
+		<ul id="nav">
 			<li><a href="{% url about %}">about</a></li>
 			<li><a href="{% url downloads %}">download</a></li>
 			<li><a href="javascript:void(0);">extensions</a></li>

hgscm/templates/downloads.html

 {% extends "base.html" %}
-
+{% block pageid %}downloads{% endblock %}
 {% block content %}
 
 <div class="row">

hgscm/templates/frontpage.html

 {% extends "base.html" %}
-
+{% block pageid %}home{% endblock %}
 {% load extras %}
 {% block content %}