Skip to content

Commit f485754

Browse files
committed
missing translations, updates logos, styling fixes, show contact details on avatar in chat
1 parent ba76338 commit f485754

File tree

15 files changed

+409
-369
lines changed

15 files changed

+409
-369
lines changed

Spixi/Resources/Raw/html/contact_details.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<link rel="stylesheet" type="text/css" href="libs/fontawesome/css/fontawesome.min.css">
1717
<link rel="stylesheet" type="text/css" href="libs/fontawesome/css/solid.min.css">
1818

19-
2019
<script src="js/jquery.min.js"></script>
2120
<script src="js/jquery.touchSwipe.min.js"></script>
2221
<script src="js/bootstrap.min.js"></script>
@@ -34,7 +33,7 @@
3433
<div class="spixi-contact-details-header-user">
3534
<img id="avatar" src="img/spixiavatar.png" alt="avatar" class="spixi-contact-details-avatar"/>
3635
<div class="spixi-contact-details-username" id="username-view-container">
37-
<div class="label-lg s-text-inverse" id="nickname"></div>
36+
<div class="label-lg s-text-inverse" id="nickname">testtesttesttesttetesttestteststtesttesttesttesttesttesttesttesttesttesttesttesttest</div>
3837
<i class="fas fa-pen" onclick="showEditUsername()"></i>
3938
</div>
4039
<div class="spixi-contact-details-username-edit" style="display: none;" id="username-edit-container">
@@ -97,7 +96,7 @@
9796
</div>
9897
</div>
9998
<div class="spixi-contact-details-body-address-container">
100-
<div id="toastbar" class="spixi-toastbar"><i class="fa fa-paste"></i>*SL{address-copied}</div>
99+
<div id="toastbar" class="spixi-toastbar"><i class="fa fa-paste"></i> *SL{address-copied}</div>
101100
<span class="label-sm s-text-02">*SL{contact-details-account-address}</span>
102101
<div style="margin: 0" class="address_qr" id="qrcode"></div>
103102
<div class="payment-data-hash-copy">

Spixi/Resources/Raw/html/css/spixiui-dark.css

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1821,6 +1821,11 @@ img.emoji {
18211821
cursor: pointer;
18221822
}
18231823

1824+
#menu_nickname,
1825+
#user-address {
1826+
color: var(--colors-text-01);
1827+
}
1828+
18241829
.spixi-sidebar-avatar {
18251830
max-width: 64px;
18261831
max-height: 64px;
@@ -5071,7 +5076,7 @@ img.emoji {
50715076
}
50725077

50735078
.options {
5074-
background: radial-gradient(54.59% 54.59% at 50% 45.41%, #182735 0%, #0B1013 80.77%);
5079+
background: var(--colors-surface-01);
50755080
position: absolute;
50765081
top: 100%;
50775082
left: 0;

Spixi/Resources/Raw/html/css/spixiui-light.css

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1810,6 +1810,11 @@ img.emoji {
18101810
cursor: pointer;
18111811
}
18121812

1813+
#menu_nickname,
1814+
#user-address{
1815+
color: var(--colors-text-inverse);
1816+
}
1817+
18131818
.spixi-sidebar-avatar {
18141819
max-width: 64px;
18151820
max-height: 64px;
@@ -4817,11 +4822,14 @@ img.emoji {
48174822
}
48184823

48194824
.spixi-contact-details-header-user {
4825+
width: 100%;
4826+
max-width: 556px;
48204827
display: flex;
48214828
flex-direction: column;
48224829
align-items: center;
48234830
gap: 16px;
48244831
position: relative;
4832+
overflow: hidden;
48254833
}
48264834

48274835
.spixi-contact-details-username {
@@ -4836,10 +4844,18 @@ img.emoji {
48364844
}
48374845
}
48384846

4847+
.spixi-contact-details-username #nickname{
4848+
max-width: 280px;
4849+
overflow: hidden;
4850+
text-overflow: ellipsis;
4851+
white-space: nowrap;
4852+
}
4853+
48394854
.spixi-contact-details-header-actions {
48404855
display: flex;
48414856
gap: 68px;
48424857
width: 100%;
4858+
max-width: 556px;
48434859
flex-wrap: wrap;
48444860
justify-content: center;;
48454861
}

Spixi/Resources/Raw/html/img/dark/spixi-logo-full.svg

Lines changed: 6 additions & 6 deletions
Loading

Spixi/Resources/Raw/html/img/spixi-logo-full.svg

Lines changed: 1 addition & 1 deletion
Loading

Spixi/Resources/Raw/html/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,10 +421,10 @@
421421
<div class="spixi-sidebar-header-user-details">
422422
<img id="avatar_image" class="spixi-sidebar-avatar" src="img/spixiavatar.png" alt="user-avatar"/>
423423
<div class="spixi-sidebar-header-user-details-text">
424-
<span id="menu_nickname" class="label-lg s-text-inverse">*SL{index-side-title}</span>
424+
<span id="menu_nickname" class="label-lg">*SL{index-side-title}</span>
425425
<div class="masked-user-address" onclick="onMaskWalletAddressHandler()">
426426
<img src="img/ixi-icon.svg" alt="ixi-icon" width="20" height="20"/>
427-
<span id="user-address" class="label-xs s-text-inverse"></span>
427+
<span id="user-address" class="label-xs"></span>
428428
</div>
429429
</div>
430430
</div>

Spixi/Resources/Raw/html/intro.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,9 +363,7 @@ <h4>16. Entire Agreement</h4>
363363
if (!selectedLang) {
364364
return;
365365
}
366-
367366
changeLanguage(selectedLang)
368-
369367
}
370368

371369
function showOnboardingSection() {

Spixi/Resources/Raw/html/js/chat.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -670,12 +670,16 @@ function addText(id, address, nick, avatar, text, time, className) {
670670
}
671671
var avatarHtml = avatarEl.outerHTML;
672672
avatarEl.onclick = function (e) {
673-
if (nick == "") {
674-
address = userAddress;
675-
nick = userNick;
673+
if(!isBot){
674+
showBotDetails()
675+
} else{
676+
if (nick == "") {
677+
address = userAddress;
678+
nick = userNick;
679+
}
680+
showUserDetails(avatarHtml + " " + nick, address);
681+
e.preventDefault;
676682
}
677-
showUserDetails(avatarHtml + " " + nick, address);
678-
e.preventDefault;
679683
};
680684

681685
bubbleEl.appendChild(avatarEl);

Spixi/Resources/Raw/html/js/spixi.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ function limitToTwoDecimals(inputAsString) {
376376
}
377377

378378
function checkThemePath(path) {
379-
const theme = localStorage.getItem('theme');
379+
const theme = localStorage.getItem('theme') || 'light';
380380
if (theme === 'dark') {
381381
return path.replace('img/', 'img/dark/');
382382
}

0 commit comments

Comments
 (0)