Skip to content

Commit 0533b8e

Browse files
authored
Merge pull request #491 from PretendoNetwork/work/fixfixfix
fix(ui): bugs
2 parents 462367c + b1b9ee2 commit 0533b8e

8 files changed

Lines changed: 13 additions & 12 deletions

File tree

apps/juxtaposition-ui/src/services/juxt-web/views/ctr/userPageView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export function CtrUserPageView(props: UserPageViewProps): ReactNode {
6363
<span className="sprite sp-follower-count inline-sprite"></span>
6464
<span id="followers">
6565
{' '}
66-
{props.userContent.following_users.length - 1}
66+
{props.userContent.following_users.length}
6767
</span>
6868
</span>
6969
</span>

apps/juxtaposition-ui/src/services/juxt-web/views/portal/communityListView.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ export function PortalCommunityListView(props: CommunityListViewProps): ReactNod
3232
<PortalPageBody>
3333
<header id="header">
3434
<h1 id="page-title"><T k="all_communities.text" /></h1>
35-
<a id="header-communities-button" href="/titles/all" data-pjax="#body"><T k="all_communities.text" /></a>
3635
</header>
3736
<div className="body-content">
3837
<div className="communities-list">

apps/juxtaposition-ui/src/services/juxt-web/views/portal/navbar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ export function PortalNavBar(props: NavBarProps): ReactNode {
5858
</a>
5959
</li>
6060
<li id="nav-menu-exit" evt-click="exit()">
61-
<a role="button" data-sound="SE_WAVE_EXIT">
61+
<a role="button" data-sound="SE_WAVE_EXIT" tabIndex={0}>
6262
<T k="global.close" />
6363
</a>
6464
</li>
6565
<li id="nav-menu-back" className="none" evt-click="back()">
66-
<a role="button" className="accesskey-B" data-sound="SE_WAVE_BACK">
66+
<a role="button" className="accesskey-B" data-sound="SE_WAVE_BACK" tabIndex={0}>
6767
<T k="global.go_back" />
6868
</a>
6969
</li>

apps/juxtaposition-ui/src/services/juxt-web/views/portal/userPageView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ export function PortalUserPageView(props: UserPageViewProps): ReactNode {
133133
{' | '}
134134
<PortalUIIcon name="followers" />
135135
{' '}
136-
<span id="followers">{props.userContent.following_users.length - 1}</span>
136+
<span id="followers">{props.userContent.following_users.length}</span>
137137
</span>
138138
{props.userSettings.country_visibility
139139
? (

apps/juxtaposition-ui/src/services/juxt-web/views/web/admin/editCommunityView.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export function WebEditCommunityView(props: EditCommunityViewProps): ReactNode {
6565
</div>
6666
<div className="col-md-3">
6767
<label className="labels" htmlFor="browserIcon">Browser Icon (128px x 128px)</label>
68-
<input type="file" id="browserIcon" data-image-preview accept="image/jpg" name="browserIcon" />
68+
<input type="file" id="browserIcon" data-image-preview accept="image/png" name="browserIcon" />
6969
</div>
7070
<div className="col-md-3">
7171
{community.icon_paths
@@ -78,7 +78,7 @@ export function WebEditCommunityView(props: EditCommunityViewProps): ReactNode {
7878
</div>
7979
<div className="col-md-3">
8080
<label className="labels" htmlFor="CTRbrowserHeader">3DS Browser Banner (400px x 220px)</label>
81-
<input type="file" id="CTRbrowserHeader" data-image-preview accept="image/jpg" name="CTRbrowserHeader" />
81+
<input type="file" id="CTRbrowserHeader" data-image-preview accept="image/png" name="CTRbrowserHeader" />
8282
</div>
8383
<div className="col-md-3">
8484
{community.ctr_header
@@ -91,7 +91,7 @@ export function WebEditCommunityView(props: EditCommunityViewProps): ReactNode {
9191
</div>
9292
<div className="col-md-3">
9393
<label className="labels" htmlFor="WiiUbrowserHeader">Wii U Browser Banner (1280px x 180px)</label>
94-
<input type="file" id="WiiUbrowserHeader" data-image-preview accept="image/jpg" name="WiiUbrowserHeader" />
94+
<input type="file" id="WiiUbrowserHeader" data-image-preview accept="image/png" name="WiiUbrowserHeader" />
9595
</div>
9696
<div className="col-md-3">
9797
{community.wup_header

apps/juxtaposition-ui/src/services/juxt-web/views/web/userPageView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ export function WebUserPageView(props: UserPageViewProps): ReactNode {
142142
return (
143143
<WebRoot head={head}>
144144
<h2 id="title" className="page-header"><T k="global.user_page" /></h2>
145-
<WebNavBar selection={-1} />
145+
<WebNavBar selection={isSelf ? 0 : -1} />
146146
<div id="toast"></div>
147147
<WebWrapper className="community-page-post-box">
148148
<div className="community-top">

apps/juxtaposition-ui/webfiles/ctr/css/juxt.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
body {
99
margin: 0;
10-
font-family: Arial, serif;
10+
font-family: nintendo_NTLG-DB_001,sans-serif;
1111
width: 400px;
1212
background: #00f
1313
}
1414

1515
#body,
1616
#header,
1717
body {
18-
overflow-x: clip
18+
overflow-x: hidden;
1919
}
2020

2121
#body {
@@ -75,7 +75,7 @@ ul {
7575
bottom: 0;
7676
height: 52px;
7777
line-height: 47px;
78-
font-size: 25px;
78+
font-size: 18px;
7979
white-space: nowrap;
8080
display: inline;
8181
padding-left: 15px;

apps/juxtaposition-ui/webfiles/web/js/web.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ function initMorePosts() {
108108
for (let i = 0; i < els.length; i++) {
109109
els[i].addEventListener('click', function (e) {
110110
const el = e.currentTarget;
111+
// Prevent re-entering this handler. Can happen e.g. with macOS scroll events, see #349
112+
el.disabled = true;
111113
GET(el.getAttribute('data-href'), function a(data) {
112114
const response = data.response;
113115
if (response && data.status === 200) {

0 commit comments

Comments
 (0)