Mercurial > kallithea
changeset 6258:b7654d1675da
style: in preparation for bootstrap, use bootstrap compatible button class names
Give all buttons a styling (default, success, danger, warning) and rename the sizes to sm and xs.
This is a subset of a bigger changeset. The subset was extracted by Mads Kiilerich, mostly by:
sed -i \
-e 's,btn btn-small,btn btn-default btn-sm,g' \
-e 's,btn btn-mini,btn btn-default btn-xs,g' \
-e 's,btn-default btn-\(xs\|sm\) btn-\(success\|danger\|warning\),btn-\2 btn-\1,g' \
-e 's,class_="btn",class_="btn btn-default",g' \
`hg mani`
line wrap: on
line diff
--- a/kallithea/public/css/style.css Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/public/css/style.css Sun Sep 18 19:39:36 2016 +0200 @@ -3169,11 +3169,11 @@ color: #999; } -.btn.btn-small { +.btn.btn-sm { padding: 2px 6px; } -.btn.btn-mini { +.btn.btn-xs { padding: 0px 4px; }
--- a/kallithea/public/js/base.js Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/public/js/base.js Sun Sep 18 19:39:36 2016 +0200 @@ -671,7 +671,7 @@ // append an Add button to $comment_div and hook it up to show form function _comment_div_append_add($comment_div, f_path, line_no) { var addlabel = TRANSLATION_MAP['Add Another Comment']; - var $add = $('<div class="add-button-row"><span class="btn btn-mini add-button">{0}</span></div>'.format(addlabel)); + var $add = $('<div class="add-button-row"><span class="btn btn-default btn-xs add-button">{0}</span></div>'.format(addlabel)); $comment_div.append($add); $add.children('.add-button').click(function(e) { comment_div_state($comment_div, f_path, line_no, true);
--- a/kallithea/templates/admin/admin.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/admin.html Sun Sep 18 19:39:36 2016 +0200 @@ -9,7 +9,7 @@ <form id="filter_form"> <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('journal filter...')}"/> <span class="tooltip" title="${h.journal_filter_help()}">?</span> - <input type='submit' value="${_('Filter')}" class="btn btn-mini" style="padding:0px 2px 0px 2px;margin:0px"/> + <input type='submit' value="${_('Filter')}" class="btn btn-default btn-xs" style="padding:0px 2px 0px 2px;margin:0px"/> ${_('Admin Journal')} - ${ungettext('%s Entry', '%s Entries', c.users_log.item_count) % (c.users_log.item_count)} </form> ${h.end_form()}
--- a/kallithea/templates/admin/auth/auth_settings.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/auth/auth_settings.html Sun Sep 18 19:39:36 2016 +0200 @@ -36,7 +36,7 @@ %for plugin_path in c.available_plugins: <li> <div style="padding:3px 0px 3px 0px"> - <span style="margin: 0px 10px 0px 0px" plugin_id="${plugin_path}" class="toggle-plugin btn btn-mini ${'active' if plugin_path in c.enabled_plugins else ''}"> + <span style="margin: 0px 10px 0px 0px" plugin_id="${plugin_path}" class="toggle-plugin btn btn-default btn-xs ${'active' if plugin_path in c.enabled_plugins else ''}"> ${_('Enabled') if plugin_path in c.enabled_plugins else _('Disabled')}</span>${plugin_path} </div> </li> @@ -98,7 +98,7 @@ %endfor <div class="fields"> <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn")} + ${h.submit('save',_('Save'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/defaults/defaults.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/defaults/defaults.html Sun Sep 18 19:39:36 2016 +0200 @@ -79,7 +79,7 @@ </div> <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn")} + ${h.submit('save',_('Save'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/gists/edit.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/gists/edit.html Sun Sep 18 19:39:36 2016 +0200 @@ -141,8 +141,8 @@ %endfor <div style="padding-top: 5px"> - ${h.submit('update',_('Update Gist'),class_="btn btn-mini btn-success")} - <a class="btn btn-mini" href="${h.url('gist', gist_id=c.gist.gist_access_id)}">${_('Cancel')}</a> + ${h.submit('update',_('Update Gist'),class_="btn btn-success btn-xs")} + <a class="btn btn-default btn-xs" href="${h.url('gist', gist_id=c.gist.gist_access_id)}">${_('Cancel')}</a> </div> ${h.end_form()} <script>
--- a/kallithea/templates/admin/gists/index.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/gists/index.html Sun Sep 18 19:39:36 2016 +0200 @@ -34,7 +34,7 @@ %if c.authuser.username != 'default': <ul class="links"> <li> - <a href="${h.url('new_gist')}" class="btn btn-small btn-success"><i class="icon-plus"></i> ${_('Create New Gist')}</a> + <a href="${h.url('new_gist')}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Create New Gist')}</a> </li> </ul> %endif
--- a/kallithea/templates/admin/gists/new.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/gists/new.html Sun Sep 18 19:39:36 2016 +0200 @@ -51,9 +51,9 @@ </div> </div> <div style="padding-top: 5px"> - ${h.submit('private',_('Create Private Gist'),class_="btn btn-mini btn-success")} - ${h.submit('public',_('Create Public Gist'),class_="btn btn-mini")} - ${h.reset('reset',_('Reset'),class_="btn btn-mini")} + ${h.submit('private',_('Create Private Gist'),class_="btn btn-success btn-xs")} + ${h.submit('public',_('Create Public Gist'),class_="btn btn-default btn-xs")} + ${h.reset('reset',_('Reset'),class_="btn btn-default btn-xs")} </div> ${h.end_form()} <script type="text/javascript">
--- a/kallithea/templates/admin/gists/show.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/gists/show.html Sun Sep 18 19:39:36 2016 +0200 @@ -22,7 +22,7 @@ %if c.authuser.username != 'default': <ul class="links"> <li> - <a href="${h.url('new_gist')}" class="btn btn-small btn-success"><i class="icon-plus"></i> ${_('Create New Gist')}</a> + <a href="${h.url('new_gist')}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Create New Gist')}</a> </li> </ul> %endif @@ -34,9 +34,9 @@ <div class="stats"> <div class="left" style="margin: -4px 0px 0px 0px"> %if c.gist.gist_type == 'public': - <div class="btn btn-mini btn-success disabled">${_('Public Gist')}</div> + <div class="btn btn-success btn-xs disabled">${_('Public Gist')}</div> %else: - <div class="btn btn-mini btn-warning disabled">${_('Private Gist')}</div> + <div class="btn btn-warning btn-xs disabled">${_('Private Gist')}</div> %endif </div> <div class="left item"> @@ -53,16 +53,16 @@ %if h.HasPermissionAny('hg.admin')() or c.gist.gist_owner == c.authuser.user_id: <div style="float:right"> ${h.form(url('gist_delete', gist_id=c.gist.gist_id))} - ${h.submit('remove_gist', _('Delete'),class_="btn btn-mini btn-danger",onclick="return confirm('"+_('Confirm to delete this Gist')+"');")} + ${h.submit('remove_gist', _('Delete'),class_="btn btn-danger btn-xs",onclick="return confirm('"+_('Confirm to delete this Gist')+"');")} ${h.end_form()} </div> %endif <div class="buttons"> ## only owner should see that %if h.HasPermissionAny('hg.admin')() or c.gist.gist_owner == c.authuser.user_id: - ${h.link_to(_('Edit'),h.url('edit_gist', gist_id=c.gist.gist_access_id),class_="btn btn-mini")} + ${h.link_to(_('Edit'),h.url('edit_gist', gist_id=c.gist.gist_access_id),class_="btn btn-default btn-xs")} %endif - ${h.link_to(_('Show as Raw'),h.url('formatted_gist', gist_id=c.gist.gist_access_id, format='raw'),class_="btn btn-mini")} + ${h.link_to(_('Show as Raw'),h.url('formatted_gist', gist_id=c.gist.gist_access_id, format='raw'),class_="btn btn-default btn-xs")} </div> </div> @@ -81,7 +81,7 @@ <a href="${c.gist.gist_url()}">ΒΆ</a> <b style="margin:0px 0px 0px 4px">${h.safe_unicode(file.path)}</b> <div style="float:right; margin: -5px"> - ${h.link_to(_('Show as raw'),h.url('formatted_gist_file', gist_id=c.gist.gist_access_id, format='raw', revision=file.changeset.raw_id, f_path=h.safe_unicode(file.path)),class_="btn btn-mini")} + ${h.link_to(_('Show as raw'),h.url('formatted_gist_file', gist_id=c.gist.gist_access_id, format='raw', revision=file.changeset.raw_id, f_path=h.safe_unicode(file.path)),class_="btn btn-default btn-xs")} </div> </div> <div class="code-body">
--- a/kallithea/templates/admin/my_account/my_account_api_keys.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_api_keys.html Sun Sep 18 19:39:36 2016 +0200 @@ -3,14 +3,14 @@ <tr> <td style="width: 450px"><div class="truncate autoexpand" style="width:120px;font-size:16px;font-family: monospace">${c.user.api_key}</div></td> <td> - <span class="btn btn-mini btn-success disabled">${_('Built-in')}</span> + <span class="btn btn-success btn-xs disabled">${_('Built-in')}</span> </td> <td>${_('Expires')}: ${_('Never')}</td> <td> ${h.form(url('my_account_api_keys_delete'))} ${h.hidden('del_api_key',c.user.api_key)} ${h.hidden('del_api_key_builtin',1)} - <button class="btn btn-mini btn-danger" type="submit" + <button class="btn btn-danger btn-xs" type="submit" onclick="return confirm('${_('Confirm to reset this API key: %s') % c.user.api_key}');"> ${_('Reset')} </button> @@ -36,7 +36,7 @@ <td> ${h.form(url('my_account_api_keys_delete'))} ${h.hidden('del_api_key',api_key.api_key)} - <button class="btn btn-mini btn-danger" type="submit" + <button class="btn btn-danger btn-xs" type="submit" onclick="return confirm('${_('Confirm to remove this API key: %s') % api_key.api_key}');"> <i class="icon-minus-circled"></i> ${_('Remove')} @@ -66,8 +66,8 @@ </div> </div> <div class="buttons"> - ${h.submit('save',_('Add'),class_="btn")} - ${h.reset('reset',_('Reset'),class_="btn")} + ${h.submit('save',_('Add'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/my_account/my_account_emails.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_emails.html Sun Sep 18 19:39:36 2016 +0200 @@ -6,7 +6,7 @@ %endif <td><div class="email">${c.user.email}</div></td> <td> - <span class="btn btn-mini btn-success disabled">${_('Primary')}</span> + <span class="btn btn-success btn-xs disabled">${_('Primary')}</span> </td> </tr> %if c.user_email_map: @@ -46,8 +46,8 @@ </div> </div> <div class="buttons"> - ${h.submit('save',_('Add'),class_="btn")} - ${h.reset('reset',_('Reset'),class_="btn")} + ${h.submit('save',_('Add'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/my_account/my_account_password.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_password.html Sun Sep 18 19:39:36 2016 +0200 @@ -33,8 +33,8 @@ </div> <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn")} - ${h.reset('reset',_('Reset'),class_="btn")} + ${h.submit('save',_('Save'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/my_account/my_account_profile.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_profile.html Sun Sep 18 19:39:36 2016 +0200 @@ -55,8 +55,8 @@ </div> <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn")} - ${h.reset('reset',_('Reset'),class_="btn")} + ${h.submit('save',_('Save'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/notifications/notifications.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/notifications/notifications.html Sun Sep 18 19:39:36 2016 +0200 @@ -21,13 +21,13 @@ </div> <div style="padding:14px 18px;text-align: right;float:left"> - <span id='all' class="btn btn-small"><a href="${h.url.current()}">${_('All')}</a></span> - <span id='comment' class="btn btn-small"><a href="${h.url.current(type=c.comment_type)}">${_('Comments')}</a></span> - <span id='pull_request' class="btn btn-small"><a href="${h.url.current(type=c.pull_request_type)}">${_('Pull Requests')}</a></span> + <span id='all' class="btn btn-default btn-sm"><a href="${h.url.current()}">${_('All')}</a></span> + <span id='comment' class="btn btn-default btn-sm"><a href="${h.url.current(type=c.comment_type)}">${_('Comments')}</a></span> + <span id='pull_request' class="btn btn-default btn-sm"><a href="${h.url.current(type=c.pull_request_type)}">${_('Pull Requests')}</a></span> </div> %if c.notifications: <div style="padding:14px 18px;text-align: right;float:right"> - <span id='mark_all_read' class="btn btn-small">${_('Mark All Read')}</span> + <span id='mark_all_read' class="btn btn-default btn-sm">${_('Mark All Read')}</span> </div> %endif <div id='notification_data'>
--- a/kallithea/templates/admin/permissions/permissions_globals.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/permissions/permissions_globals.html Sun Sep 18 19:39:36 2016 +0200 @@ -109,8 +109,8 @@ </div> </div> <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn")} - ${h.reset('reset',_('Reset'),class_="btn")} + ${h.submit('save',_('Save'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/permissions/permissions_ips.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/permissions/permissions_ips.html Sun Sep 18 19:39:36 2016 +0200 @@ -35,8 +35,8 @@ </div> </div> <div class="buttons"> - ${h.submit('save',_('Add'),class_="btn")} - ${h.reset('reset',_('Reset'),class_="btn")} + ${h.submit('save',_('Add'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/repo_groups/repo_group_add.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_add.html Sun Sep 18 19:39:36 2016 +0200 @@ -66,7 +66,7 @@ </div> <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn")} + ${h.submit('save',_('Save'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/repo_groups/repo_group_edit.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit.html Sun Sep 18 19:39:36 2016 +0200 @@ -18,7 +18,7 @@ <%def name="breadcrumbs_side_links()"> <ul class="links"> <li> - <a href="${h.url('new_repos_group', parent_group=c.repo_group.group_id)}" class="btn btn-small btn-success"><i class="icon-plus"></i> ${_('Add Child Group')}</a> + <a href="${h.url('new_repos_group', parent_group=c.repo_group.group_id)}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Add Child Group')}</a> </li> </ul> </%def>
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html Sun Sep 18 19:39:36 2016 +0200 @@ -17,7 +17,7 @@ </dl> ${h.form(h.url('delete_repos_group', group_name=c.repo_group.group_name))} - <button class="btn btn-small btn-danger" type="submit" + <button class="btn btn-danger btn-sm" type="submit" onclick="return confirm('${ungettext('Confirm to delete this group: %s with %s repository', 'Confirm to delete this group: %s with %s repositories', c.repo_group.repositories_recursive_count) % (c.repo_group.group_name, c.repo_group.repositories_recursive_count)}');">
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html Sun Sep 18 19:39:36 2016 +0200 @@ -111,8 +111,8 @@ </table> </div> <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn")} - ${h.reset('reset',_('Reset'),class_="btn")} + ${h.submit('save',_('Save'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html Sun Sep 18 19:39:36 2016 +0200 @@ -39,8 +39,8 @@ </div> </div> <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn")} - ${h.reset('reset',_('Reset'),class_="btn")} + ${h.submit('save',_('Save'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/repo_groups/repo_groups.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_groups.html Sun Sep 18 19:39:36 2016 +0200 @@ -22,7 +22,7 @@ <ul class="links"> %if h.HasPermissionAny('hg.admin')(): <li> - <a href="${h.url('new_repos_group')}" class="btn btn-small btn-success"><i class="icon-plus"></i> ${_('Add Repository Group')}</a> + <a href="${h.url('new_repos_group')}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Add Repository Group')}</a> </li> %endif </ul>
--- a/kallithea/templates/admin/repos/repo_add_base.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_add_base.html Sun Sep 18 19:39:36 2016 +0200 @@ -78,7 +78,7 @@ </div> </div> <div class="buttons"> - ${h.submit('add',_('Add'),class_="btn")} + ${h.submit('add',_('Add'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/repos/repo_edit_advanced.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_advanced.html Sun Sep 18 19:39:36 2016 +0200 @@ -2,7 +2,7 @@ ${h.form(url('edit_repo_advanced_fork', repo_name=c.repo_info.repo_name))} <div class="form"> ${h.select('id_fork_of','',c.repos_list,class_="medium")} - ${h.submit('set_as_fork_%s' % c.repo_info.repo_name,_('Set'),class_="btn btn-small")} + ${h.submit('set_as_fork_%s' % c.repo_info.repo_name,_('Set'),class_="btn btn-default btn-sm")} <div class="field" style="border:none;color:#888"> <ul> <li>${_('''Manually set this repository as a fork of another from the list.''')}</li> @@ -24,12 +24,12 @@ <div class="form"> <div class="field"> %if c.in_public_journal: - <button class="btn btn-small" type="submit"> + <button class="btn btn-default btn-sm" type="submit"> <i class="icon-minus"></i> ${_('Remove from public journal')} </button> %else: - <button class="btn btn-small" type="submit"> + <button class="btn btn-default btn-sm" type="submit"> <i class="icon-plus"></i> ${_('Add to Public Journal')} </button> @@ -48,7 +48,7 @@ <div class="form"> %if c.repo_info.locked[0]: ${h.hidden('set_unlock', '1')} - <button class="btn btn-small" type="submit" + <button class="btn btn-default btn-sm" type="submit" onclick="return confirm('${_('Confirm to unlock repository.')}');"> <i class="icon-lock-open-alt"></i> ${_('Unlock Repository')} @@ -56,7 +56,7 @@ ${_('Locked by %s on %s') % (h.person_by_id(c.repo_info.locked[0]),h.fmt_date(h.time_to_datetime(c.repo_info.locked[1])))} %else: ${h.hidden('set_lock', '1')} - <button class="btn btn-small" type="submit" + <button class="btn btn-default btn-sm" type="submit" onclick="return confirm('${_('Confirm to lock repository.')}');"> <i class="icon-lock"></i> ${_('Lock Repository')} @@ -75,7 +75,7 @@ <h3>${_('Delete')}</h3> ${h.form(url('delete_repo', repo_name=c.repo_name))} <div class="form"> - <button class="btn btn-small btn-danger" type="submit" + <button class="btn btn-danger btn-sm" type="submit" onclick="return confirm('${_('Confirm to delete this repository: %s') % c.repo_name}');"> <i class="icon-minus-circled"></i> ${_('Delete this Repository')}
--- a/kallithea/templates/admin/repos/repo_edit_caches.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_caches.html Sun Sep 18 19:39:36 2016 +0200 @@ -1,7 +1,7 @@ ${h.form(url('update_repo_caches', repo_name=c.repo_name))} <div class="form"> <div class="fields"> - ${h.submit('reset_cache_%s' % c.repo_info.repo_name,_('Invalidate Repository Cache'),class_="btn btn-small")} + ${h.submit('reset_cache_%s' % c.repo_info.repo_name,_('Invalidate Repository Cache'),class_="btn btn-default btn-sm")} <div class="field" style="border:none;color:#888"> <ul> <li>${_('Manually invalidate cache for this repository. On first access, the repository will be cached again.')}
--- a/kallithea/templates/admin/repos/repo_edit_fields.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_fields.html Sun Sep 18 19:39:36 2016 +0200 @@ -55,8 +55,8 @@ </div> <div class="buttons"> - ${h.submit('save',_('Add'),class_="btn")} - ${h.reset('reset',_('Reset'),class_="btn")} + ${h.submit('save',_('Add'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/repos/repo_edit_permissions.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_permissions.html Sun Sep 18 19:39:36 2016 +0200 @@ -98,8 +98,8 @@ </table> </div> <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn")} - ${h.reset('reset',_('Reset'),class_="btn")} + ${h.submit('save',_('Save'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/repos/repo_edit_remote.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_remote.html Sun Sep 18 19:39:36 2016 +0200 @@ -7,7 +7,7 @@ <div class="fields"> ${h.submit('remote_pull_%s' % c.repo_info.repo_name, _('Pull Changes from Remote Repository'), - class_="btn btn-small", + class_="btn btn-default btn-sm", onclick="return confirm('"+_('Confirm to pull changes from remote repository.')+"');")} </div> </div>
--- a/kallithea/templates/admin/repos/repo_edit_settings.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_settings.html Sun Sep 18 19:39:36 2016 +0200 @@ -124,8 +124,8 @@ %endfor %endif <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn")} - ${h.reset('reset',_('Reset'),class_="btn")} + ${h.submit('save',_('Save'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/repos/repo_edit_statistics.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_statistics.html Sun Sep 18 19:39:36 2016 +0200 @@ -7,7 +7,7 @@ <li>${_('Processed progress')}: ${c.stats_percentage}%</li> </ul> </div> - ${h.submit('reset_stats_%s' % c.repo_info.repo_name,_('Reset Statistics'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to remove current statistics.')+"');")} + ${h.submit('reset_stats_%s' % c.repo_info.repo_name,_('Reset Statistics'),class_="btn btn-default btn-sm",onclick="return confirm('"+_('Confirm to remove current statistics.')+"');")} </div> </div> ${h.end_form()}
--- a/kallithea/templates/admin/repos/repos.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/repos/repos.html Sun Sep 18 19:39:36 2016 +0200 @@ -19,7 +19,7 @@ <ul class="links"> %if h.HasPermissionAny('hg.admin','hg.create.repository')(): <li> - <a href="${h.url('new_repo')}" class="btn btn-small btn-success"><i class="icon-plus"></i> ${_('Add Repository')}</a> + <a href="${h.url('new_repo')}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Add Repository')}</a> </li> %endif </ul>
--- a/kallithea/templates/admin/settings/settings_email.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_email.html Sun Sep 18 19:39:36 2016 +0200 @@ -12,7 +12,7 @@ </div> <div class="buttons"> - ${h.submit('send',_('Send'),class_="btn")} + ${h.submit('send',_('Send'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/settings/settings_global.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_global.html Sun Sep 18 19:39:36 2016 +0200 @@ -58,8 +58,8 @@ </div> <div class="buttons"> - ${h.submit('save',_('Save Settings'),class_="btn")} - ${h.reset('reset',_('Reset'),class_="btn")} + ${h.submit('save',_('Save Settings'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/settings/settings_hooks.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_hooks.html Sun Sep 18 19:39:36 2016 +0200 @@ -50,7 +50,7 @@ </div> </div> <div class="buttons" style="margin-left:280px"> - ${h.submit('save',_('Save'),class_="btn")} + ${h.submit('save',_('Save'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/settings/settings_mapping.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_mapping.html Sun Sep 18 19:39:36 2016 +0200 @@ -32,7 +32,7 @@ </div> <div class="buttons"> - ${h.submit('rescan',_('Rescan Repositories'),class_="btn")} + ${h.submit('rescan',_('Rescan Repositories'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/settings/settings_search.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_search.html Sun Sep 18 19:39:36 2016 +0200 @@ -18,7 +18,7 @@ </div> <div class="buttons"> - ${h.submit('reindex',_('Reindex'),class_="btn")} + ${h.submit('reindex',_('Reindex'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/settings/settings_vcs.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_vcs.html Sun Sep 18 19:39:36 2016 +0200 @@ -54,7 +54,7 @@ ${h.text('paths_root_path',size=60,readonly="readonly")} <span id="path_unlock" class="tooltip" style="cursor: pointer" title="${_('Click to unlock. You must restart Kallithea in order to make this setting take effect.')}"> - <div class="btn btn-small"><i id="path_unlock_icon" class="icon-lock"></i></div> + <div class="btn btn-default btn-sm"><i id="path_unlock_icon" class="icon-lock"></i></div> </span> <span class="help-block">${_('Filesystem location where repositories are stored. After changing this value, a restart and rescan of the repository folder are both required.')}</span> </div> @@ -64,8 +64,8 @@ ${h.hidden('paths_root_path',size=30,readonly="readonly")} %endif <div class="buttons"> - ${h.submit('save',_('Save Settings'),class_="btn")} - ${h.reset('reset',_('Reset'),class_="btn")} + ${h.submit('save',_('Save Settings'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/settings/settings_visual.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_visual.html Sun Sep 18 19:39:36 2016 +0200 @@ -116,8 +116,8 @@ </div> <div class="buttons"> - ${h.submit('save',_('Save Settings'),class_="btn")} - ${h.reset('reset',_('Reset'),class_="btn")} + ${h.submit('save',_('Save Settings'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div>
--- a/kallithea/templates/admin/user_groups/user_group_add.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/user_groups/user_group_add.html Sun Sep 18 19:39:36 2016 +0200 @@ -54,7 +54,7 @@ </div> <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn")} + ${h.submit('save',_('Save'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/user_groups/user_group_edit_advanced.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/user_groups/user_group_edit_advanced.html Sun Sep 18 19:39:36 2016 +0200 @@ -15,7 +15,7 @@ </dl> ${h.form(h.url('delete_users_group', id=c.user_group.users_group_id))} - <button class="btn btn-small btn-danger" type="submit" + <button class="btn btn-danger btn-sm" type="submit" onclick="return confirm('${_('Confirm to delete this user group: %s') % c.user_group.users_group_name}');"> <i class="icon-minus-circled"></i> ${_('Delete this user group')}
--- a/kallithea/templates/admin/user_groups/user_group_edit_perms.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/user_groups/user_group_edit_perms.html Sun Sep 18 19:39:36 2016 +0200 @@ -101,8 +101,8 @@ </table> </div> <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn")} - ${h.reset('reset',_('Reset'),class_="btn")} + ${h.submit('save',_('Save'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/user_groups/user_group_edit_settings.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/user_groups/user_group_edit_settings.html Sun Sep 18 19:39:36 2016 +0200 @@ -57,7 +57,7 @@ </div> <div class="buttons"> - ${h.submit('Save',_('Save'),class_="btn")} + ${h.submit('Save',_('Save'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/user_groups/user_groups.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/user_groups/user_groups.html Sun Sep 18 19:39:36 2016 +0200 @@ -22,7 +22,7 @@ <ul class="links"> %if h.HasPermissionAny('hg.admin', 'hg.usergroup.create.true')(): <li> - <a href="${h.url('new_users_group')}" class="btn btn-small btn-success"><i class="icon-plus"></i> ${_('Add User Group')}</a> + <a href="${h.url('new_users_group')}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Add User Group')}</a> </li> %endif </ul>
--- a/kallithea/templates/admin/users/user_add.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/users/user_add.html Sun Sep 18 19:39:36 2016 +0200 @@ -93,7 +93,7 @@ ${h.hidden('extern_type', c.default_extern_type)} ${h.hidden('extern_name', c.default_extern_name)} <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn")} + ${h.submit('save',_('Save'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/users/user_edit_advanced.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_advanced.html Sun Sep 18 19:39:36 2016 +0200 @@ -17,7 +17,7 @@ </dl> ${h.form(h.url('delete_user', id=c.user.user_id))} - <button class="btn btn-small btn-danger" type="submit" + <button class="btn btn-danger btn-sm" type="submit" onclick="return confirm('${_('Confirm to delete this user: %s') % c.user.username}');"> <i class="icon-minus-circled"></i> ${_('Delete this user')}
--- a/kallithea/templates/admin/users/user_edit_api_keys.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_api_keys.html Sun Sep 18 19:39:36 2016 +0200 @@ -3,14 +3,14 @@ <tr> <td style="width: 450px"><div class="truncate autoexpand" style="width:120px;font-size:16px;font-family: monospace">${c.user.api_key}</div></td> <td> - <span class="btn btn-mini btn-success disabled">${_('Built-in')}</span> + <span class="btn btn-success btn-xs disabled">${_('Built-in')}</span> </td> <td>${_('Expires')}: ${_('Never')}</td> <td> ${h.form(url('edit_user_api_keys_delete', id=c.user.user_id))} ${h.hidden('del_api_key',c.user.api_key)} ${h.hidden('del_api_key_builtin',1)} - <button class="btn btn-mini btn-danger" type="submit" + <button class="btn btn-danger btn-xs" type="submit" onclick="return confirm('${_('Confirm to reset this API key: %s') % c.user.api_key}');"> ${_('Reset')} </button> @@ -36,7 +36,7 @@ <td> ${h.form(url('edit_user_api_keys_delete', id=c.user.user_id))} ${h.hidden('del_api_key',api_key.api_key)} - <button class="btn btn-mini btn-danger" type="submit" + <button class="btn btn-danger btn-xs" type="submit" onclick="return confirm('${_('Confirm to remove this API key: %s') % api_key.api_key}');"> <i class="icon-minus-circled"></i> ${_('Remove')} @@ -66,8 +66,8 @@ </div> </div> <div class="buttons"> - ${h.submit('save',_('Add'),class_="btn")} - ${h.reset('reset',_('Reset'),class_="btn")} + ${h.submit('save',_('Add'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/users/user_edit_emails.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_emails.html Sun Sep 18 19:39:36 2016 +0200 @@ -6,7 +6,7 @@ %endif <td><div class="email">${c.user.email}</div></td> <td> - <span class="btn btn-mini btn-success disabled">${_('Primary')}</span> + <span class="btn btn-success btn-xs disabled">${_('Primary')}</span> </td> </tr> %if c.user_email_map: @@ -46,8 +46,8 @@ </div> </div> <div class="buttons"> - ${h.submit('save',_('Add'),class_="btn")} - ${h.reset('reset',_('Reset'),class_="btn")} + ${h.submit('save',_('Add'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/users/user_edit_ips.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_ips.html Sun Sep 18 19:39:36 2016 +0200 @@ -46,8 +46,8 @@ </div> </div> <div class="buttons"> - ${h.submit('save',_('Add'),class_="btn")} - ${h.reset('reset',_('Reset'),class_="btn")} + ${h.submit('save',_('Add'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/users/user_edit_profile.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_profile.html Sun Sep 18 19:39:36 2016 +0200 @@ -110,8 +110,8 @@ </div> <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn")} - ${h.reset('reset',_('Reset'),class_="btn")} + ${h.submit('save',_('Save'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/users/users.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/admin/users/users.html Sun Sep 18 19:39:36 2016 +0200 @@ -20,7 +20,7 @@ ${self.breadcrumbs()} <ul class="links"> <li> - <a href="${h.url('new_user')}" class="btn btn-small btn-success"><i class="icon-plus"></i> ${_('Add User')}</a> + <a href="${h.url('new_user')}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Add User')}</a> </li> </ul> </div>
--- a/kallithea/templates/base/base.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/base/base.html Sun Sep 18 19:39:36 2016 +0200 @@ -409,7 +409,7 @@ %endif </div> <div class="submit"> - ${h.submit('sign_in',_('Log In'),class_="btn btn-mini")} + ${h.submit('sign_in',_('Log In'),class_="btn btn-default btn-xs")} </div> </div> </div>
--- a/kallithea/templates/base/default_perms_box.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/base/default_perms_box.html Sun Sep 18 19:39:36 2016 +0200 @@ -61,8 +61,8 @@ </div> <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn")} - ${h.reset('reset',_('Reset'),class_="btn")} + ${h.submit('save',_('Save'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/changelog/changelog.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/changelog/changelog.html Sun Sep 18 19:39:36 2016 +0200 @@ -39,19 +39,19 @@ <div class="container_header"> <div style="float:left; margin-left:20px;"> ${h.form(h.url.current(),method='get',style="display:inline")} - ${h.submit('set',_('Show'),class_="btn btn-small")} + ${h.submit('set',_('Show'),class_="btn btn-default btn-sm")} ${h.text('size',size=3,value=c.size)} ${_('revisions')} %if c.branch_name: ${h.hidden('branch', c.branch_name)} %endif ${h.end_form()} - <a href="#" class="btn btn-small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a> + <a href="#" class="btn btn-default btn-sm" id="rev_range_clear" style="display:none">${_('Clear selection')}</a> </div> <div style="float: right; margin: 0px 0px 0px 4px"> - <a href="#" class="btn btn-small" id="rev_range_container" style="display:none"></a> + <a href="#" class="btn btn-default btn-sm" id="rev_range_container" style="display:none"></a> %if c.revision: - <a class="btn btn-small" href="${h.url('changelog_home', repo_name=c.repo_name)}"> + <a class="btn btn-default btn-sm" href="${h.url('changelog_home', repo_name=c.repo_name)}"> ${_('Go to tip of repository')} </a> %endif @@ -59,10 +59,10 @@ <a id="compare_fork" title="${_('Compare fork with %s' % c.db_repo.fork.repo_name)}" href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}" - class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare fork with parent repository (%s)' % c.db_repo.fork.repo_name)}</a> + class="btn btn-default btn-sm"><i class="icon-git-compare"></i> ${_('Compare fork with parent repository (%s)' % c.db_repo.fork.repo_name)}</a> %endif ## text and href of open_new_pr is controlled from javascript - <a id="open_new_pr" class="btn btn-small"></a> + <a id="open_new_pr" class="btn btn-default btn-sm"></a> ${_("Branch filter:")} ${h.select('branch_filter',c.branch_name,c.branch_filters)} </div> </div>
--- a/kallithea/templates/changelog/changelog_summary_data.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/changelog/changelog_summary_data.html Sun Sep 18 19:39:36 2016 +0200 @@ -84,7 +84,7 @@ <h4>${_('Add or upload files directly via Kallithea')}</h4> <div style="margin: 20px 30px;"> <div id="add_node_id" class="add_node"> - <a class="btn btn-mini" href="${h.url('files_add_home',repo_name=c.repo_name,revision=0,f_path='', anchor='edit')}">${_('Add New File')}</a> + <a class="btn btn-default btn-xs" href="${h.url('files_add_home',repo_name=c.repo_name,revision=0,f_path='', anchor='edit')}">${_('Add New File')}</a> </div> </div> %endif
--- a/kallithea/templates/changeset/changeset_file_comment.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/changeset/changeset_file_comment.html Sun Sep 18 19:39:36 2016 +0200 @@ -26,7 +26,7 @@ %if co.author_id == c.authuser.user_id or h.HasRepoPermissionAny('repository.admin')(c.repo_name): %if co.deletable(): - <div onClick="confirm('${_("Delete comment?")}') && deleteComment(${co.comment_id})" class="buttons delete-comment btn btn-mini" style="margin:0 5px">${_('Delete')}</div> + <div onClick="confirm('${_("Delete comment?")}') && deleteComment(${co.comment_id})" class="buttons delete-comment btn btn-default btn-xs" style="margin:0 5px">${_('Delete')}</div> %endif %endif </div> @@ -99,8 +99,8 @@ </div> <div class="comment-button"> <div class="submitting-overlay">${_('Submitting ...')}</div> - ${h.submit('save', _('Comment'), class_='btn btn-small save-inline-form')} - ${h.reset('hide-inline-form', _('Cancel'), class_='btn btn-small hide-inline-form')} + ${h.submit('save', _('Comment'), class_='btn btn-default btn-sm save-inline-form')} + ${h.reset('hide-inline-form', _('Cancel'), class_='btn btn-default btn-sm hide-inline-form')} </div> ${h.end_form()} %else: @@ -111,7 +111,7 @@ </div> </div> <div class="comment-button"> - ${h.reset('hide-inline-form', _('Hide'), class_='btn btn-small hide-inline-form')} + ${h.reset('hide-inline-form', _('Hide'), class_='btn btn-default btn-sm hide-inline-form')} </div> ${h.end_form()} %endif
--- a/kallithea/templates/changeset/changeset_range.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/changeset/changeset_range.html Sun Sep 18 19:39:36 2016 +0200 @@ -30,7 +30,7 @@ ${h.show_id(c.cs_ranges[0])} <i class="icon-right"></i> ${h.show_id(c.cs_ranges[-1])} - <a style="font-weight: bold" href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref_name=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref_name=c.cs_ranges[-1].raw_id)}" class="btn btn-small"><i class="icon-git-compare"></i> Compare Revisions</a> + <a style="font-weight: bold" href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref_name=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref_name=c.cs_ranges[-1].raw_id)}" class="btn btn-default btn-sm"><i class="icon-git-compare"></i> Compare Revisions</a> </div> </div> </div>
--- a/kallithea/templates/compare/compare_diff.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/compare/compare_diff.html Sun Sep 18 19:39:36 2016 +0200 @@ -36,9 +36,9 @@ ${h.hidden('compare_other')} </div><div> %if not c.compare_home: - <a class="btn btn-small" href="${c.swap_url}"><i class="icon-arrows-cw"></i> ${_('Swap')}</a> + <a class="btn btn-default btn-sm" href="${c.swap_url}"><i class="icon-arrows-cw"></i> ${_('Swap')}</a> %endif - <div id="compare_revs" class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare Revisions')}</div> + <div id="compare_revs" class="btn btn-default btn-sm"><i class="icon-git-compare"></i> ${_('Compare Revisions')}</div> </div> </div> </div>
--- a/kallithea/templates/data_table/_dt_elements.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/data_table/_dt_elements.html Sun Sep 18 19:39:36 2016 +0200 @@ -136,11 +136,11 @@ <%def name="repo_state(repo_state)"> <div> %if repo_state == u'repo_state_pending': - <div class="btn btn-mini btn-info disabled">${_('Creating')}</div> + <div class="btn btn-default btn-xs btn-info disabled">${_('Creating')}</div> %elif repo_state == u'repo_state_created': - <div class="btn btn-mini btn-success disabled">${_('Created')}</div> + <div class="btn btn-success btn-xs disabled">${_('Created')}</div> %else: - <div class="btn btn-mini btn-danger disabled" title="${repo_state}">invalid</div> + <div class="btn btn-danger btn-xs disabled" title="${repo_state}">invalid</div> %endif </div> </%def>
--- a/kallithea/templates/files/files_add.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/files/files_add.html Sun Sep 18 19:39:36 2016 +0200 @@ -41,11 +41,11 @@ <span id="filename_container" class="file reviewer_ac"> <input class="input-small" type="text" value="" size="30" name="filename" id="filename" placeholder="${_('Enter filename...')}"> <input type="hidden" value="${c.f_path}" size="30" name="location" id="location"> - ${_('or')} <div class="btn btn-small" id="upload_file_enable">${_('Upload File')}</div> + ${_('or')} <div class="btn btn-default btn-sm" id="upload_file_enable">${_('Upload File')}</div> </span> <span id="upload_file_container" class="reviewer_ac" style="display:none"> <input type="file" size="20" name="upload_file" id="upload_file"> - ${_('or')} <div class="btn btn-small" id="file_enable">${_('Create New File')}</div> + ${_('or')} <div class="btn btn-default btn-sm" id="file_enable">${_('Create New File')}</div> </span> </h3> <div id="body" class="codeblock"> @@ -61,8 +61,8 @@ <textarea id="commit" name="message" style="height: 100px;width: 99%;margin-left:4px" placeholder="${c.default_message}"></textarea> </div> <div style="text-align: left;padding-top: 5px"> - ${h.submit('commit',_('Commit Changes'),class_="btn btn-small btn-success")} - ${h.reset('reset',_('Reset'),class_="btn btn-small")} + ${h.submit('commit',_('Commit Changes'),class_="btn btn-success btn-sm")} + ${h.reset('reset',_('Reset'),class_="btn btn-default btn-sm")} </div> ${h.end_form()} <script type="text/javascript">
--- a/kallithea/templates/files/files_browser.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/files/files_browser.html Sun Sep 18 19:39:36 2016 +0200 @@ -30,9 +30,9 @@ ${h.form(h.url.current())} <div class="info_box"> <div class="info_box_elem rev">${_('Revision')}</div> - <div class="info_box_elem"><a class="btn btn-mini ypjax-link" href="${c.url_prev}" title="${_('Previous revision')}"><i class="icon-left-open"></i></a></div> + <div class="info_box_elem"><a class="btn btn-default btn-xs ypjax-link" href="${c.url_prev}" title="${_('Previous revision')}"><i class="icon-left-open"></i></a></div> <div class="info_box_elem">${h.text('at_rev',value=c.changeset.revision,size=5)}</div> - <div class="info_box_elem"><a class="btn btn-mini ypjax-link" href="${c.url_next}" title="${_('Next revision')}"><i class="icon-right-open"></i></a></div> + <div class="info_box_elem"><a class="btn btn-default btn-xs ypjax-link" href="${c.url_next}" title="${_('Next revision')}"><i class="icon-right-open"></i></a></div> </div> ${h.end_form()} </div> @@ -41,7 +41,7 @@ <label>${_('Follow current branch')}</label> </div> <div id="search_activate_id" class="search_activate"> - <a class="btn btn-mini" id="filter_activate" href="#">${_('Search File List')}</a> + <a class="btn btn-default btn-xs" id="filter_activate" href="#">${_('Search File List')}</a> </div> <div class="browser-search"> <div>
--- a/kallithea/templates/files/files_delete.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/files/files_delete.html Sun Sep 18 19:39:36 2016 +0200 @@ -40,8 +40,8 @@ <textarea id="commit" name="message" style="height: 100px;width: 99%;margin-left:4px" placeholder="${c.default_message}"></textarea> </div> <div style="text-align: left;padding-top: 5px"> - ${h.submit('commit',_('Commit Changes'),class_="btn btn-small btn-success")} - ${h.reset('reset',_('Reset'),class_="btn btn-small")} + ${h.submit('commit',_('Commit Changes'),class_="btn btn-success btn-sm")} + ${h.reset('reset',_('Reset'),class_="btn btn-default btn-sm")} </div> ${h.end_form()} </div>
--- a/kallithea/templates/files/files_edit.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/files/files_edit.html Sun Sep 18 19:39:36 2016 +0200 @@ -45,12 +45,12 @@ <div class="left item">${h.format_byte_size(c.file.size,binary=True)}</div> <div class="left item last">${c.file.mimetype}</div> <div class="buttons"> - ${h.link_to(_('Show Annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-mini")} - ${h.link_to(_('Show as Raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-mini")} - ${h.link_to(_('Download as Raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-mini")} + ${h.link_to(_('Show Annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")} + ${h.link_to(_('Show as Raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")} + ${h.link_to(_('Download as Raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")} % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): % if not c.file.is_binary: - ${h.link_to(_('Source'),h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-mini")} + ${h.link_to(_('Source'),h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")} % endif % endif </div> @@ -64,8 +64,8 @@ <textarea id="commit" name="message" style="height: 60px;width: 99%;margin-left:4px" placeholder="${c.default_message}"></textarea> </div> <div style="text-align: left;padding-top: 5px"> - ${h.submit('commit',_('Commit Changes'),class_="btn btn-small btn-success")} - ${h.reset('reset',_('Reset'),class_="btn btn-small")} + ${h.submit('commit',_('Commit Changes'),class_="btn btn-success btn-sm")} + ${h.reset('reset',_('Reset'),class_="btn btn-default btn-sm")} </div> ${h.end_form()} </div>
--- a/kallithea/templates/files/files_source.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/files/files_source.html Sun Sep 18 19:39:36 2016 +0200 @@ -4,11 +4,11 @@ ${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')} ${h.hidden('diff2',c.changeset.raw_id)} ${h.hidden('diff1')} - ${h.submit('diff',_('Diff to Revision'),class_="btn btn-small")} - ${h.submit('show_rev',_('Show at Revision'),class_="btn btn-small")} + ${h.submit('diff',_('Diff to Revision'),class_="btn btn-default btn-sm")} + ${h.submit('show_rev',_('Show at Revision'),class_="btn btn-default btn-sm")} ${h.hidden('annotate', c.annotate)} - ${h.link_to(_('Show Full History'),h.url('changelog_file_home',repo_name=c.repo_name, revision=c.changeset.raw_id, f_path=c.f_path),class_="btn btn-small")} - ${h.link_to(_('Show Authors'),'#',class_="btn btn-small" ,id="show_authors")} + ${h.link_to(_('Show Full History'),h.url('changelog_file_home',repo_name=c.repo_name, revision=c.changeset.raw_id, f_path=c.f_path),class_="btn btn-default btn-sm")} + ${h.link_to(_('Show Authors'),'#',class_="btn btn-default btn-sm" ,id="show_authors")} ${h.end_form()} </div> @@ -27,22 +27,22 @@ <div class="left item last"><pre>${c.file.mimetype}</pre></div> <div class="buttons"> %if c.annotate: - ${h.link_to(_('Show Source'), h.url('files_home', repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-mini")} + ${h.link_to(_('Show Source'), h.url('files_home', repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")} %else: - ${h.link_to(_('Show Annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-mini")} + ${h.link_to(_('Show Annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")} %endif - ${h.link_to(_('Show as Raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-mini")} - ${h.link_to(_('Download as Raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-mini")} + ${h.link_to(_('Show as Raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")} + ${h.link_to(_('Download as Raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")} % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): %if c.on_branch_head and not c.file.is_binary: - ${h.link_to(_('Edit on Branch: %s') % c.changeset.branch, h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit'),class_="btn btn-mini")} - ${h.link_to(_('Delete'), h.url('files_delete_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit'),class_="btn btn-mini btn-danger")} + ${h.link_to(_('Edit on Branch: %s') % c.changeset.branch, h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit'),class_="btn btn-default btn-xs")} + ${h.link_to(_('Delete'), h.url('files_delete_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit'),class_="btn btn-danger btn-xs")} %elif c.on_branch_head and c.file.is_binary: - ${h.link_to(_('Edit'), '#', class_="btn btn-mini disabled tooltip", title=_('Editing binary files not allowed'))} - ${h.link_to(_('Delete'), h.url('files_delete_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit'),class_="btn btn-mini btn-danger")} + ${h.link_to(_('Edit'), '#', class_="btn btn-default btn-xs disabled tooltip", title=_('Editing binary files not allowed'))} + ${h.link_to(_('Delete'), h.url('files_delete_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit'),class_="btn btn-danger btn-xs")} %else: - ${h.link_to(_('Edit'), '#', class_="btn btn-mini disabled tooltip", title=_('Editing files allowed only when on branch head revision'))} - ${h.link_to(_('Delete'), '#', class_="btn btn-mini btn-danger disabled tooltip", title=_('Deleting files allowed only when on branch head revision'))} + ${h.link_to(_('Edit'), '#', class_="btn btn-default btn-xs disabled tooltip", title=_('Editing files allowed only when on branch head revision'))} + ${h.link_to(_('Delete'), '#', class_="btn btn-danger btn-xs disabled tooltip", title=_('Deleting files allowed only when on branch head revision'))} % endif % endif </div>
--- a/kallithea/templates/forks/fork.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/forks/fork.html Sun Sep 18 19:39:36 2016 +0200 @@ -93,7 +93,7 @@ </div> %endif <div class="buttons"> - ${h.submit('',_('Fork this Repository'),class_="btn")} + ${h.submit('',_('Fork this Repository'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/forks/forks_data.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/forks/forks_data.html Sun Sep 18 19:39:36 2016 +0200 @@ -16,7 +16,7 @@ <span class="tooltip" title="${h.fmt_date(f.created_on)}"> ${h.age(f.created_on)}</span> <a title="${_('Compare fork with %s') % c.repo_name}" href="${h.url('compare_url',repo_name=c.repo_name, org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=f.repo_name,other_ref_type=c.db_repo.landing_rev[0],other_ref_name=c.db_repo.landing_rev[1], merge=1)}" - class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare Fork')}</a> + class="btn btn-default btn-sm"><i class="icon-git-compare"></i> ${_('Compare Fork')}</a> </div> <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div> </div>
--- a/kallithea/templates/index_base.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/index_base.html Sun Sep 18 19:39:36 2016 +0200 @@ -14,19 +14,19 @@ %> %if h.HasPermissionAny('hg.admin','hg.create.repository')() or (group_admin or (group_write and create_on_write)): %if c.group: - <a href="${h.url('new_repo',parent_group=c.group.group_id)}" class="btn btn-small"><i class="icon-plus"></i> ${_('Add Repository')}</a> + <a href="${h.url('new_repo',parent_group=c.group.group_id)}" class="btn btn-default btn-sm"><i class="icon-plus"></i> ${_('Add Repository')}</a> %if h.HasPermissionAny('hg.admin')() or h.HasRepoGroupPermissionAny('group.admin')(c.group.group_name): - <a href="${h.url('new_repos_group', parent_group=c.group.group_id)}" class="btn btn-small"><i class="icon-plus"></i> ${_('Add Repository Group')}</a> + <a href="${h.url('new_repos_group', parent_group=c.group.group_id)}" class="btn btn-default btn-sm"><i class="icon-plus"></i> ${_('Add Repository Group')}</a> %endif %else: - <a href="${h.url('new_repo')}" class="btn btn-small"><i class="icon-plus"></i> ${_('Add Repository')}</a> + <a href="${h.url('new_repo')}" class="btn btn-default btn-sm"><i class="icon-plus"></i> ${_('Add Repository')}</a> %if h.HasPermissionAny('hg.admin')(): - <a href="${h.url('new_repos_group')}" class="btn btn-small"><i class="icon-plus"></i> ${_('Add Repository Group')}</a> + <a href="${h.url('new_repos_group')}" class="btn btn-default btn-sm"><i class="icon-plus"></i> ${_('Add Repository Group')}</a> %endif %endif %endif %if c.group and h.HasRepoGroupPermissionAny('group.admin')(c.group.group_name): - <a href="${h.url('edit_repo_group',group_name=c.group.group_name)}" title="${_('You have admin right to this group, and can edit it')}" class="btn btn-small"><i class="icon-pencil"></i> ${_('Edit Repository Group')}</a> + <a href="${h.url('edit_repo_group',group_name=c.group.group_name)}" title="${_('You have admin right to this group, and can edit it')}" class="btn btn-default btn-sm"><i class="icon-pencil"></i> ${_('Edit Repository Group')}</a> %endif </li> </ul>
--- a/kallithea/templates/journal/journal.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/journal/journal.html Sun Sep 18 19:39:36 2016 +0200 @@ -8,7 +8,7 @@ <form id="filter_form"> <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('quick filter...')}"/> <span class="tooltip" title="${h.journal_filter_help()}">?</span> - <input type='submit' value="${_('Filter')}" class="btn btn-small" style="padding:0px 2px 0px 2px;margin:0px"/> + <input type='submit' value="${_('Filter')}" class="btn btn-default btn-sm" style="padding:0px 2px 0px 2px;margin:0px"/> ${_('Journal')} - ${ungettext('%s Entry', '%s Entries', c.journal_pager.item_count) % (c.journal_pager.item_count)} </form> ${h.end_form()}
--- a/kallithea/templates/password_reset.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/password_reset.html Sun Sep 18 19:39:36 2016 +0200 @@ -43,7 +43,7 @@ <div class="buttons"> <div class="nohighlight"> - ${h.submit('send',_('Send Password Reset Email'),class_="btn")} + ${h.submit('send',_('Send Password Reset Email'),class_="btn btn-default")} <div class="activation_msg">${_('A password reset link will be sent to the specified email address if it is registered in the system.')}</div> </div> </div>
--- a/kallithea/templates/password_reset_confirmation.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/password_reset_confirmation.html Sun Sep 18 19:39:36 2016 +0200 @@ -53,7 +53,7 @@ </div> <div class="buttons"> <div class="nohighlight"> - ${h.submit('send',_('Confirm'),class_="btn")} + ${h.submit('send',_('Confirm'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/pullrequests/pullrequest.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/pullrequests/pullrequest.html Sun Sep 18 19:39:36 2016 +0200 @@ -85,8 +85,8 @@ <div class="field"> <div class="buttons"> - ${h.submit('save',_('Create Pull Request'),class_="btn")} - ${h.reset('reset',_('Reset'),class_="btn")} + ${h.submit('save',_('Create Pull Request'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div>
--- a/kallithea/templates/pullrequests/pullrequest_show.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Sun Sep 18 19:39:36 2016 +0200 @@ -38,7 +38,7 @@ <label>${_('Description')}:</label> %if editable: <div style="margin: 5px"> - <a class="btn btn-small" onclick="$('.pr-do-edit').show();$('.pr-not-edit').hide()">${_("Edit")}</a> + <a class="btn btn-default btn-sm" onclick="$('.pr-do-edit').show();$('.pr-not-edit').hide()">${_("Edit")}</a> </div> %endif </div> @@ -290,9 +290,9 @@ <div class="fields"> %if editable: <div class="buttons"> - ${h.submit('pr-form-save',_('Save Changes'),class_="btn btn-small")} - ${h.submit('pr-form-clone',_('Create New Iteration with Changes'),class_="btn btn-small",disabled='disabled')} - ${h.reset('pr-form-reset',_('Cancel Changes'),class_="btn btn-small")} + ${h.submit('pr-form-save',_('Save Changes'),class_="btn btn-default btn-sm")} + ${h.submit('pr-form-clone',_('Create New Iteration with Changes'),class_="btn btn-default btn-sm",disabled='disabled')} + ${h.reset('pr-form-reset',_('Cancel Changes'),class_="btn btn-default btn-sm")} </div> %endif </div>
--- a/kallithea/templates/pullrequests/pullrequest_show_all.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show_all.html Sun Sep 18 19:39:36 2016 +0200 @@ -29,14 +29,14 @@ <li> %if c.authuser.username != 'default': <span> - <a id="open_new_pr" class="btn btn-small btn-success" href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-plus"></i> ${_('Open New Pull Request')}</a> + <a id="open_new_pr" class="btn btn-success btn-sm" href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-plus"></i> ${_('Open New Pull Request')}</a> </span> %endif <span> %if c.from_: - <a class="btn btn-small" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed)}"><i class="icon-git-compare"></i> ${_('Show Pull Requests to %s') % c.repo_name}</a> + <a class="btn btn-default btn-sm" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed)}"><i class="icon-git-compare"></i> ${_('Show Pull Requests to %s') % c.repo_name}</a> %else: - <a class="btn btn-small" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed,from_=1)}"><i class="icon-git-compare"></i> ${_("Show Pull Requests from '%s'") % c.repo_name}</a> + <a class="btn btn-default btn-sm" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed,from_=1)}"><i class="icon-git-compare"></i> ${_("Show Pull Requests from '%s'") % c.repo_name}</a> %endif </span> </li>
--- a/kallithea/templates/register.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/register.html Sun Sep 18 19:39:36 2016 +0200 @@ -87,7 +87,7 @@ <div class="buttons"> <div class="nohighlight"> - ${h.submit('sign_up',_('Sign Up'),class_="btn")} + ${h.submit('sign_up',_('Sign Up'),class_="btn btn-default")} %if c.auto_active: <div class="activation_msg">${_('Registered accounts are ready to use and need no further action.')}</div> %else:
--- a/kallithea/templates/summary/statistics.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/summary/statistics.html Sun Sep 18 19:39:36 2016 +0200 @@ -33,7 +33,7 @@ %if c.no_data: ${c.no_data_msg} %if h.HasPermissionAny('hg.admin')('enable stats on from summary'): - ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name),class_="btn btn-mini")} + ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name),class_="btn btn-default btn-xs")} %endif %else: ${_('Stats gathered: ')} ${c.stats_percentage}%
--- a/kallithea/templates/summary/summary.html Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/templates/summary/summary.html Sun Sep 18 19:39:36 2016 +0200 @@ -75,8 +75,8 @@ ${self.repotag(c.db_repo)} <input style="width:80%" type="text" id="clone_url" readonly="readonly" value="${c.clone_repo_url}"/> <input style="display:none;width:80%" type="text" id="clone_url_id" readonly="readonly" value="${c.clone_repo_url_id}"/> - <div style="display:none" id="clone_by_name" class="btn btn-small">${_('Show by Name')}</div> - <div id="clone_by_id" class="btn btn-small">${_('Show by ID')}</div> + <div style="display:none" id="clone_by_name" class="btn btn-default btn-sm">${_('Show by Name')}</div> + <div id="clone_by_id" class="btn btn-default btn-sm">${_('Show by ID')}</div> </div> </div> @@ -97,7 +97,7 @@ %else: ${_('Statistics are disabled for this repository')} %if h.HasPermissionAny('hg.admin')('enable stats on from summary'): - ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name, anchor='repo_enable_statistics'),class_="btn btn-mini")} + ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name, anchor='repo_enable_statistics'),class_="btn btn-default btn-xs")} %endif %endif </div> @@ -113,11 +113,11 @@ %elif not c.enable_downloads: ${_('Downloads are disabled for this repository')} %if h.HasPermissionAny('hg.admin')('enable downloads on from summary'): - ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name, anchor='repo_enable_downloads'),class_="btn btn-mini")} + ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name, anchor='repo_enable_downloads'),class_="btn btn-default btn-xs")} %endif %else: <span id="${'zip_link'}"> - <a class="btn btn-small" href="${h.url('files_archive_home',repo_name=c.db_repo.repo_name,fname='tip.zip')}"><i class="icon-file-zip"></i> ${_('Download as zip')}</a> + <a class="btn btn-default btn-sm" href="${h.url('files_archive_home',repo_name=c.db_repo.repo_name,fname='tip.zip')}"><i class="icon-file-zip"></i> ${_('Download as zip')}</a> </span> ${h.hidden('download_options')} <span style="vertical-align: bottom"> @@ -304,7 +304,7 @@ var tmpl_links = {}; %for cnt,archive in enumerate(c.db_repo_scm_instance._get_archives()): - tmpl_links["${archive['type']}"] = '${h.link_to('__NAME__', h.url('files_archive_home',repo_name=c.db_repo.repo_name, fname='__CS__'+archive['extension'],subrepos='__SUB__'),class_='btn btn-small')}'; + tmpl_links["${archive['type']}"] = '${h.link_to('__NAME__', h.url('files_archive_home',repo_name=c.db_repo.repo_name, fname='__CS__'+archive['extension'],subrepos='__SUB__'),class_='btn btn-default btn-sm')}'; %endfor }); </script>
--- a/kallithea/tests/functional/test_admin_gists.py Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/tests/functional/test_admin_gists.py Sun Sep 18 19:39:36 2016 +0200 @@ -73,7 +73,7 @@ response = response.follow() response.mustcontain('added file: foo') response.mustcontain('gist test') - response.mustcontain('<div class="btn btn-mini btn-success disabled">Public Gist</div>') + response.mustcontain('<div class="btn btn-success btn-xs disabled">Public Gist</div>') def test_create_with_path_with_dirs(self): self.log_user() @@ -106,7 +106,7 @@ response = response.follow() response.mustcontain('added file: private-foo<') response.mustcontain('private gist test') - response.mustcontain('<div class="btn btn-mini btn-warning disabled">Private Gist</div>') + response.mustcontain('<div class="btn btn-warning btn-xs disabled">Private Gist</div>') def test_create_with_description(self): self.log_user() @@ -122,7 +122,7 @@ response.mustcontain('added file: foo-desc') response.mustcontain('gist test') response.mustcontain('gist-desc') - response.mustcontain('<div class="btn btn-mini btn-success disabled">Public Gist</div>') + response.mustcontain('<div class="btn btn-success btn-xs disabled">Public Gist</div>') def test_new(self): self.log_user() @@ -152,7 +152,7 @@ response.mustcontain('added file: gist-show-me<') response.mustcontain('%s - created' % TEST_USER_ADMIN_LOGIN) response.mustcontain('gist-desc') - response.mustcontain('<div class="btn btn-mini btn-success disabled">Public Gist</div>') + response.mustcontain('<div class="btn btn-success btn-xs disabled">Public Gist</div>') def test_show_as_raw(self): gist = _create_gist('gist-show-me', content='GIST CONTENT')
--- a/kallithea/tests/functional/test_compare.py Tue Oct 18 23:29:23 2016 +0200 +++ b/kallithea/tests/functional/test_compare.py Sun Sep 18 19:39:36 2016 +0200 @@ -73,7 +73,7 @@ ## files response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""") #swap - response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) + response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) def test_compare_forks_on_branch_extra_commits_git(self): self.log_user() @@ -124,7 +124,7 @@ ## files response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""") #swap - response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) + response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) def test_compare_forks_on_branch_extra_commits_origin_has_incoming_hg(self): self.log_user() @@ -183,7 +183,7 @@ ## files response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""") #swap - response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) + response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) def test_compare_forks_on_branch_extra_commits_origin_has_incoming_git(self): self.log_user() @@ -242,7 +242,7 @@ ## files response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""") #swap - response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) + response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) def test_compare_cherry_pick_changesets_from_bottom(self):