kallithea Changeset - a810db90098e

Changeset - a810db90098e

Parent rev.

Child rev.

[Not reviewed]

default

0 11 0

Mads Kiilerich - 9 years ago 2016-11-08 23:29:12
madski@unity3d.com

style: use Bootstrap compatible "text-muted" class

Based on work by Dominik Ruf.

11 files changed with 18 insertions and 14 deletions:

kallithea/public/css/style.css

kallithea/templates/admin/gists/edit.html

kallithea/templates/admin/gists/index.html

kallithea/templates/admin/gists/show.html

kallithea/templates/admin/repos/repo_edit_advanced.html

kallithea/templates/admin/repos/repo_edit_caches.html

kallithea/templates/admin/repos/repo_edit_statistics.html

kallithea/templates/admin/settings/settings_system.html

kallithea/templates/changeset/changeset_file_comment.html

kallithea/templates/compare/compare_diff.html

kallithea/templates/files/files_edit.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -4537,3 +4537,7 @@ body table.dataTable thead .sorting_desc @@
 .dataTables_wrapper .dataTables_filter {
   float: left !important;
+}
 .text-muted {
     color: #777777;
+}

kallithea/templates/admin/gists/edit.html

➞

Show inline comments

@@ @@ -54,7 +54,7 @@ @@
                 <div style="padding:0px 0px 0px 42px">
                     <label for='lifetime'>${_('Gist lifetime')}</label>
                     ${h.select('lifetime', '0', c.lifetime_options)}
-                    <span class="" style="color: #AAA">
+                    <span class="text-muted">
                      %if c.gist.gist_expires == -1:
                       ${_('Expires')}: ${_('Never')}
                      %else:

kallithea/templates/admin/gists/index.html

➞

Show inline comments

@@ @@ -50,7 +50,7 @@ @@
             </div>
             <div style="padding: 4px 0px 0px 0px">
                 ${_('Created')} ${h.age(gist.created_on)} /
-                <span style="color: #AAA">
+                <span class="text-muted">
                   %if gist.gist_expires == -1:
                    ${_('Expires')}: ${_('Never')}
                   %else:
@@ @@ -59,7 +59,7 @@ @@
                 </span>
             </div>
-            <div style="border:0px;padding:10px 0px 0px 40px;color:#AAA">${gist.gist_description}</div>
+            <div class="text-muted" style="border:0px;padding:10px 0px 0px 40px">${gist.gist_description}</div>
           </div>
         % endfor

kallithea/templates/admin/gists/show.html

➞

Show inline comments

@@ @@ -42,7 +42,7 @@ @@
                         <div class="left item">
                             ${c.gist.gist_description}
                         </div>
-                        <div class="left item last" style="color: #AAA">
+                        <div class="left item last text-muted">
                          %if c.gist.gist_expires == -1:
                           ${_('Expires')}: ${_('Never')}
                          %else:

kallithea/templates/admin/repos/repo_edit_advanced.html

➞

Show inline comments

