Skip to content

Commit 67db6b6

Browse files
silverwindwxiaoguang
silverwind
and
wxiaoguang
authored
RSS icon fixes (#24476)
Fix regression from #24471 where CSS rules for `.icon.grey` were removed which were in use by the RSS icons. Gave them their own class instead, removed a wrapper and also fixed vertical alignment on them. Additionally, did a few related fixes on the org header for alignment. Fixes: #24584 <img width="196" alt="Screenshot 2023-05-01 at 22 39 40" src="https://user-images.githubusercontent.com/115237/235528228-959e2385-c1d2-4d5c-baec-e3784d459653.png"> <img width="216" alt="Screenshot 2023-05-01 at 22 44 20" src="https://user-images.githubusercontent.com/115237/235528231-95cbff86-5672-48eb-b214-8bdcefa1612c.png"> <img width="120" alt="Screenshot 2023-05-01 at 22 56 36" src="https://user-images.githubusercontent.com/115237/235529844-b94ab554-3259-4d0c-b040-82aed7d1a111.png"> <img width="372" alt="Screenshot 2023-05-01 at 22 54 25" src="https://user-images.githubusercontent.com/115237/235529744-1a9c201b-5692-4122-9765-2f201a322a9e.png"> <img width="477" alt="Screenshot 2023-05-01 at 22 55 28" src="https://user-images.githubusercontent.com/115237/235529748-62188554-9927-42ef-bc94-7052bce266e2.png"> --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
1 parent f7ede92 commit 67db6b6

File tree

9 files changed

+45
-47
lines changed

9 files changed

+45
-47
lines changed

‎templates/org/home.tmpl

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<div class="ui container gt-df">
44
{{avatar $.Context .Org 140 "org-avatar"}}
55
<div id="org-info">
6-
<div class="ui header">
6+
<div class="ui header gt-df gt-fw">
77
{{.Org.DisplayName}}
8-
{{if .EnableFeed}}
9-
<a href="{{.Org.HomeLink}}.rss"><i class="ui grey icon gt-ml-3" data-tooltip-content="{{.locale.Tr "rss_feed"}}">{{svg "octicon-rss" 36}}</i></a>
10-
{{end}}
118
<span class="org-visibility">
12-
{{if .Org.Visibility.IsLimited}}<div class="ui large basic horizontal label">{{.locale.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}}
13-
{{if .Org.Visibility.IsPrivate}}<div class="ui large basic horizontal label">{{.locale.Tr "org.settings.visibility.private_shortname"}}</div>{{end}}
9+
{{if .Org.Visibility.IsLimited}}<span class="ui large basic horizontal label">{{.locale.Tr "org.settings.visibility.limited_shortname"}}</span>{{end}}
10+
{{if .Org.Visibility.IsPrivate}}<span class="ui large basic horizontal label">{{.locale.Tr "org.settings.visibility.private_shortname"}}</span>{{end}}
1411
</span>
12+
{{if .EnableFeed}}
13+
<a class="muted" href="{{.Org.HomeLink}}.rss" data-tooltip-content="{{.locale.Tr "rss_feed"}}">{{svg "octicon-rss" 24}}</a>
14+
{{end}}
1515
</div>
1616
{{if $.RenderedDescription}}<div class="render-content markup">{{$.RenderedDescription|Str2html}}</div>{{end}}
1717
<div class="text grey meta">

‎templates/repo/header.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
<a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>
1414
<div class="gt-mx-2">/</div>
1515
<a href="{{$.RepoLink}}">{{.Name}}</a>
16-
{{if $.EnableFeed}}
17-
<a href="{{$.RepoLink}}.rss"><i class="ui grey icon gt-ml-3" data-tooltip-content="{{$.locale.Tr "rss_feed"}}">{{svg "octicon-rss" 18}}</i></a>
18-
{{end}}
1916
<div class="labels gt-df gt-ac gt-fw">
2017
{{if .IsTemplate}}
2118
{{if .IsPrivate}}
@@ -38,6 +35,9 @@
3835
<span class="ui basic label">{{$.locale.Tr "repo.desc.archived"}}</span>
3936
{{end}}
4037
</div>
38+
{{if $.EnableFeed}}
39+
<a class="muted gt-ml-3" href="{{$.RepoLink}}.rss" data-tooltip-content="{{$.locale.Tr "rss_feed"}}">{{svg "octicon-rss" 18}}</a>
40+
{{end}}
4141
</div>
4242
{{if $.IsPullMirror}}
4343
{{$address := MirrorRemoteAddress $.Context . $.Mirror.GetRemoteName false}}

‎templates/repo/release/list.tmpl

+1-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,7 @@
33
{{template "repo/header" .}}
44
<div class="ui container">
55
{{template "base/alert" .}}
6-
{{template "repo/sub_menu_release_tag" .}}
7-
8-
{{if .CanCreateRelease}}
9-
<a class="ui right small green button" href="{{$.RepoLink}}/releases/new">
10-
{{.locale.Tr "repo.release.new_release"}}
11-
</a>
12-
{{end}}
13-
6+
{{template "repo/release_tag_header" .}}
147
<ul id="release-list">
158
{{range $idx, $release := .Releases}}
169
<li class="ui grid">

‎templates/repo/release_tag_header.tmpl

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{{$canReadReleases := $.Permission.CanRead $.UnitTypeReleases}}
2+
{{$canReadCode := $.Permission.CanRead $.UnitTypeCode}}
3+
4+
{{if $canReadReleases}}
5+
<div class="gt-df">
6+
<div class="gt-f1">
7+
<h2 class="ui compact small menu header small-menu-items">
8+
<a class="{{if .PageIsReleaseList}}active {{end}}item" href="{{.RepoLink}}/releases">{{.locale.Tr "repo.release.releases"}}</a>
9+
{{if $canReadCode}}
10+
<a class="{{if .PageIsTagList}}active {{end}}item" href="{{.RepoLink}}/tags">{{.locale.Tr "repo.release.tags"}}</a>
11+
{{end}}
12+
</h2>
13+
{{if .EnableFeed}}
14+
<a class="muted gt-mx-3" href="{{.RepoLink}}/{{if .PageIsTagList}}tags{{else}}releases{{end}}.rss" data-tooltip-content="{{.locale.Tr "rss_feed"}}">{{svg "octicon-rss" 18}}</a>
15+
{{end}}
16+
</div>
17+
{{if and (not .PageIsTagList) .CanCreateRelease}}
18+
<a class="ui right small green button" href="{{$.RepoLink}}/releases/new">
19+
{{.locale.Tr "repo.release.new_release"}}
20+
</a>
21+
{{end}}
22+
</div>
23+
<div class="ui divider"></div>
24+
{{else if $canReadCode}}
25+
{{/* if the "repo.releases" unit is disabled, only show the "commits / branches / tags" sub menu */}}
26+
{{template "repo/sub_menu" .}}
27+
{{end}}

‎templates/repo/sub_menu_release_tag.tmpl

-17
This file was deleted.

‎templates/repo/tag/list.tmpl

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
{{template "base/head" .}}
2-
32
<div role="main" aria-label="{{.Title}}" class="page-content repository tags">
43
{{template "repo/header" .}}
54
<div class="ui container">
65
{{template "base/alert" .}}
7-
{{template "repo/sub_menu_release_tag" .}}
8-
9-
<div class="ui divider"></div>
10-
6+
{{template "repo/release_tag_header" .}}
117
<h4 class="ui top attached header">
128
<div class="five wide column gt-df gt-ac">
139
{{svg "octicon-tag" 16 "gt-mr-2"}}{{.locale.Tr "repo.release.tags"}}
1410
</div>
1511
</h4>
16-
1712
{{$canReadReleases := $.Permission.CanRead $.UnitTypeReleases}}
18-
1913
<div class="ui attached table segment">
2014
<table class="ui very basic striped fixed table single line" id="tags-table">
2115
<tbody class="tag-list">

‎web_src/css/base.css

+6
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,12 @@ a.label,
364364
text-decoration: none !important;
365365
}
366366

