Skip to content

Benchpress escape #578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
barisusakli wants to merge 32 commits into
base: master
Choose a base branch
from
Draft

Benchpress escape #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
1b11df8
wrap helpers that return html with {{}]
barisusakli Jun 10, 2026
dd01d1e
dropdowncontent is html
barisusakli Jun 10, 2026
de7504e
fix: dont escape post content
barisusakli Jun 10, 2026
82473f6
descriptionParsed is also html
barisusakli Jun 10, 2026
0ebf7cf
refactor: move topic meta tags to core
barisusakli Jun 11, 2026
2e89d1f
fix about me and deleted topic titles via new helper
barisusakli Jun 11, 2026
ca54dbd
fix browser title and category links
barisusakli Jun 11, 2026
a1996d3
revert browser title
barisusakli Jun 11, 2026
cd73a75
fix topic event
barisusakli Jun 11, 2026
9a1305d
get rid of escapeTxhtml
barisusakli Jun 11, 2026
a3688e9
fix necro and breadcrumb
barisusakli Jun 12, 2026
1cc13dc
more escape fixes
barisusakli Jun 12, 2026
a5d53ab
remove manual escape
barisusakli Jun 12, 2026
04b6d73
fix profile links
barisusakli Jun 12, 2026
525295d
remove generateTopicTitle
barisusakli Jun 12, 2026
59d9407
15.0.0-beta.1
barisusakli Jun 12, 2026
3464f2d
more tx fixes
barisusakli Jun 12, 2026
e9e1891
more fixes
barisusakli Jun 14, 2026
1ad960c
Merge branch 'master' into benchpress-escape
barisusakli Jun 15, 2026
81b996d
dont need it on new branch
barisusakli Jun 15, 2026
5eefbae
derp
barisusakli Jun 15, 2026
213f401
move group tpls to core
barisusakli Jun 15, 2026
571f2f2
move toast to core
barisusakli Jun 15, 2026
80a0521
use tabs
barisusakli Jun 15, 2026
82d0ea0
fix escapes
barisusakli Jun 16, 2026
f29eb4e
move groups to core, txEscape
barisusakli Jun 16, 2026
3b9a783
15.0.0-beta.2
barisusakli Jun 16, 2026
6e29171
txEscape post list item
barisusakli Jun 16, 2026
ef83e37
txescape post content
barisusakli Jun 16, 2026
e19cb0b
account info
barisusakli Jun 16, 2026
3603d09
fix noItemsFoundKey
barisusakli Jun 17, 2026
d471681
more fixes
barisusakli Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "nodebb-theme-persona",
"version": "14.2.42",
"version": "15.0.0-beta.2",
"nbbpm": {
"compatibility": "^4.13.0"
"compatibility": "^4.14.0"
},
"description": "Persona theme for NodeBB",
"main": "library.js",
Expand Down
139 changes: 0 additions & 139 deletions scss/account.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,136 +15,6 @@
margin-right: auto;
}

.cover {
background-size: cover;
background-repeat: no-repeat;
height: 200px;
position: relative;
margin-bottom: 1em;
background-origin: content-box;
width: 100%;
top: var(--panel-offset);
position: absolute;
left: auto;
right: 0px;

.avatar-wrapper {
position: absolute;
left: 50%;
margin-left: -64px;
top: 128px;
border: 4px solid var(--bs-body-bg);
background-color: var(--bs-body-bg);
border-radius: 50%;

.persona-fab.btn-morph {
top: 93px;
right: 4px;
position: absolute;
}

.status {
position: absolute;
font-size: 23px;
top: 17px;
right: -3px;
padding: 10px;
}

.chat, .follow {
position: absolute;
width: 30px;
height: 30px;
}

.chat {
left: -1px;
bottom: 1px;
}

.follow {
right: 1px;
bottom: 1px;
}
}

&:hover .controls, .controls:focus-within {
opacity: 0.8;
}

.controls {
text-align: center;
height: 200px;
line-height: 200px;
opacity: 0;
@include transition(opacity .15s linear);
cursor: pointer;
pointer-events: none;

> * {
pointer-events: all;
}

.fa {
color: white;
background-color: #333;
opacity: 1;
margin: 15px;
padding: 5px;
}
}

&.active {
&:hover {
cursor: move;
}

.controls {
> * {
display: none;
}
}

.save {
display: inline-block;
}
}

&.saving {
.save {
display: none;
}

.indicator {
display: inline-block;
}
}

.save, .indicator {
display: inline-block;
position: absolute;
top: 1em;
right: 2em;
opacity: 1;
background-color: $primary;
color: $gray-200;
padding: 0.5em;
font-weight: bold;

&:hover {
cursor: pointer;
}
}

.save {
display: none;
}

.indicator {
display: none;
}
}

margin-top: 200px;

.container {
Expand Down Expand Up @@ -272,12 +142,3 @@
}
}

.user-picture-label {
font-size:20px;
}


