diff --git a/source/templates/classic/partials/activity.ejs b/source/templates/classic/partials/activity.ejs index 04ecf40e00f..b758ed90ea4 100644 --- a/source/templates/classic/partials/activity.ejs +++ b/source/templates/classic/partials/activity.ejs @@ -28,8 +28,10 @@ <% } else { %> <% } %> - <%- /create/.test(type) ? `${_("C")}reated new` : `${_("D")}eleted` %> - <%= event.ref.type %>
<%= event.ref.name %>
in
<%= repo %>
+
+ <%- /create/.test(type) ? `${_("C")}reated new` : `${_("D")}eleted` %> + <%= event.ref.type %> <%= event.ref.name %> in <%= repo %> +
<% } %> <% if (type === "comment") { %> @@ -39,17 +41,21 @@ <% } else if ((event.on === "issue")||(event.on === "commit")) { %> <% } %> - <%- _("C") %>ommented on
#<%= event.number %> <%= event.title %>
+
+ <%- _("C") %>ommented on #<%= event.number %> <%= event.title %> +
-
-
<%= event.on === "commit" ? "committed" : "opened" %> by <%= event.user %> in
<%= repo %>
+
+
<%= event.on === "commit" ? "committed" : "opened" %> by <%= event.user %> in <%= repo %>
<%= event.content %>
<% } %> <% if (type === "wiki") { %>
- <%- _("U") %>pdated <%= event.pages.length %> wiki page<%= s(event.pages.length) %> in
<%= repo %>
+
+ <%- _("U") %>pdated <%= event.pages.length %> wiki page<%= s(event.pages.length) %> in <%= repo %> +
<% for (const page of event.pages) { %> @@ -62,56 +68,68 @@ <% if (type === "pr") { %>
- <%- event.action === "opened" ? `${_("O")}pened` : `${_("M")}erged` %>
#<%= event.number %> <%= event.title %>
+
+ <%- event.action === "opened" ? `${_("O")}pened` : `${_("M")}erged` %> #<%= event.number %> <%= event.title %> +
-
opened <%= user.login !== event.user ? `by ${event.user}` : "" %> in
<%= repo %>
-
<%= event.files.changed %> file<%= s(event.files.changed) %> changed
++<%= event.lines.added %> --<%= event.lines.deleted%>
+
<%= user.login !== event.user ? `opened by ${event.user}` : "" %> in <%= repo %>
+
<%= event.files.changed %> file<%= s(event.files.changed) %> changed ++<%= event.lines.added %> --<%= event.lines.deleted%>
<% } %> <% if (type === "issue") { %>
- <%- event.action === "opened" ? `${_("O")}pened` : event.action === "reopened" ? `${_("R")}eopened` : `${_("C")}losed` %>
#<%= event.number %> <%= event.title %>
+
+ <%- event.action === "opened" ? `${_("O")}pened` : event.action === "reopened" ? `${_("R")}eopened` : `${_("C")}losed` %> #<%= event.number %> <%= event.title %> +
-
opened <%= user.login !== event.user ? `by ${event.user}` : "" %> in
<%= repo %>
+
opened <%= user.login !== event.user ? `by ${event.user}` : "" %> in <%= repo %>
<% } %> <% if (type === "fork") { %>
- <%- _("F") %>orked
<%= repo %>
+
+ <%- _("F") %>orked <%= repo %> +
<% } %> <% if (type === "public") { %>
- <%- _("M") %>ade
<%= repo %>
public +
+ <%- _("M") %>ade <%= repo %> public +
<% } %> <% if (type === "review") { %>
- <%- _("R") %>eviewed
#<%= event.number %> <%= event.title %>
+
+ <%- _("R") %>eviewed #<%= event.number %> <%= event.title %> +
-
opened <%= user.login !== event.user ? `by ${event.user}` : "" %> in
<%= repo %>
+
opened <%= user.login !== event.user ? `by ${event.user}` : "" %> in <%= repo %>
<% } %> <% if (type === "push") { %>
- <%- _("P") %>ushed <%= event.size %> commit<%= s(event.size) %> in
<%= repo %>
+
+ <%- _("P") %>ushed <%= event.size %> commit<%= s(event.size) %> in <%= repo %> +
<% if (event.branch) { %> -
on branch
<%= event.branch %>
+
on branch <%= event.branch %>
<% } %> <% for (const commit of event.commits) { %>
-
#<%= commit.sha %>
-
<%= commit.message %>
+ #<%= commit.sha %> + <%= commit.message %>
<% } %>
@@ -119,20 +137,26 @@ <% if (type === "release") { %>
- <%- event.draft ? `${_("D")}rafted release` : event.prerelease ? `${_("P")}re-released` : `${_("R")}eleased` %> -
<%= event.name %>
of
<%= repo %>
+
+ <%- event.draft ? `${_("D")}rafted release` : event.prerelease ? `${_("P")}re-released` : `${_("R")}eleased` %> + <%= event.name %> of <%= repo %> +
<% } %> <% if (type === "star") { %>
- - <%- _("S") %>tarred
<%= repo %>
+ +
+ <%- _("S") %>tarred <%= repo %> +
<% } %> <% if (type === "member") { %>
- <%- _("A") %>dded <%= event.user %> as collaborator in
<%= repo %>
+
+ <%- _("A") %>dded <%= event.user %> as collaborator in <%= repo %> +
<% } %> <% if (plugins.activity.timestamps) { %> diff --git a/source/templates/classic/style.css b/source/templates/classic/style.css index bc5c8470108..6c930fcd416 100644 --- a/source/templates/classic/style.css +++ b/source/templates/classic/style.css @@ -533,18 +533,17 @@ margin-bottom: 0; } - .activity .repo, .activity .issue, .activity .commit .sha { - color: #58a6ff; - margin: 0 4px; - } - - .activity .issue { + .activity .field .content { flex-grow: 1; - width: 0%; text-overflow: ellipsis; overflow: hidden; } + .activity .repo, .activity .issue, .activity .commit .sha { + display: inline; + color: #58a6ff; + } + .activity .code { background-color: #7777771F; padding: 1px 5px; @@ -561,7 +560,7 @@ } .activity .details, .activity .timestamp { - padding-left: 42px; + padding-left: 38px; display: flex; flex-direction: column; font-size: 13px; @@ -573,11 +572,6 @@ margin-top: 4px; } - .activity .details > div { - display: flex; - align-items: center; - } - .activity .commit .sha { font-family: SFMono-Regular,Consolas,Liberation Mono,Menlo,monospace; }