diff --git a/pagure/static/issue_ev.js b/pagure/static/issue_ev.js index 4d76862..0e483a2 100644 --- a/pagure/static/issue_ev.js +++ b/pagure/static/issue_ev.js @@ -139,7 +139,7 @@ add_comment = function(data, username) { +'
' + '' +'
' - +'' + +'' + data.comment_added +'' +'
' @@ -153,8 +153,8 @@ add_comment = function(data, username) { + '
' + ' ' + ' '+data.comment_user+'' - + ' '+data.comment_user+'' + + ' ' + ' commented seconds ago' + ' ' diff --git a/pagure/static/pagure.css b/pagure/static/pagure.css index 1a8e5f1..566a52d 100644 --- a/pagure/static/pagure.css +++ b/pagure/static/pagure.css @@ -317,14 +317,6 @@ th[data-sort] { height: inherit; } -.text-semimuted{ - color:#555!important; -} - -.text-ccc{ - color: #ccc!important; -} - .font-size-09{ font-size:0.9em; } diff --git a/pagure/static/request_ev.js b/pagure/static/request_ev.js index fc2631d..12562e8 100644 --- a/pagure/static/request_ev.js +++ b/pagure/static/request_ev.js @@ -22,7 +22,7 @@ add_comment = function(data, username) { +'
' + '' +'
' - +'' + +'' + data.comment_added +'' +'
' @@ -40,8 +40,8 @@ add_comment = function(data, username) { + '
' + ' ' + ' '+data.comment_user+'' - + ' '+data.comment_user+'' + + ' ' + ' commented seconds ago' + ' ' diff --git a/pagure/templates/_formhelper.html b/pagure/templates/_formhelper.html index ef46728..1efad34 100644 --- a/pagure/templates/_formhelper.html +++ b/pagure/templates/_formhelper.html @@ -114,10 +114,10 @@ {{ comment.user.default_email | avatar(16) | safe }} + class="notblue font-weight-bold"> {{ comment.user.user }} - {% if comment.edited_on %}
- Edited {{ comment.edited_on | humanize }} by {{ comment.editor.username }} + Edited {{ comment.edited_on | humanize }} by {{ comment.editor.username }}
{% endif %} @@ -231,10 +231,10 @@ {{ pull_request.user.default_email | avatar(24) | safe }} + class="notblue font-weight-bold"> {{ pull_request.user.user }} - {{ filepath | unicode }} {% elif not pull_request %} - {{ comment.user.default_email | avatar(16) | safe }}
- {{ comment.comment | markdown | noJS | safe }} + {{ comment.comment | markdown | noJS | safe }}
{{ comment.date_created | humanize }} @@ -296,7 +296,7 @@ namespace=repo.namespace, repo=repo.name, issueid=issueid)
-
Metadata
+
Metadata
{% if g.authenticated and (g.repo_user or g.fas_user.username == issue.user.user) and not repo.settings.get('issue_tracker_read_only', False) %}
@@ -314,7 +314,7 @@ namespace=repo.namespace, repo=repo.name, issueid=issueid) {% endif%}
- +
{% if issue.assignee %} @@ -362,7 +362,7 @@ namespace=repo.namespace, repo=repo.name, issueid=issueid) {% endif%}
- + {% if issue.tags %}

{% for tag in issue.tags %} @@ -411,7 +411,7 @@ namespace=repo.namespace, repo=repo.name, issueid=issueid) {% endmacro %}
- +
{% if issue.children %} {% for ticket in issue.children %} @@ -433,7 +433,7 @@ namespace=repo.namespace, repo=repo.name, issueid=issueid) {% endif%}
- +
{% if issue.parents %} {% for ticket in issue.parents %} @@ -456,7 +456,7 @@ namespace=repo.namespace, repo=repo.name, issueid=issueid) {% if repo.priorities %}
- +
{% if issue.priority is not none %} {{ repo.priorities[issue.priority | string] }} @@ -474,7 +474,7 @@ namespace=repo.namespace, repo=repo.name, issueid=issueid) {% if repo.milestones %}
- +
{% if issue.milestone %} @@ -507,7 +507,7 @@ namespace=repo.namespace, repo=repo.name, issueid=issueid) {% if repo.issue_keys %} {% for field in repo.issue_keys %}
- +
{% if field.name in knowns_keys %} {% if field.key_type == 'link' %} @@ -562,7 +562,7 @@ namespace=repo.namespace, repo=repo.name, issueid=issueid)
-
+
Subscribers {{subscribers|count}}
@@ -596,7 +596,7 @@ namespace=repo.namespace, repo=repo.name, issueid=issueid) {% if issue.related_prs %}
-
+
Related Pull Requests {{subscribers|count}}
diff --git a/pagure/templates/new_issue.html b/pagure/templates/new_issue.html index 595f4f9..459b8bf 100644 --- a/pagure/templates/new_issue.html +++ b/pagure/templates/new_issue.html @@ -165,18 +165,18 @@
-
Metadata
+
Metadata
- +
- + - + {{form.priority}}
{% endif %} {% if repo.milestones %}
- + {{form.milestone}}
{% endif %} diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html index 77f1ce0..0e14e02 100644 --- a/pagure/templates/repo_info.html +++ b/pagure/templates/repo_info.html @@ -266,7 +266,7 @@
- {{ commit.author | author2avatar(20) | safe }} {{commit.author.name}} committed {{ commit.commit_time|humanize }} + {{ commit.author | author2avatar(20) | safe }} {{commit.author.name}} committed {{ commit.commit_time|humanize }}
{% endif %} diff --git a/pagure/templates/repo_pull_request.html b/pagure/templates/repo_pull_request.html index 6fbcfcb..536fc0a 100644 --- a/pagure/templates/repo_pull_request.html +++ b/pagure/templates/repo_pull_request.html @@ -373,7 +373,7 @@
{{ comment.user.default_email | avatar(24) | safe }}
- {{ comment.comment | markdown | noJS | safe }} + {{ comment.comment | markdown | noJS | safe }}
{{ comment.date_created | humanize }} @@ -451,7 +451,7 @@
-
Metadata
+
Metadata
{% if g.authenticated and mergeform and pull_request.status == 'Open' and (g.repo_committer or g.fas_user.username == pull_request.user.user) %} @@ -469,7 +469,7 @@ namespace=repo.namespace, requestid=requestid) }}"> {% endif %}
- +
{% if pull_request.assignee.username %}
{{pull_request.assignee.username| avatar(size=24) | safe}} {{ pull_request.assignee.username }}
@@ -492,7 +492,7 @@ g.repo_user or g.fas_user.username == pull_request.user.user) %}