.account-username{
font-size:20px;
font-weight:bold;
}
111 changes: 0 additions & 111 deletions scss/groups.scss
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion scss/persona.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
@import "header";
@import "status";
@import "account";
@import "groups";
@import "chats";
@import "search";
@import "topics_list";
Expand Down
2 changes: 1 addition & 1 deletion templates/account/blocks.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<li component="blocks/search/match">
<div class="dropdown-item rounded-1 d-flex flex-nowrap gap-2 justify-content-between align-items-center" role="menuitem">
<div class="text-truncate">
<a href="{config.relative_path}/uid/{../uid}">{buildAvatar(edit, "24px", true)} {../username}</a>
<a href="{config.relative_path}/uid/{../uid}">{{buildAvatar(edit, "24px", true)}} {../username}</a>
</div>

<button class="btn btn-sm btn-outline-danger text-nowrap {{{ if ./isBlocked }}}hidden{{{ end }}}" data-uid="{./uid}" data-action="block">[[user:block-user]]</button>
Expand Down
2 changes: 1 addition & 1 deletion templates/account/categories.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<div>
<div class="d-flex justify-content-between align-items-center mb-3">
<h1 class="fs-4">{title}</h1>
<h1 class="fs-4">{tx(title)}</h1>
<div class="mb-2">
<div class="dropdown bottom-sheet" component="category/watch/all">
<button class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false">
Expand Down
18 changes: 9 additions & 9 deletions templates/account/info.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div class="mb-4 pb-3 border-bottom">
<h6>[[user:info.invited-by]]</h6>
<div class="d-flex align-items-center gap-2">
<a href="">{buildAvatar(invitedBy, "24px", true)}</a>
<a href="">{{buildAvatar(invitedBy, "24px", true)}}</a>
<a href="">{invitedBy.username}</a>
</div>
</div>
Expand Down Expand Up @@ -43,7 +43,7 @@
<div>
{{{ if ./byUid }}}
<a class="lh-1" href="{{{ if ./byUser.userslug }}}{config.relative_path}/user/{./byUser.userslug}{{{ else }}}#{{{ end }}}">
{buildAvatar(./byUser, "18px", true)}</a>
{{buildAvatar(./byUser, "18px", true)}}</a>
{{{ end }}}
<span class="timeago text-sm text-secondary lh-1 align-middle" title="{./timestampISO}"></span>
</div>
Expand All @@ -63,7 +63,7 @@
<div>
{{{ if ./byUid }}}
<a class="lh-1" href="{{{ if ./byUser.userslug }}}{config.relative_path}/user/{./byUser.userslug}{{{ else }}}#{{{ end }}}">
{buildAvatar(./byUser, "18px", true)}</a>
{{buildAvatar(./byUser, "18px", true)}}</a>
{{{ end }}}
<span class="timeago text-sm text-secondary lh-1 align-middle" title="{./timestampISO}"></span>
</div>
Expand Down Expand Up @@ -107,7 +107,7 @@
<span class="text-sm">[[user:info.reported-by]]</span>
<div class="d-flex text-nowrap">
{{{ each ./reports }}}
<a style="width: 18px; z-index: 3;" class="text-decoration-none" href="{config.relative_path}/user/{./reporter.userslug}">{buildAvatar(./reporter, "24px", true)}</a>
<a style="width: 18px; z-index: 3;" class="text-decoration-none" href="{config.relative_path}/user/{./reporter.userslug}">{{buildAvatar(./reporter, "24px", true)}}</a>
{{{ end }}}
</div>
</div>
Expand Down Expand Up @@ -138,7 +138,7 @@
<li class="mb-4 border-bottom">
<div class="mb-1 d-flex align-items-center justify-content-between">
<div>
<a href="{config.relative_path}/user/{./user.userslug}">{buildAvatar(./user, "24px", true)}</a>
<a href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(./user, "24px", true)}}</a>
<strong>
<a href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}" itemprop="author" data-username="{./user.username}" data-uid="{./user.uid}">{./user.username}</a>
</strong>
Expand All @@ -151,7 +151,7 @@
{{{ end }}}
</div>
<p class="mb-1">
<span class="reason">[[user:info.banned-reason-label]]: <strong>{./reason}</strong></span>
<span class="reason">[[user:info.banned-reason-label]]: <strong>{tx(./reason)}</strong></span>
</p>
<p>
{{{ if ./until }}}
Expand Down Expand Up @@ -192,7 +192,7 @@
<li class="mb-4 border-bottom">
<div class="mb-1 d-flex align-items-center justify-content-between">
<div>
<a href="{config.relative_path}/user/{./user.userslug}">{buildAvatar(./user, "24px", true)}</a>
<a href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(./user, "24px", true)}}</a>
<strong>
<a href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}" itemprop="author" data-username="{./user.username}" data-uid="{./user.uid}">{./user.username}</a>
</strong>
Expand All @@ -205,7 +205,7 @@
{{{ end }}}
</div>
<p class="mb-1">
<span class="reason">[[user:info.banned-reason-label]]: <strong>{./reason}</strong></span>
<span class="reason">[[user:info.banned-reason-label]]: <strong>{tx(./reason)}</strong></span>
</p>
<p>
{{{ if ./until }}}
Expand Down Expand Up @@ -240,7 +240,7 @@

<div data-id="{./id}">
<div class="d-flex align-items-baseline gap-1 mb-1">
<a href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}">{buildAvatar(./user, "24px", true)}</a>
<a href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}">{{buildAvatar(./user, "24px", true)}}</a>

<a href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}" class="fw-bold" itemprop="author" data-username="{./user.username}" data-uid="{./user.uid}">{./user.username}</a>

Expand Down
Loading