Merge branch 'master' into charge_failed

2012-11-20 12:08:36 -08:00 · 2012-11-20 12:08:36 -08:00 · 02b17ea81f
parent c034e10b30 4025413728
commit 02b17ea81f
10 changed files with 4 additions and 4 deletions
--- a/frontend/templates/base.html
+++ b/frontend/templates/base.html
@ -16,7 +16,7 @@
 <head>
    <meta charset="utf-8" />
    <title>unglue.it {% block title %}{% endblock %}</title>
-    <link type="text/css" rel="stylesheet" href="/static/css/sitewide.css" />
+    <link type="text/css" rel="stylesheet" href="/static/css/sitewide2.css" />
 	<link REL="SHORTCUT ICON" HREF="/static/images/favicon.ico">
    {% block extra_css %}{% endblock %}
 	{% block base_js %}
--- a/frontend/templates/home.html
+++ b/frontend/templates/home.html
@ -6,7 +6,7 @@
 {% endblock %}

 {% block extra_css %}
-<link type="text/css" rel="stylesheet" href="/static/css/landingpage.css"  />
+<link type="text/css" rel="stylesheet" href="/static/css/landingpage2.css"  />
 <link type="text/css" rel="stylesheet" href="/static/css/searchandbrowse.css"  />
 <link type="text/css" rel="stylesheet" href="/static/css/book_panel.css"  />
 <link type="text/css" rel="stylesheet" href="/static/css/learnmore.css"  />
--- a/frontend/templates/registration/registration_base.html
+++ b/frontend/templates/registration/registration_base.html
@ -32,7 +32,7 @@ $j(document).ready(function() {
 {% block extra_head %}
 	<link href="/static/css/documentation.css" rel="stylesheet" type="text/css" />
 {% block extra_extra_head %}
-    <link type="text/css" rel="stylesheet" href="/static/css/registration.css" />
+    <link type="text/css" rel="stylesheet" href="/static/css/registration2.css" />
 {% endblock %}
 {% endblock %}

--- a/frontend/templates/work.html
+++ b/frontend/templates/work.html
@ -198,7 +198,7 @@ $j(document).ready(function(){
                                </div>
                            {% else %}{% if request.user.id in work.last_campaign.supporters %}
 								<div class="add-wishlist">
-							        <span class="on-wishlist">Yours!</span>
+							        <span class="on-wishlist">On your wishlist!</span>
 							    </div>
                            {% else %}{% if work in request.user.wishlist.works.all %}
                                <div class="remove-wishlist-workpage">
--- a/static/css/landingpage2.css
+++ b/static/css/landingpage2.css
--- a/static/css/registration2.css
+++ b/static/css/registration2.css
--- a/static/css/sitewide2.css
+++ b/static/css/sitewide2.css
--- a/static/less/landingpage2.less
+++ b/static/less/landingpage2.less
--- a/static/less/registration2.less
+++ b/static/less/registration2.less
--- a/static/less/sitewide2.less
+++ b/static/less/sitewide2.less