diff --git a/web/source/css/profile.css b/web/source/css/profile.css index bfacc605f..be480c448 100644 --- a/web/source/css/profile.css +++ b/web/source/css/profile.css @@ -157,34 +157,22 @@ } } -.profile { - .col-header { - display: flex; - justify-content: start; - gap: 2rem; - align-items: center; +.profile .col-header { + display: flex; + justify-content: start; + gap: 2rem; + align-items: center; + margin: 0; + background: $profile-bg; + border-top-left-radius: $br; + border-top-right-radius: $br; + padding: 0.75rem; + + h3 { + font-size: 1.2rem; + line-height: 1.3rem; margin: 0; - background: $profile-bg; - border-top-left-radius: $br; - border-top-right-radius: $br; - padding: 0.75rem; - - h3 { - font-size: 1.2rem; - line-height: 1.3rem; - margin: 0; - } - - &.pinned { - display: grid; - grid-template-columns: auto 1fr; - gap: 1rem; - - a { - justify-self: end; - } - } } } @@ -194,6 +182,31 @@ flex-direction: column; gap: 0.4rem; + .col-header { + display: grid; + grid-template-columns: auto 1fr; + gap: 1rem; + + a { + justify-self: end; + } + + .rss-icon { + display: block; + margin: -0.25rem 0; + + .fa { + font-size: 2rem; + object-fit: contain; + vertical-align: middle; + color: $orange2; + /* can't size a single-color background, so we use a linear-gradient that's effectively white */ + background: linear-gradient(to right, $white1 100%, transparent 0) no-repeat center center; + background-size: 1.2rem 1.4rem; + } + } + } + .toot { .info { padding: 0.3rem 0.75rem; diff --git a/web/template/profile.tmpl b/web/template/profile.tmpl index 5e4bd9c0f..88b7ae535 100644 --- a/web/template/profile.tmpl +++ b/web/template/profile.tmpl @@ -20,123 +20,125 @@ {{ template "header.tmpl" .}}
-
-
- {{ if .account.Header }} - - {{ end }} -
- -
- Profile for - {{if .account.DisplayName}}{{.account.DisplayName}}{{else}}{{.account.Username}}{{end}}. - Username @{{.account.Username}}, {{acctInstance .account.Acct}} -
-
+
+
+ {{ if .account.Header }} + + {{ end }} +
+ +
+ Profile for + {{if .account.DisplayName}}{{.account.DisplayName}}{{else}}{{.account.Username}}{{end}}. + Username @{{.account.Username}}, {{acctInstance .account.Acct}} +
+
-
+
-
-
-

About

-
+
+
+

About

+
-
- {{ range .account.Fields }} -
- {{.Name}} - {{.Value}} -
- {{ end }} -
+
+ {{ range .account.Fields }} +
+ {{.Name}} + {{.Value}} +
+ {{ end }} +
-
- {{ if .account.Note }} - {{emojify .account.Emojis (noescape .account.Note)}} - {{else}} - This GoToSocial user hasn't written a bio yet! - {{end}} -
+
+ {{ if .account.Note }} + {{emojify .account.Emojis (noescape .account.Note)}} + {{else}} + This GoToSocial user hasn't written a bio yet! + {{end}} +
-
- Joined on {{.account.CreatedAt | timestampVague}}. - {{.account.StatusesCount}} post{{if .account.StatusesCount | eq 1 | not}}s{{end}}. - Followed by {{.account.FollowersCount}}. - Following {{.account.FollowingCount}}. -
+
+ Joined on {{.account.CreatedAt | timestampVague}}. + {{.account.StatusesCount}} post{{if .account.StatusesCount | eq 1 | not}}s{{end}}. + Followed by {{.account.FollowersCount}}. + Following {{.account.FollowingCount}}. +
- -
+ +
-
- {{ if .pinned_statuses }} -
-

Pinned posts

- jump to recent -
-
- {{ range .pinned_statuses }} -
- {{ template "status.tmpl" .}} -
- {{ end }} -
- {{ end }} +
+ {{ if .pinned_statuses }} +
+

Pinned posts

+ jump to recent +
+
+ {{ range .pinned_statuses }} +
+ {{ template "status.tmpl" .}} +
+ {{ end }} +
+ {{ end }} -
-

Recent posts

-
+
+

Recent posts

+ {{ if .rssFeed }} + + + + {{ end }} +
-
- {{ if not .statuses }} -
Nothing here!
- {{ else }} - {{ range .statuses }} -
- {{ template "status.tmpl" .}} -
- {{ end }} - {{ end }} -
+
+ {{ if not .statuses }} +
Nothing here!
+ {{ else }} + {{ range .statuses }} +
+ {{ template "status.tmpl" .}} +
+ {{ end }} + {{ end }} +
- -
-
+ + +
{{ template "footer.tmpl" .}} \ No newline at end of file