Permalink
Browse files

Merge branch 'master' of github.com:django/djangoproject.com

  • Loading branch information...
2 parents bb010b9 + 085419d commit b201482d0c8b3a8abced0e093b76d7bb79959578 @jacobian jacobian committed Sep 11, 2011
View
4 django_website/templates/flatpages/download.html
@@ -9,7 +9,7 @@
{% block content-related %}
<h2>For the impatient:</h2>
<ul>
- <li>Download the latest release: <a href="http://www.djangoproject.com/download/1.3/tarball/">Django-1.3.tar.gz</a>.</li>
+ <li>Download the latest release: <a href="http://www.djangoproject.com/download/1.3.1/tarball/">Django-1.3.1.tar.gz</a>.</li>
</ul>
<h2>Which version is better?</h2>
@@ -18,7 +18,7 @@
<p>If you're just looking for a stable deployment target and don't mind waiting for the next release, you'll want to stick with the latest official release (which will always include detailed notes on any changes you'll need to make while upgrading).</p>
<h2>Previous releases</h2>
<ul>
- <li>Django 1.2: <a href="http://www.djangoproject.com/download/1.2.5/tarball/">Django-1.2.5.tar.gz</a>.</li>
+ <li>Django 1.2: <a href="http://www.djangoproject.com/download/1.2.6/tarball/">Django-1.2.6.tar.gz</a>.</li>
</ul>
<h2>Unsupported previous releases (no longer receive security updates or bugfixes)</h2>
View
2 django_website/templates/homepage.html
@@ -35,7 +35,7 @@ <h2 class="deck">Django is a high-level Python Web framework that encourages rap
<h2>Download</h2>
<ul class="linklist">
- <li class="button-download"><a href="/download/">Latest release: <strong>1.3</strong></a></li>
+ <li class="button-download"><a href="/download/">Latest release: <strong>1.3.1</strong></a></li>
</ul>
<p>Open source, <a href="https://code.djangoproject.com/browser/django/trunk/LICENSE">BSD license</a></p>
<h2>Documentation</h2>
View
69 ux.dp.com/base.css
@@ -4,7 +4,7 @@ html {
}
body {
- font-family: freight-sans-pro, sans-serif;
+ font-family: 'Open Sans', sans-serif;
font-size: 100%;
width: 600px;
margin: 20px auto;
@@ -16,17 +16,25 @@ body {
text-indent: -9999px;
background: url(djangoux.png) no-repeat left center;
margin: 0;
+ font-weight: 800;
}
#masthead>h2 {
+ font-family: "News Cycle", sans-serif;
text-transform: uppercase;
font-size: 1.8em;
color: white;
margin: 0.25em 0 0.5em;
+ font-weight: 400;
+ letter-spacing: 1px;
+}
+
+#content {
+ margin-bottom: 2em;
}
#mailinglist {
- font-weight: 700;
+ font-weight: 800;
text-decoration: none;
color: black;
display: inline-block;
@@ -41,4 +49,61 @@ body {
text-decoration: underline;
background: rgba(255,255,255,0.5);
color: black;
+}
+
+#staff header h1 {
+ font-weight: 400;
+ font-style: italic;
+ border-bottom: 1px solid rgba(0,0,0,0.2);
+ font-size: 100%;
+ padding-bottom: 0.5em;
+
+}
+
+.person {
+ float: left;
+ width: 122px;
+}
+
+.person>a {
+ border: 1px solid #789340;
+ background: #fff;
+ padding: 5px;
+ width: 72px;
+ height: 72px;
+ display: block;
+}
+
+.person>a:hover {
+ background-color: #FFF0AF;
+}
+
+.person>a img {
+ display: block;
+ padding: 0;
+ margin: 0;
+ width: 72px;
+ height: 72px;
+}
+
+.person h1 {
+ font-weight: 400;
+ font-size: 100%;
+ margin-bottom: 0.2em;
+}
+
+.person h2 {
+ font-weight: 400;
+ font-style: italic;
+ font-size: 0.75em;
+ margin-top: 0;
+}
+
+.person h2 a {
+ color: #000;
+ text-decoration: none;
+}
+
+.person h2 a:hover {
+ text-decoration: underline;
}
View
BIN ux.dp.com/idan.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
22 ux.dp.com/index.html
@@ -1,9 +1,7 @@
<html>
<head>
<title>Django User Experience Team</title>
- <script type="text/javascript" src="http://use.typekit.com/mws7jht.js"></script>
- <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
- <link rel="stylesheet" href="normalize.css">
+ <link href='//fonts.googleapis.com/css?family=Open+Sans:400italic,800italic,400,800|News+Cycle' rel='stylesheet' type='text/css'> <link rel="stylesheet" href="normalize.css">
<link rel="stylesheet" href="base.css">
</head>
<body>
@@ -15,7 +13,23 @@ <h2 id="title">Django User Experience Team</h2>
<p>We make Django delightful to use.</p>
<p>We are designers of every stripe: user experience, interaction, visual. We are information architects and content strategists. We don't always know how to write code. We want the entire Django ecosystem to benefit from our talents.</p>
<p>Sound like something you'd like to be involved in? Don't be shy.</p>
- <p><a id="mailinglist" href="https://groups.google.com/forum/#!forum/django-ux">Join the mailing list.</a></p>
+ <p><a id="mailinglist" href="https://groups.google.com/forum/#!forum/django-ux">Join the mailing list!</a></p>
</section>
+ <section id="staff">
+ <header>
+ <h1>Chaired by</h1>
+ </header>
+ <article class="person">
+ <a href="http://twitter.com/idangazit"><img width="72" height="72" src="idan.jpg"></a>
+ <h1>Idan Gazit</h1>
+ <h2><a href="http://twitter.com/idangazit">@idangazit</a></h2>
+ </article>
+ <article class="person">
+ <a href="http://twitter.com/julienphalip"><img width="72" height="72" src="julien.jpg"></a>
+ <h1>Julien Phalip</h1>
+ <h2><a href="http://twitter.com/julienphalip">@julienphalip</a></h2>
+ </article>
+
+ </section>
</body>
</html>
View
BIN ux.dp.com/julien.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit b201482

Please sign in to comment.