diff --git a/web/src/app/projects/repository/repository.component.html b/web/src/app/projects/repository/repository.component.html index 1edfaafe7..9e8188237 100644 --- a/web/src/app/projects/repository/repository.component.html +++ b/web/src/app/projects/repository/repository.component.html @@ -15,8 +15,7 @@ - +
@@ -42,14 +41,10 @@ keyboard_arrow_up
-
- +
+
-
+
+{{ repository.contributors.length - numberOfDisplayedUsers }}
@@ -66,8 +61,7 @@
-
+
@@ -85,10 +79,20 @@

#{{ issue.number }} {{ issue.title }}

- - update -

{{ issue.updatedOn.toDate() | timeAgo }}

-
+

+ +

+ update +

{{ issue.createdOn.toDate() | timeAgo }}

+
+ + +
+ update +

{{ issue.updatedOn.toDate() | timeAgo }}

+
+
+

@@ -128,20 +132,26 @@

Comments: {{ pullRequest.comments }}

Review Comments: {{ pullRequest.reviewComments }}

- add_circle_outline {{ pullRequest.additions }} + add_circle_outline {{ pullRequest.additions }} remove_circle_outline {{ pullRequest.deletions }} Changed Files: {{ pullRequest.changedFiles }}

- update -

{{ pullRequest.createdOn.toDate() | timeAgo }}

+
+ update +

{{ pullRequest.createdOn.toDate() | timeAgo }}

+
+
+ update +

{{ pullRequest.updatedOn.toDate() | timeAgo }}

+

{{ buildTime.context }} - -

{{ buildTime.time }} seconds

- -

+ +

{{ buildTime.time }} seconds

+
+

@@ -172,8 +182,10 @@

{{ event.actor.username }}

- update -

{{ event.createdOn.toDate() | timeAgo }}

+
+ update +

{{ event.createdOn.toDate() | timeAgo }}

+
@@ -184,8 +196,7 @@

+

@@ -194,15 +205,13 @@

- +
person
- +

Published: {{ repository.releases[0].createdOn.toDate() | timeAgo }}

@@ -224,16 +233,13 @@

- +
person
- +

State: {{ repository.milestones[0].state }} | Open: {{ repository.milestones[0].openIssues }} | Close: @@ -256,21 +262,17 @@

- +
person
-
- {{ repository.contributors[0].owner.username }} +
-

Total Commits: {{ repository.contributors[0].total }}

+

Total Commits: {{ repository.contributors[0].total }}

Total Commits: N/A

@@ -289,15 +291,13 @@

- +
person
-
+
diff --git a/web/src/app/projects/repository/repository.component.scss b/web/src/app/projects/repository/repository.component.scss index e8115e7ad..60a3942a0 100644 --- a/web/src/app/projects/repository/repository.component.scss +++ b/web/src/app/projects/repository/repository.component.scss @@ -79,6 +79,11 @@ } &__content { + + &__time-container{ + margin: 0; + } + &__description { font-size: 20px; } @@ -123,21 +128,24 @@ &__time-container-bottom { width: 250px; - display: flex; justify-content: flex-start; + div { + display: flex; + } } &__time-container-top { width: 250px; - display: flex; justify-content: flex-start; + div { + display:flex; + } } @media (max-width: $breakpoint-md) { &__time-container-top { width: 120px; display: flex; - position: absolute; font-size: 9pt; right: 0; top: 0; @@ -145,11 +153,10 @@ &__time-container-bottom { width: 120px; - display: flex; + display: block; position: absolute; font-size: 9pt; right: -5px; - bottom: -5px; } } } diff --git a/web/test/integration/project/dashboard.feature b/web/test/integration/project/dashboard.feature index 6c26f6162..fbd1c97c5 100644 --- a/web/test/integration/project/dashboard.feature +++ b/web/test/integration/project/dashboard.feature @@ -81,7 +81,7 @@ Feature: Project dashboard page | releases | [{"title": "test-release","isPrerelease": false,"owner": {"avatarUrl": "https://cdn.dashboardhub.io/logo/icon-only-orange-120x120.png","username": "test-user-minimum"},"createdOn": "DATETIME[NOW]"}] | | milestones | [{"title": "test-milestone","state": "open","creator": {"avatarUrl": "https://cdn.dashboardhub.io/logo/icon-only-orange-120x120.png","username": "test-user-minimum"},"updatedAt": "DATETIME[NOW]"}] | | contributors | [{"owner": {"avatarUrl": "https://cdn.dashboardhub.io/logo/icon-only-orange-120x120.png","username": "test-user-minimum"},"total": 2}] | - | pullRequests | [{"title": "test-PR","owner": {"avatarUrl": "https://cdn.dashboardhub.io/logo/icon-only-orange-120x120.png","username": "test-user-minimum" },"createdOn": "DATETIME[NOW]"}] | + | pullRequests | [{"title": "test-PR","owner": {"avatarUrl": "https://cdn.dashboardhub.io/logo/icon-only-orange-120x120.png","username": "test-user-minimum" },"createdOn": "DATETIME[NOW]", "updatedOn": "DATETIME[NOW]"}] | | events |[{"payload": {"title": "test-event","action": "created" },"createdOn": "DATETIME[NOW]", "public": true,"type": "IssueCommentEvent", "actor": {"avatarUrl": "https://cdn.dashboardhub.io/logo/icon-only-orange-120x120.png","username": "test-user-minimum"}}] | | createdOn | "DATETIME[NOW]" | And there is the following document in the collection "users":