kallithea Changeset - 647e7e0ce812

Changeset - 647e7e0ce812

Parent rev.

Child rev.

[Not reviewed]

default

0 9 0

domruf - 8 years ago 2017-10-27 20:05:18
dominikruf@gmail.com

less: use bootstrap class .text-muted instead of custom one

9 files changed with 11 insertions and 16 deletions:

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

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -47,15 +47,12 @@ div.formatted-fixed, @@
 .formatted-fixed {
   white-space: pre-wrap;
+}
 .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;
+}
 .truncate {
   white-space: nowrap;
   overflow: hidden;

kallithea/public/less/style.less

➞

Show inline comments

@@ @@ -51,15 +51,13 @@ div.formatted-fixed, @@
   white-space: pre-wrap;
+}
 .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;
+}
 .truncate {
   white-space: nowrap;
   overflow: hidden;

kallithea/templates/admin/user_groups/user_group_edit_members.html

➞

Show inline comments

@@ @@ -5,8 +5,8 @@ @@
         ${h.gravatar_div(user.email, size=24)}
         <div>${h.link_to(user.full_name_and_username, h.url('edit_user',id=user.user_id))}</div>
     </li>
   %endfor
   </ul>
 %else:
-    <span class="empty_data">${_('No members yet')}</span>
+    <span class="text-muted">${_('No members yet')}</span>
 %endif

kallithea/templates/base/perms_summary.html

➞

Show inline comments

@@ @@ -16,13 +16,13 @@ @@
                 <label>${h.checkbox('perms_filter_write_%s' % section, 'write', 'checked', class_='perm_filter filter_%s' % section, **{'data-section':section, 'data-perm_type':'write'})}<span class="perm_tag write">${_('Write')}</span></label>
                 <label>${h.checkbox('perms_filter_admin_%s' % section, 'admin', 'checked', class_='perm_filter filter_%s' % section, **{'data-section':section, 'data-perm_type':'admin'})}<span class="perm_tag admin">${_('Admin')}</span></label>
               </div>
             %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">
           ## global permission box
           %if section == 'global':
               <thead>

kallithea/templates/compare/compare_cs.html

➞

Show inline comments

 ## Changesets table with graph
 <%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:
       <div class="ancestor">
         %if len(c.ancestors) > 1:
         <div class="text-danger">

kallithea/templates/compare/compare_diff.html

➞

Show inline comments

@@ @@ -63,13 +63,13 @@ ${self.repo_context_bar('changelog')} @@
                 ${c.ignorews_url(request.GET)}
                 ${c.context_url(request.GET)}
                 </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">
                       <span class="node">
                           <i class="icon-diff-${op}"></i>
                           ${h.link_to(h.safe_unicode(path), '#%s' % fid)}

kallithea/templates/pullrequests/pullrequest_data.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%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
 <div>
   <table class="table">
     <thead>

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -300,13 +300,13 @@ ${self.repo_context_bar('showpullrequest @@
               % else:
                   ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.file_diff_data)) % (len(c.file_diff_data),c.lines_added,c.lines_deleted)}:
               %endif
               </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">
                       <span class="node">
                           <i class="icon-diff-${op}"></i>
                           ${h.link_to(h.safe_unicode(path), '#%s' % fid)}

kallithea/tests/functional/test_compare_local.py

➞

Show inline comments

@@ @@ -123,14 +123,14 @@ class TestCompareController(TestControll @@
                                     other_ref_name='default',
                                     ))
         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()
         response = self.app.get(url('compare_url',
                                     repo_name=GIT_REPO,
                                     org_ref_type="branch",
@@ @@ -139,14 +139,14 @@ class TestCompareController(TestControll @@
                                     other_ref_name='master',
                                     ))
         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()
         rev1 = 'b986218ba1c9'
         rev2 = '3d8f361e72ab'

0 comments (0 inline, 0 general)