@@ @@ -3,7 +3,7 @@ ${h.form(url('edit_repo_advanced_fork', @@
 <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-default btn-sm")}
-       <div class="field" style="border:none;color:#888">
+       <div class="field text-muted" style="border:none">
        <ul>
             <li>${_('''Manually set this repository as a fork of another from the list.''')}</li>
        </ul>
@@ @@ -35,7 +35,7 @@ ${h.form(url('edit_repo_advanced_journal @@
     </button>
   %endif
   </div>
- <div class="field" style="border:none;color:#888">
+ <div class="field text-muted" style="border:none">
  <ul>
       <li>${_('All actions done in this repository will be visible to everyone in the public journal.')}</li>
  </ul>
@@ @@ -63,7 +63,7 @@ ${h.form(url('edit_repo_advanced_locking @@
         </button>
         ${_('Repository is not locked')}
       %endif
-   <div class="field" style="border:none;color:#888">
+   <div class="field text-muted" style="border:none">
    <ul>
         <li>${_('Force locking on the repository. Works only when anonymous access is disabled. Triggering a pull locks the repository.  The user who is pulling locks the repository; only the user who pulled and locked it can unlock it by doing a push.')}
         </li>
@@ @@ -85,7 +85,7 @@ ${h.form(url('delete_repo', repo_name=c. @@
         <input type="radio" name="forks" value="detach_forks" checked="checked"/> <label for="forks">${_('Detach forks')}</label>
         <input type="radio" name="forks" value="delete_forks" /> <label for="forks">${_('Delete forks')}</label>
     %endif
-    <div class="field" style="border:none;color:#888">
+    <div class="field text-muted" style="border:none">
         <ul>
         <li>${_('The deleted repository will be moved away and hidden until the administrator expires it. The administrator can both permanently delete it or restore it.')}</li>
         </ul>

kallithea/templates/admin/repos/repo_edit_caches.html

➞

Show inline comments

@@ @@ -2,7 +2,7 @@ ${h.form(url('update_repo_caches', repo_ @@
 <div class="form">
    <div class="fields">
        ${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">
+      <div class="field text-muted" style="border:none">
       <ul>
           <li>${_('Manually invalidate cache for this repository. On first access, the repository will be cached again.')}
           </li>

kallithea/templates/admin/repos/repo_edit_statistics.html

➞

Show inline comments

 ${h.form(url('edit_repo_statistics_update', repo_name=c.repo_info.repo_name))}
 <div class="form">
     <div class="form-horizontal">
        <div class="field" style="border:none;color:#888">
+       <div class="field text-muted" style="border:none;color:#888">
         <ul>
             <li>${_('Processed commits')}: ${c.stats_revision}/${c.repo_last_rev}</li>
             <li>${_('Processed progress')}: ${c.stats_percentage}%</li>

kallithea/templates/admin/settings/settings_system.html

➞

Show inline comments

@@ @@ -7,7 +7,7 @@ @@
     (_('Platform'), c.platform, ''),
     (_('Git version'), c.git_version, ''),
     (_('Git path'), c.ini.get('git_path'), ''),
-    (_('Upgrade info endpoint'), h.literal('%s <br/><span style="color:#999999">%s.</span>' % (c.update_url, _('Note: please make sure this server can access this URL'))), ''),
+    (_('Upgrade info endpoint'), h.literal('%s <br/><span class="text-muted">%s.</span>' % (c.update_url, _('Note: please make sure this server can access this URL'))), ''),
+ ]
 %>

kallithea/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -55,7 +55,7 @@ @@
     ${h.form('#', class_='inline-form')}
       <div class="clearfix">
         <div class="comment-help">${_('Commenting on line.')}
-          <span style="color:#577632">${_('Comments are in plain text. Use @username inside this text to notify another user.')|n}</span>
+          <span class="text-muted">${_('Comments are in plain text. Use @username inside this text to notify another user.')|n}</span>
         </div>
         <div class="mentions-container"></div>
         <textarea name="text" class="comment-block-ta yui-ac-input"></textarea>

kallithea/templates/compare/compare_diff.html

➞

Show inline comments

@@ @@ -45,7 +45,7 @@ ${self.repo_context_bar('changelog')} @@
     %if c.compare_home:
         <div id="changeset_compare_view_content">
-         <div style="color:#999;font-size: 18px">${_('Compare revisions, branches, bookmarks, or tags.')}</div>
+         <div class="text-muted" style="font-size: 18px">${_('Compare revisions, branches, bookmarks, or tags.')}</div>
         </div>
     %else:
         <div id="changeset_compare_view_content">

kallithea/templates/files/files_edit.html

➞

Show inline comments

@@ @@ -60,7 +60,7 @@ ${self.repo_context_bar('files')} @@
             </div>
                 <pre id="editor_pre"></pre>
                 <textarea id="editor" name="content" style="display:none">${h.escape(c.file.content)|n}</textarea>
-                <div style="padding: 10px;color:#666666">${_('Commit Message')}</div>
+                <div class="text-muted" style="padding: 10px">${_('Commit Message')}</div>
                 <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">

0 comments (0 inline, 0 general)