Browse Source

Merge pull request '动态内容中有超长网址超出内容省略' (#2380) from web-0630 into V20220630

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2380
Reviewed-by: zhoupzh <zhoupzh@pcl.ac.cn>
tags/v1.22.6.2^2
zhoupzh 3 years ago
parent
commit
914b93d51a
2 changed files with 6 additions and 3 deletions
  1. +3
    -3
      templates/user/dashboard/feeds.tmpl
  2. +3
    -0
      web_src/less/_base.less

+ 3
- 3
templates/user/dashboard/feeds.tmpl View File

@@ -111,11 +111,11 @@
<span class="text truncate issue title">{{index .GetIssueInfos 1 | RenderEmoji}}</span>
{{else if or (eq .GetOpType 10) (eq .GetOpType 21) (eq .GetOpType 22) (eq .GetOpType 23)}}
<a href="{{.GetCommentLink}}" class="text truncate issue title">{{.GetIssueTitle | RenderEmoji}}</a>
<p class="text light grey">{{index .GetIssueInfos 1 | RenderEmoji}}</p>
<p class="text truncate pre-wrap light grey">{{index .GetIssueInfos 1 | RenderEmoji}}</p>
{{else if eq .GetOpType 11}}
<p class="text light grey">{{index .GetIssueInfos 1}}</p>
<p class="text truncate pre-wrap light grey">{{index .GetIssueInfos 1}}</p>
{{else if or (eq .GetOpType 12) (eq .GetOpType 13) (eq .GetOpType 14) (eq .GetOpType 15)}}
<span class="text truncate issue title">{{.GetIssueTitle | RenderEmoji}}</span>
<span class="text truncate pre-wrap issue title">{{.GetIssueTitle | RenderEmoji}}</span>
{{end}}
<p class="text italic light grey">{{TimeSince .GetCreate $.i18n.Lang}}</p>
</div>


+ 3
- 0
web_src/less/_base.less View File

@@ -489,6 +489,9 @@ code,
white-space: nowrap;
display: inline-block;
}
&.pre-wrap{
white-space:pre-wrap!important;
}

&.thin {
font-weight: normal;


Loading…
Cancel
Save