Merge lp:~dylanmccall/harvest/opportunity-description-class into lp:harvest

[Dylan McCall]

Branch lp:~dholbach/harvest/734746 added an opportunity-long-description class as an alternative to the opportunity-description class, which added some complexity to matching in opportunities.css. This branch adds one more class — opportunity-short-description — and makes opportunity-description go in addition to one of those. This removes some complexity from our CSS file and will hopefully make somebody's life easier in the future :)

[Daniel Holbach (dholbach)]

Much saner approach, yes. :)

review: Approve

=== modified file 'harvest/media/css/opportunities.css'
--- harvest/media/css/opportunities.css	2011-06-28 14:11:37 +0000
+++ harvest/media/css/opportunities.css	2011-07-05 16:27:30 +0000
@@ -268,12 +268,9 @@
 	line-height:1em;
 }
 .opportunity[data-opportunity-irrelevant] > .opportunity-header > .opportunity-description,
-.opportunity[data-opportunity-irrelevant] > .opportunity-header > .opportunity-long-description,
-.opportunity[data-opportunity-applied] > .opportunity-header > .opportunity-description,
-.opportunity[data-opportunity-applied] > .opportunity-header > .opportunity-long-description {
+.opportunity[data-opportunity-applied] > .opportunity-header > .opportunity-description, {
 	text-decoration:line-through;
 }
-.opportunity-header > a.opportunity-long-description,
 .opportunity-header > a.opportunity-description {
 	color:#000000;
 	font-size:16px;

=== modified file 'harvest/templates/opportunities/include/opportunity.html'
--- harvest/templates/opportunities/include/opportunity.html	2011-06-28 14:11:37 +0000
+++ harvest/templates/opportunities/include/opportunity.html	2011-07-05 16:27:30 +0000
@@ -2,9 +2,9 @@
 
 <div class="opportunity-header">
         {% if opportunity.long_description %}
-		<a href="{{opportunity.url}}" class="opportunity-long-description" target="_blank">{{ opportunity.long_description }}</a>
+		<a href="{{opportunity.url}}" class="opportunity-description opportunity-long-description" target="_blank">{{ opportunity.long_description }}</a>
         {% else %}
-		<a href="{{opportunity.url}}" class="opportunity-description" target="_blank">{{ opportunity.description }}</a>
+		<a href="{{opportunity.url}}" class="opportunity-description opportunity-short-description" target="_blank">{{ opportunity.description }}</a>
         {% endif %}
 	<span class="actions">
 		{% if user.is_authenticated %}