Mercurial > kallithea
changeset 6996:647e7e0ce812
less: use bootstrap class .text-muted instead of custom one
author | domruf <dominikruf@gmail.com> |
---|---|
date | Fri, 27 Oct 2017 20:05:18 +0200 |
parents | 42932bee7a37 |
children | 22a23f38e472 |
files | kallithea/public/css/style.css kallithea/public/less/style.less kallithea/templates/admin/user_groups/user_group_edit_members.html kallithea/templates/base/perms_summary.html kallithea/templates/compare/compare_cs.html kallithea/templates/compare/compare_diff.html kallithea/templates/pullrequests/pullrequest_data.html kallithea/templates/pullrequests/pullrequest_show.html kallithea/tests/functional/test_compare_local.py |
diffstat | 9 files changed, 11 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/style.css Sun Oct 29 13:36:22 2017 +0100 +++ b/kallithea/public/css/style.css Fri Oct 27 20:05:18 2017 +0200 @@ -50,9 +50,6 @@ .changeset_hash { font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace; } -.empty_data { - color: #B9B9B9; -} .inline-comments-general.show-general-status .hidden.general-only { display: block !important; }
--- a/kallithea/public/less/style.less Sun Oct 29 13:36:22 2017 +0100 +++ b/kallithea/public/less/style.less Fri Oct 27 20:05:18 2017 +0200 @@ -54,9 +54,7 @@ .changeset_hash { font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace; } -.empty_data { - color: #B9B9B9; -} + .inline-comments-general.show-general-status .hidden.general-only { display: block !important; }
--- a/kallithea/templates/admin/user_groups/user_group_edit_members.html Sun Oct 29 13:36:22 2017 +0100 +++ b/kallithea/templates/admin/user_groups/user_group_edit_members.html Fri Oct 27 20:05:18 2017 +0200 @@ -8,5 +8,5 @@ %endfor </ul> %else: - <span class="empty_data">${_('No members yet')}</span> + <span class="text-muted">${_('No members yet')}</span> %endif
--- a/kallithea/templates/base/perms_summary.html Sun Oct 29 13:36:22 2017 +0100 +++ b/kallithea/templates/base/perms_summary.html Fri Oct 27 20:05:18 2017 +0200 @@ -19,7 +19,7 @@ %endif </div> %if not permissions[section]: - <span class="empty_data">${_('No permissions defined yet')}</span> + <span class="text-muted">${_('No permissions defined yet')}</span> %else: <div id='tbl_list_wrap_${section}'> <table id="tbl_list_${section}" class="table">
--- a/kallithea/templates/compare/compare_cs.html Sun Oct 29 13:36:22 2017 +0100 +++ b/kallithea/templates/compare/compare_cs.html Fri Oct 27 20:05:18 2017 +0200 @@ -2,7 +2,7 @@ <%namespace name="changelog_table" file="/changelog/changelog_table.html"/> <div> %if not c.cs_ranges: - <span class="empty_data">${_('No changesets')}</span> + <span class="text-muted">${_('No changesets')}</span> %else: %if c.ancestors:
--- a/kallithea/templates/compare/compare_diff.html Sun Oct 29 13:36:22 2017 +0100 +++ b/kallithea/templates/compare/compare_diff.html Fri Oct 27 20:05:18 2017 +0200 @@ -66,7 +66,7 @@ </h5> <div class="cs_files"> %if not c.file_diff_data: - <span class="empty_data">${_('No files')}</span> + <span class="text-muted">${_('No files')}</span> %endif %for fid, url_fid, op, a_path, path, diff, stats in c.file_diff_data: <div class="cs_${op} clearfix">
--- a/kallithea/templates/pullrequests/pullrequest_data.html Sun Oct 29 13:36:22 2017 +0100 +++ b/kallithea/templates/pullrequests/pullrequest_data.html Fri Oct 27 20:05:18 2017 +0200 @@ -3,7 +3,7 @@ <%def name="pullrequest_overview(pullrequests)"> %if not len(pullrequests): - <div class="empty_data">${_('No entries')}</div> + <div class="text-muted">${_('No entries')}</div> <% return %> %endif
--- a/kallithea/templates/pullrequests/pullrequest_show.html Sun Oct 29 13:36:22 2017 +0100 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Fri Oct 27 20:05:18 2017 +0200 @@ -303,7 +303,7 @@ </h5> <div class="cs_files"> %if not c.file_diff_data: - <span class="empty_data">${_('No files')}</span> + <span class="text-muted">${_('No files')}</span> %endif %for fid, url_fid, op, a_path, path, diff, stats in c.file_diff_data: <div class="cs_${op} clearfix">
--- a/kallithea/tests/functional/test_compare_local.py Sun Oct 29 13:36:22 2017 +0100 +++ b/kallithea/tests/functional/test_compare_local.py Fri Oct 27 20:05:18 2017 +0200 @@ -126,8 +126,8 @@ response.mustcontain('%s@default' % (HG_REPO)) response.mustcontain('%s@default' % (HG_REPO)) # branch are equal - response.mustcontain('<span class="empty_data">No files</span>') - response.mustcontain('<span class="empty_data">No changesets</span>') + response.mustcontain('<span class="text-muted">No files</span>') + response.mustcontain('<span class="text-muted">No changesets</span>') def test_index_branch_git(self): self.log_user() @@ -142,8 +142,8 @@ response.mustcontain('%s@master' % (GIT_REPO)) response.mustcontain('%s@master' % (GIT_REPO)) # branch are equal - response.mustcontain('<span class="empty_data">No files</span>') - response.mustcontain('<span class="empty_data">No changesets</span>') + response.mustcontain('<span class="text-muted">No files</span>') + response.mustcontain('<span class="text-muted">No changesets</span>') def test_compare_revisions_hg(self): self.log_user()