Merge branch 'master' into username

Conflicts: www/%username/history/index.html www/assets/%version/gittip.css
gratipay · Apr 7, 2013 · 24bb7fc · 24bb7fc
2 parents 7894d23 + 65eae83
commit 24bb7fc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/templates/base.html b/templates/base.html
@@ -89,6 +89,9 @@ <h2 class="top"><span>{{ title }}</span></h2>
  </div></div>
 
  <div class="main-padding"><div id="footer">
+ <div class="social">
+ <a href="https://twitter.com/gittip"><img src="/assets/icons/twitter.16.png" /></a>
+ </div>
  <a href='http://blog.gittip.com/'>Blog</a> |
  <a href="/about/">About</a> |
  <a href='/about/faq.html'>FAQ</a> |

diff --git a/templates/gittip.scss b/templates/gittip.scss
@@ -783,6 +783,10 @@ button.selected:hover {
  padding: 0.5em 0 0;
  text-align: right;
  font: normal 12px/16px $Helvetica;
+
+ .social {
+ float: left;
+ }
 }
 
 

diff --git a/www/%username/history/index.html b/www/%username/history/index.html
@@ -270,14 +270,14 @@ <h2>Record an Exchange.</h2>
 
  {% if event['tippee'] == participant.username %}
  {% if user.ADMIN and (participant.username != user.username or 'override' in qs) %}
- <td class="notes">from <a href="/{{ event['tipper'] }}/history.html">{{ event['tipper'] }}</a></td>
+ <td class="notes">from <a href="/{{ event['tipper'] }}/history/">{{ event['tipper'] }}</a></td>
  {% else %}
  <td class="notes">from someone</td>
  {% end %}
  {% else %}
  {% if user.ADMIN %}
  <td class="notes">to
- <a href="/{{ event['tippee'] }}/history.html">{{ event['tippee'] }}</a></td>
+ <a href="/{{ event['tippee'] }}/history/">{{ event['tippee'] }}</a></td>
  {% else %}
  <td class="notes">to
  <a href="/{{ event['tippee'] }}/">{{ event['tippee'] }}</a></td>

diff --git a/www/assets/%version/gittip.css b/www/assets/%version/gittip.css
diff --git a/www/version.txt b/www/version.txt
@@ -1 +1 @@
-7.3.31-dev
+7.3.33-dev