Mercurial > kallithea
changeset 6279:20830dfe3ed8
style: adjust button sizes to be more like Bootstrap and change some btn-sm to btn-xs
Based on work by Dominik Ruf.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Thu, 20 Oct 2016 20:04:28 +0200 |
parents | af5eef651c77 |
children | 9cbf386ea529 |
files | kallithea/public/css/style.css kallithea/templates/admin/admin.html kallithea/templates/admin/gists/edit.html kallithea/templates/admin/gists/index.html kallithea/templates/admin/repo_groups/repo_group_edit.html kallithea/templates/admin/repo_groups/repo_groups.html kallithea/templates/admin/repos/repos.html kallithea/templates/admin/users/users.html kallithea/templates/files/files_edit.html kallithea/templates/index_base.html kallithea/templates/journal/journal.html kallithea/templates/pullrequests/pullrequest_show.html kallithea/templates/pullrequests/pullrequest_show_all.html |
diffstat | 13 files changed, 23 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/style.css Thu Oct 20 19:54:19 2016 +0200 +++ b/kallithea/public/css/style.css Thu Oct 20 20:04:28 2016 +0200 @@ -3126,6 +3126,7 @@ cursor: pointer !important; padding: 3px 3px 3px 3px; display: inline-block; + white-space: nowrap; } ul.nav-stacked { @@ -3165,11 +3166,11 @@ } .btn.btn-sm { - padding: 2px 6px; + padding: 3px 8px; } .btn.btn-xs { - padding: 0px 4px; + padding: 1px 5px; } .btn:focus {
--- a/kallithea/templates/admin/admin.html Thu Oct 20 19:54:19 2016 +0200 +++ b/kallithea/templates/admin/admin.html Thu Oct 20 20:04:28 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-default btn-xs" style="padding:0px 2px 0px 2px;margin:0px"/> + <input type='submit' value="${_('Filter')}" class="btn btn-default btn-xs"/> ${_('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/gists/edit.html Thu Oct 20 19:54:19 2016 +0200 +++ b/kallithea/templates/admin/gists/edit.html Thu Oct 20 20:04:28 2016 +0200 @@ -141,8 +141,8 @@ %endfor <div style="padding-top: 5px"> - ${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> + ${h.submit('update',_('Update Gist'),class_="btn btn-success")} + <a class="btn btn-default" 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 Thu Oct 20 19:54:19 2016 +0200 +++ b/kallithea/templates/admin/gists/index.html Thu Oct 20 20:04:28 2016 +0200 @@ -34,7 +34,7 @@ %if c.authuser.username != 'default': <ul class="links"> <li> - <a href="${h.url('new_gist')}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Create New Gist')}</a> + <a href="${h.url('new_gist')}" class="btn btn-success btn-xs"><i class="icon-plus"></i> ${_('Create New Gist')}</a> </li> </ul> %endif
--- a/kallithea/templates/admin/repo_groups/repo_group_edit.html Thu Oct 20 19:54:19 2016 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit.html Thu Oct 20 20:04:28 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-success btn-sm"><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-xs"><i class="icon-plus"></i> ${_('Add Child Group')}</a> </li> </ul> </%def>
--- a/kallithea/templates/admin/repo_groups/repo_groups.html Thu Oct 20 19:54:19 2016 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_groups.html Thu Oct 20 20:04:28 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-success btn-sm"><i class="icon-plus"></i> ${_('Add Repository Group')}</a> + <a href="${h.url('new_repos_group')}" class="btn btn-success btn-xs"><i class="icon-plus"></i> ${_('Add Repository Group')}</a> </li> %endif </ul>
--- a/kallithea/templates/admin/repos/repos.html Thu Oct 20 19:54:19 2016 +0200 +++ b/kallithea/templates/admin/repos/repos.html Thu Oct 20 20:04:28 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-success btn-sm"><i class="icon-plus"></i> ${_('Add Repository')}</a> + <a href="${h.url('new_repo')}" class="btn btn-success btn-xs"><i class="icon-plus"></i> ${_('Add Repository')}</a> </li> %endif </ul>
--- a/kallithea/templates/admin/users/users.html Thu Oct 20 19:54:19 2016 +0200 +++ b/kallithea/templates/admin/users/users.html Thu Oct 20 20:04:28 2016 +0200 @@ -20,7 +20,7 @@ ${self.breadcrumbs()} <ul class="links"> <li> - <a href="${h.url('new_user')}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Add User')}</a> + <a href="${h.url('new_user')}" class="btn btn-success btn-xs"><i class="icon-plus"></i> ${_('Add User')}</a> </li> </ul> </div>
--- a/kallithea/templates/files/files_edit.html Thu Oct 20 19:54:19 2016 +0200 +++ b/kallithea/templates/files/files_edit.html Thu Oct 20 20:04:28 2016 +0200 @@ -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-success btn-sm")} - ${h.reset('reset',_('Reset'),class_="btn btn-default btn-sm")} + ${h.submit('commit',_('Commit Changes'),class_="btn btn-success")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> ${h.end_form()} </div>
--- a/kallithea/templates/index_base.html Thu Oct 20 19:54:19 2016 +0200 +++ b/kallithea/templates/index_base.html Thu Oct 20 20:04:28 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-default btn-sm"><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-xs"><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-default btn-sm"><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-xs"><i class="icon-plus"></i> ${_('Add Repository Group')}</a> %endif %else: - <a href="${h.url('new_repo')}" class="btn btn-default btn-sm"><i class="icon-plus"></i> ${_('Add Repository')}</a> + <a href="${h.url('new_repo')}" class="btn btn-default btn-xs"><i class="icon-plus"></i> ${_('Add Repository')}</a> %if h.HasPermissionAny('hg.admin')(): - <a href="${h.url('new_repos_group')}" class="btn btn-default btn-sm"><i class="icon-plus"></i> ${_('Add Repository Group')}</a> + <a href="${h.url('new_repos_group')}" class="btn btn-default btn-xs"><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-default btn-sm"><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-xs"><i class="icon-pencil"></i> ${_('Edit Repository Group')}</a> %endif </li> </ul>
--- a/kallithea/templates/journal/journal.html Thu Oct 20 19:54:19 2016 +0200 +++ b/kallithea/templates/journal/journal.html Thu Oct 20 20:04:28 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-default btn-sm" style="padding:0px 2px 0px 2px;margin:0px"/> + <input type='submit' value="${_('Filter')}" class="btn btn-default btn-xs"/> ${_('Journal')} - ${ungettext('%s Entry', '%s Entries', c.journal_pager.item_count) % (c.journal_pager.item_count)} </form> ${h.end_form()}
--- a/kallithea/templates/pullrequests/pullrequest_show.html Thu Oct 20 19:54:19 2016 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Thu Oct 20 20:04:28 2016 +0200 @@ -38,7 +38,7 @@ <label>${_('Description')}:</label> %if editable: <div style="margin: 5px"> - <a class="btn btn-default btn-sm" onclick="$('.pr-do-edit').show();$('.pr-not-edit').hide()">${_("Edit")}</a> + <a class="btn btn-default btn-xs" onclick="$('.pr-do-edit').show();$('.pr-not-edit').hide()">${_("Edit")}</a> </div> %endif </div>
--- a/kallithea/templates/pullrequests/pullrequest_show_all.html Thu Oct 20 19:54:19 2016 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show_all.html Thu Oct 20 20:04:28 2016 +0200 @@ -29,14 +29,14 @@ <li> %if c.authuser.username != 'default': <span> - <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> + <a id="open_new_pr" class="btn btn-success btn-xs" 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-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> + <a class="btn btn-default btn-xs" 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-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> + <a class="btn btn-default btn-xs" 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>