aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--templates/admin/auth/list.tmpl2
-rw-r--r--templates/admin/cron.tmpl2
-rw-r--r--templates/admin/emails/list.tmpl2
-rw-r--r--templates/admin/monitor.tmpl2
-rw-r--r--templates/admin/notice.tmpl2
-rw-r--r--templates/admin/org/list.tmpl2
-rw-r--r--templates/admin/packages/list.tmpl2
-rw-r--r--templates/admin/repo/list.tmpl2
-rw-r--r--templates/admin/user/list.tmpl2
-rw-r--r--templates/repo/issue/list.tmpl2
-rw-r--r--templates/repo/issue/view.tmpl2
-rw-r--r--templates/repo/issue/view_content.tmpl7
-rw-r--r--templates/repo/issue/view_content/comments.tmpl5
-rw-r--r--web_src/less/_admin.less9
-rw-r--r--web_src/less/_repository.less74
-rw-r--r--web_src/less/_user.less4
16 files changed, 105 insertions, 16 deletions
diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl
index 71e5bfbda8..b4a703e413 100644
--- a/templates/admin/auth/list.tmpl
+++ b/templates/admin/auth/list.tmpl
@@ -10,7 +10,7 @@
</div>
</h4>
<div class="ui attached table segment">
- <table class="ui very basic striped table">
+ <table class="ui very basic striped table unstackable">
<thead>
<tr>
<th>ID</th>
diff --git a/templates/admin/cron.tmpl b/templates/admin/cron.tmpl
index 30277177ed..a73813ef88 100644
--- a/templates/admin/cron.tmpl
+++ b/templates/admin/cron.tmpl
@@ -3,7 +3,7 @@
</h4>
<div class="ui attached table segment">
<form method="post" action="{{AppSubUrl}}/admin">
- <table class="ui very basic striped table">
+ <table class="ui very basic striped table unstackable">
<thead>
<tr>
<th></th>
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index e73213c1df..277c777a89 100644
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -30,7 +30,7 @@
</form>
</div>
<div class="ui attached table segment">
- <table class="ui very basic striped table">
+ <table class="ui very basic striped table unstackable">
<thead>
<tr>
<th data-sortt-asc="username" data-sortt-desc="reverseusername">
diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl
index 443159f8ce..86686101ac 100644
--- a/templates/admin/monitor.tmpl
+++ b/templates/admin/monitor.tmpl
@@ -8,7 +8,7 @@
{{.i18n.Tr "admin.monitor.queues"}}
</h4>
<div class="ui attached table segment">
- <table class="ui very basic striped table">
+ <table class="ui very basic striped table unstackable">
<thead>
<tr>
<th>{{.i18n.Tr "admin.monitor.queue.name"}}</th>
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index 9fec53b315..8d0e1c2206 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -7,7 +7,7 @@
{{.i18n.Tr "admin.notices.system_notice_list"}} ({{.i18n.Tr "admin.total" .Total}})
</h4>
<div class="ui attached table segment">
- <table id="notice-table" class="ui very basic select selectable table">
+ <table id="notice-table" class="ui very basic select selectable table unstackable">
<thead>
<tr>
<th></th>
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index 75c4d39196..0782ef64e9 100644
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -13,7 +13,7 @@
{{template "admin/base/search" .}}
</div>
<div class="ui attached table segment">
- <table class="ui very basic striped table">
+ <table class="ui very basic striped table unstackable">
<thead>
<tr>
<th data-sortt-asc="oldest" data-sortt-desc="newest">ID{{SortArrow "oldest" "newest" $.SortType false}}</th>
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index 373a97407b..df89d8bed2 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -29,7 +29,7 @@
</form>
</div>
<div class="ui attached table segment">
- <table class="ui very basic striped table">
+ <table class="ui very basic striped table unstackable">
<thead>
<tr>
<th>ID</th>
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index d7561dde7d..da05bfab96 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -13,7 +13,7 @@
{{template "admin/repo/search" .}}
</div>
<div class="ui attached table segment">
- <table class="ui very basic striped table">
+ <table class="ui very basic striped table unstackable">
<thead>
<tr>
<th data-sortt-asc="oldest" data-sortt-desc="newest">ID{{SortArrow "oldest" "newest" $.SortType false}}</th>
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index 93e6f38c27..755e4436f8 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -61,7 +61,7 @@
</form>
</div>
<div class="ui attached table segment">
- <table class="ui very basic striped table">
+ <table class="ui very basic striped table unstackable">
<thead>
<tr>
<th data-sortt-asc="oldest" data-sortt-desc="newest">ID{{SortArrow "oldest" "newest" .SortType false}}</th>
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index 63d746f570..ba7f1c1480 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -2,7 +2,7 @@
<div class="page-content repository">
{{template "repo/header" .}}
<div class="ui container">
- <div class="ui three column stackable grid">
+ <div class="ui three column grid issue-list-headers">
<div class="column">
{{template "repo/issue/navbar" .}}
</div>
diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl
index acfd25e7e0..c1fedac04c 100644
--- a/templates/repo/issue/view.tmpl
+++ b/templates/repo/issue/view.tmpl
@@ -2,7 +2,7 @@
<div class="page-content repository view issue pull">
{{template "repo/header" .}}
<div class="ui container">
- <div class="ui two column stackable grid">
+ <div class="ui two column grid">
<div class="column">
{{template "repo/issue/navbar" .}}
</div>
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 46a2a3969b..b5f838e9d0 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -41,6 +41,9 @@
{{if .Repository.OriginalURL}} ({{$.i18n.Tr "repo.migrated_from" (.Repository.OriginalURL|Escape) (.Repository.GetOriginalURLHostname|Escape) | Safe }}){{end}}
</span>
{{else}}
+ <a class="inline-timeline-avatar" href="{{.Issue.Poster.HomeLink}}">
+ {{avatar .Issue.Poster}}
+ </a>
<span class="text grey">
<a class="author"{{if gt .Issue.Poster.ID 0}} href="{{.Issue.Poster.HomeLink}}"{{end}}>{{.Issue.Poster.GetDisplayName}}</a>
{{.i18n.Tr "repo.issues.commented_at" (.Issue.HashTag|Escape) $createdStr | Safe}}
@@ -50,12 +53,12 @@
<div class="comment-header-right actions df ac">
{{if gt .Issue.ShowRole 0}}
{{if (.Issue.ShowRole.HasRole "Writer")}}
- <div class="ui basic label">
+ <div class="ui basic label role-label">
{{$.i18n.Tr "repo.issues.collaborator"}}
</div>
{{end}}
{{if (.Issue.ShowRole.HasRole "Owner")}}
- <div class="ui basic label">
+ <div class="ui basic label role-label">
{{$.i18n.Tr "repo.issues.owner"}}
</div>
{{end}}
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index 7c4e63314d..7ff7f247fc 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -35,6 +35,11 @@
({{$.i18n.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe }}){{end}}
</span>
{{else}}
+ {{if gt .Poster.ID 0}}
+ <a class="inline-timeline-avatar" href="{{.Poster.HomeLink}}">
+ {{avatar .Poster}}
+ </a>
+ {{end}}
<span class="text grey">
<a class="author"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>
{{.Poster.GetDisplayName}}
diff --git a/web_src/less/_admin.less b/web_src/less/_admin.less
index 97c8e0d5c8..3af0c57d11 100644
--- a/web_src/less/_admin.less
+++ b/web_src/less/_admin.less
@@ -12,6 +12,7 @@
.table.segment {
padding: 0;
font-size: 13px;
+ overflow-x: scroll;
&:not(.striped) {
thead {
@@ -62,6 +63,9 @@
dd {
margin-left: 275px;
+ @media @mediaSm {
+ margin-left: 5%;
+ }
}
dt {
@@ -72,6 +76,11 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
+
+ @media @mediaSm {
+ width: auto;
+ margin-right: .5em;
+ }
}
}
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index ffbea14b99..13f9384ba0 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -861,6 +861,11 @@
}
}
+ /* Don't show the mobile oriented avatar ".inline-timeline-avatar" on desktop. Desktop uses the avatar with class ".timeline-avatar" */
+ .inline-timeline-avatar {
+ display: none;
+ }
+
.avatar.image,
.avatar.image img {
width: 20px;
@@ -1655,7 +1660,7 @@
@media (max-width: 480px) {
padding-top: .25rem;
- .ui.button {
+ .ui.button:not(.btn-submit) {
padding-left: .5rem;
padding-right: .5rem;
display: flex;
@@ -2662,7 +2667,7 @@
background: var(--color-box-header);
border-bottom: 1px solid var(--color-secondary) !important;
font-weight: normal !important;
- padding: .5rem 1rem !important;
+ padding: .5rem 1rem;
margin: 0 !important;
position: relative;
color: var(--color-text-light-2);
@@ -2965,8 +2970,11 @@ tbody.commit-list {
}
.repo-buttons {
- display: flex;
align-items: center;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ word-break: keep-all;
@media @mediaSm {
margin-top: 1em;
@@ -3011,6 +3019,11 @@ tbody.commit-list {
pointer-events: none !important;
}
}
+ @media @mediaSm {
+ .svg {
+ display: none;
+ }
+ }
}
.tag-code {
@@ -3260,4 +3273,59 @@ td.blob-excerpt {
}
}
}
+ .issue-list-headers.ui[class].grid {
+ > div:nth-child(1) {
+ order: 1;
+ width: 50%;
+ }
+
+ > div:nth-child(2) {
+ order: 3;
+ width: 100%;
+ }
+
+ > div.column:not(.row):nth-child(3) {
+ order: 2;
+ width: 50%;
+ }
+ }
+
+ .repository.view.issue .comment-list {
+ .timeline,
+ .timeline-item {
+ margin-left: 0;
+ }
+
+ .timeline {
+ &::before {
+ left: 14px;
+ }
+
+ .inline-timeline-avatar {
+ display: flex;
+ margin-bottom: auto;
+
+ img.avatar.image {
+ height: 24px;
+ width: 24px;
+ }
+ }
+
+ .comment-header {
+ &::before,
+ &::after {
+ content: unset;
+ }
+
+ padding-left: 4px;
+ }
+
+ /* Don't show the general avatar, we show the inline avatar on mobile.
+ * And don't show the role labels, there's no place for that. */
+ .timeline-avatar,
+ .comment-header-right .role-label {
+ display: none;
+ }
+ }
+ }
}
diff --git a/web_src/less/_user.less b/web_src/less/_user.less
index 8284022115..e192986819 100644
--- a/web_src/less/_user.less
+++ b/web_src/less/_user.less
@@ -175,3 +175,7 @@
max-width: 60px;
}
}
+
+#notification_div .tab.segment {
+ overflow-x: scroll;
+}