Skip to content

Commit 8f5a631

Browse files
committed
RSS icon fixes
1 parent 9ad5b59 commit 8f5a631

File tree

9 files changed

+30
-15
lines changed

9 files changed

+30
-15
lines changed

templates/org/home.tmpl

Lines changed: 5 additions & 5 deletions
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-ac 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}}
11-
<span class="org-visibility">
8+
<span class="org-visibility gt-df gt-ml-3">
129
{{if .Org.Visibility.IsLimited}}<div class="ui large basic horizontal label">{{.locale.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}}
1310
{{if .Org.Visibility.IsPrivate}}<div class="ui large basic horizontal label">{{.locale.Tr "org.settings.visibility.private_shortname"}}</div>{{end}}
1411
</span>
12+
{{if .EnableFeed}}
13+
<a href="{{.Org.HomeLink}}.rss" class="rss-icon" 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<div class="gt-mx-2">/</div>
1515
<a href="{{$.RepoLink}}">{{.Name}}</a>
1616
{{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>
17+
<a href="{{$.RepoLink}}.rss" class="rss-icon" data-tooltip-content="{{$.locale.Tr "rss_feed"}}">{{svg "octicon-rss" 18}}</a>
1818
{{end}}
1919
<div class="labels gt-df gt-ac gt-fw">
2020
{{if .IsTemplate}}

templates/repo/release/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{template "base/head" .}}
22
<div role="main" aria-label="{{.Title}}" class="page-content repository releases">
33
{{template "repo/header" .}}
4-
<div class="ui container">
4+
<div class="ui container releases-page">
55
{{template "base/alert" .}}
66
{{template "repo/sub_menu_release_tag" .}}
77

templates/repo/sub_menu_release_tag.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</h2>
1111

1212
{{if .EnableFeed}}
13-
<a href="{{.RepoLink}}/{{if .PageIsTagList}}tags{{else}}releases{{end}}.rss"><i class="ui grey icon gt-ml-3" data-tooltip-content="{{.locale.Tr "rss_feed"}}">{{svg "octicon-rss" 18}}</i></a>
13+
<a class="rss-icon" href="{{.RepoLink}}/{{if .PageIsTagList}}tags{{else}}releases{{end}}.rss" data-tooltip-content="{{.locale.Tr "rss_feed"}}">{{svg "octicon-rss" 18}}</a>
1414
{{end}}
1515
{{else if $canReadCode}}
1616
{{template "repo/sub_menu" .}}

templates/repo/tag/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<div role="main" aria-label="{{.Title}}" class="page-content repository tags">
44
{{template "repo/header" .}}
5-
<div class="ui container">
5+
<div class="ui container releases-page">
66
{{template "base/alert" .}}
77
{{template "repo/sub_menu_release_tag" .}}
88

web_src/css/index.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
@import "./animations.css";
2+
23
@import "./shared/issuelist.css";
34
@import "./shared/repoorg.css";
5+
@import "./shared/rss.css";
6+
47
@import "./features/dropzone.css";
58
@import "./features/gitgraph.css";
69
@import "./features/heatmap.css";
710
@import "./features/imagediff.css";
811
@import "./features/codeeditor.css";
912
@import "./features/projects.css";
13+
1014
@import "./modules/tippy.css";
1115
@import "./modules/modal.css";
1216
@import "./modules/breadcrumb.css";
17+
1318
@import "./code/linebutton.css";
19+
1420
@import "./markup/content.css";
1521
@import "./markup/codecopy.css";
1622
@import "./markup/asciicast.css";

web_src/css/organization.css

Lines changed: 0 additions & 5 deletions
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/css/shared/rss.css

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
.rss-icon {
2+
display: inline-flex;
3+
margin-left: .5rem;
4+
color: var(--color-text-light-1);
5+
}
6+
7+
.releases-page .rss-icon {
8+
position: relative;
9+
top: 6px;
10+
}
11+
12+
.organization .rss-icon {
13+
margin-left: 0;
14+
}

web_src/js/components/RepoBranchTagSelector.vue

Lines changed: 1 addition & 1 deletion
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 rss-icon" :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)