Mercurial > kallithea
changeset 5088:d0d386e51d06
Merge stable
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Sun, 03 May 2015 22:08:22 +0200 |
parents | b5e399286ce5 (current diff) 85a6526a15a8 (diff) |
children | 196c46444d98 |
files | kallithea/public/css/style.css |
diffstat | 2 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/style.css Thu Apr 30 07:05:18 2015 +0200 +++ b/kallithea/public/css/style.css Sun May 03 22:08:22 2015 +0200 @@ -4793,7 +4793,6 @@ } div.diffblock.margined { margin: 0px 20px 0px 20px; - overflow: hidden; } div.diffblock .code-header { border-bottom: 1px solid #CCCCCC;
--- a/kallithea/templates/admin/my_account/my_account_api_keys.html Thu Apr 30 07:05:18 2015 +0200 +++ b/kallithea/templates/admin/my_account/my_account_api_keys.html Sun May 03 22:08:22 2015 +0200 @@ -58,7 +58,7 @@ <div class="fields"> <div class="field"> <div class="label"> - <label for="new_email">${_('New api key')}:</label> + <label for="description">${_('New api key')}:</label> </div> <div class="input"> ${h.text('description', class_='medium', placeholder=_('Description'))}