Merge lp:~dylanmccall/harvest/658910 into lp:harvest

[Dylan McCall]

Okay, it's all fixed up. Design changes are funny things, so feel free to share opinions as well as point out my technical wrongdoings :)

Screenshots are up at http://people.ubuntu.com/~dylanmccall/harvest/bugs/lp658910/

[Daniel Holbach (dholbach)]

Good work!

review: Approve

=== modified file 'harvest/media/css/style.css'
--- harvest/media/css/style.css	2010-10-05 15:27:43 +0000
+++ harvest/media/css/style.css	2010-10-12 03:09:44 +0000
@@ -136,11 +136,11 @@
 }
 
 .sectiontitle {
-	margin-bottom:8px;
 	max-width:30em;
 	letter-spacing:-0.1em;
 	font-size:24px;
-	line-height:28px;
+	margin-bottom:12px;
+	color:rgb(80,80,80);
 }
 
 #content > .one_column {
@@ -149,10 +149,6 @@
 
 
 
-#content_welcome .sectiontitle {
-	/* de-emphasize these titles for the more complex page */
-	color:rgb(80,80,80);
-}
 
 #content_welcome > #start {
 	display:table-cell;
@@ -195,10 +191,11 @@
 	font-style:italic;
 }
 
-#content_welcome > #faq {
+#content_welcome #faq {
 	display:table-cell;
 	width:430px;
 	min-width:430px;
+	color:rgb(80,80,80);
 }
 
 #faq > div {
@@ -213,7 +210,6 @@
 #faq .question {
 	font-weight:bold;
 	font-style:italic;
-	color:rgb(180,180,180);
 }
 
 
@@ -288,17 +284,18 @@
 	margin-bottom:4em;
 }
 #filters > .filtergroup > .filter-label {
+	/* titles for groups of filters ("Packages" and "Opportunities") */
 	display:block;
-	margin-bottom:.5em;
-	color:rgb(0,0,0);
-	font-size:14px;
-	font-weight:bold;
+	margin-bottom:8px;
+	letter-spacing:-0.1em;
+	color:rgb(80,80,80);
+	font-size:16px;
 }
 #filters > .filtergroup > .filter-value > ul {
 	margin-left:0px;
 }
 #filters > .filtergroup > .filter-value > ul > li {
-	padding-bottom:5px;
+	margin-bottom:5px;
 }
 
 #filters > .filtergroup > .filter-value > ul > li a.help {
@@ -449,7 +446,7 @@
 
 .opportunity-list > .opportunity-list-title {
 	display:block;
-	color:rgb(80, 80, 80);
+	color:rgb(80,80,80);
 	font-size:12px;
 	letter-spacing:-0.1em;
 }
@@ -524,8 +521,6 @@
 	display:block;
 	width:100%;
 	max-width:35em;
-	border-left:dashed 1px rgb(180,180,180);
-	padding:0px 5px;
 	font-size:12px;
 	line-height:1em;
 }
@@ -534,13 +529,13 @@
 	border:none;
 	border-bottom:1px solid rgb(180,180,180);
 	
-	padding:2px 5px 2px 5px;
+	padding:2px 5px;
 	background-color:inherit;
 	color:inherit;
 	font:inherit;
 }
 .opportunity-notes > ul {
-	margin:0.5em 0;
+	margin:10px 5px;
 	max-height:10em;
 }
 .opportunity-notes > ul > li {

=== modified file 'harvest/templates/index.html'
--- harvest/templates/index.html	2010-08-31 19:05:02 +0000
+++ harvest/templates/index.html	2010-10-12 03:09:44 +0000
@@ -57,7 +57,7 @@
 
 		<li>
 		<span class="question">{% trans "I found a bug. What do I do?" %}</span>
-		<p>{% blocktrans %}If it's about the UI or the functionality of the site, please file a bug on <a href="http://bugs.launchpad.net/harvest/+filebug">harvest</a> in Launchpad. If it's about some piece of data in Harvest, it's likely a script that fetches it. In that case, please file your bug on <a href="https://bugs.launchpad.net/harvest-data/+filebug">harvest-data</a> instead. The <a href="http://bazaar.launchpad.net/~harvest-dev/harvest/trunk/annotate/head:/HACKING">hacking guide</a> explains more.{% endblocktrans %}</p>
+		<p>{% blocktrans %}If it's about the UI or the functionality of the site, please file a bug on <a href="http://bugs.launchpad.net/harvest/+filebug">harvest</a> in Launchpad. If it's about some piece of data in Harvest, it's likely a script that fetches it. In that case, please file your bug on <a href="http://bugs.launchpad.net/harvest-data/+filebug">harvest-data</a> instead. The <a href="http://bazaar.launchpad.net/~harvest-dev/harvest/trunk/annotate/head:/HACKING">hacking guide</a> explains more.{% endblocktrans %}</p>
 		</li>
 	</ul>
 	</div>