367+
/* for most cases, we only use our svg icon as inline icon, so we need to make them inline-block and vertical-align: middle */
368+
svg.svg {
369+
display: inline-block;
370+
vertical-align: middle;
371+
}
372+
367373
.ui.red.labels .label,
368374
.ui.ui.ui.red.label,
369375
.ui.red.button,

‎web_src/css/organization.css

-5
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,6 @@
112112
margin-bottom: 0;
113113
}
114114

115-
.organization.profile #org-info .ui.header .org-visibility .label {
116-
margin-left: 5px;
117-
margin-top: 2px;
118-
}
119-
120115
.organization.profile #org-info .desc {
121116
font-size: 16px;
122117
margin-bottom: 10px;

‎web_src/js/components/RepoBranchTagSelector.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<div class="scrolling menu" ref="scrollContainer">
4040
<div v-for="(item, index) in filteredItems" :key="item.name" class="item" :class="{selected: item.selected, active: active === index}" @click="selectItem(item)" :ref="'listItem' + index">
4141
{{ item.name }}
42-
<a v-if="enableFeed && mode === 'branches'" role="button" class="ui compact muted right" :href="rssURLPrefix + item.url" target="_blank" @click.stop>
42+
<a v-if="enableFeed && mode === 'branches'" role="button" class="ui compact right muted" :href="rssURLPrefix + item.url" target="_blank" @click.stop>
4343
<svg-icon name="octicon-rss" :size="14"/>
4444
</a>
4545
</div>

0 commit comments

Comments
 (0)