Merge branch 'upstream' into redeem_dlg

Conflicts: code/redeeming.js
2013-03-07 08:35:44 +01:00
parent 1623c3fa9a 19cd197cd4
commit 0824334d5f
8 changed files with 19 additions and 17 deletions
--- a/style.css
+++ b/style.css
@ -727,7 +727,8 @@ aside {
  text-align: right;
 }

-.ui-dialog-buttonset button {
+.ui-dialog-buttonset button,
+.ui-dialog-content button {
  padding: 2px;
  min-width: 80px;
  color: #FFCE00;