MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-19 06:43:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

US East flag

Browse Source
This commit is contained in:
Natsumi
2021-12-01 11:13:53 +13:00
parent 0cf269750f
commit 3ab5e6a4f9
7 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
html/images/flag_use.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 774 B

BIN
html/images/flag_usw.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

10
html/src/app.js
View File

@@ -871,8 +871,10 @@ speechSynthesis.getVoices();
this.region = 'europeanunion';
} else if (L.region === 'jp') {
this.region = 'jp';
} else if (L.region === 'use') {
this.region = 'flag-icon-use';
} else {
this.region = 'us';
this.region = 'flag-icon-usw';
}
}
},
@@ -13983,8 +13985,10 @@ speechSynthesis.getVoices();
tags.push('~canRequestInvite');
}
}
if (D.region === 'USA') {
if (D.region === 'US West') {
tags.push(`~region(us)`);
} else if (D.region === 'US East') {
tags.push(`~region(use)`);
} else if (D.region === 'Europe') {
tags.push(`~region(eu)`);
} else if (D.region === 'Japan') {
@@ -14067,7 +14071,7 @@ speechSynthesis.getVoices();
'instanceDialogAccessType'
);
}
D.region = 'USA';
D.region = 'US West';
if (configRepository.getString('instanceRegion') !== null) {
D.region = configRepository.getString('instanceRegion');
}

14
html/src/app.scss
View File

@@ -645,3 +645,17 @@ i.x-user-status.busy {
margin-left: 3px;
border-radius: 2px;
}
.flag-icon-use {
background-image: url('/images/flag_use.png');
background-size: 16px 11px;
width: 16px;
height: 11px;
}
.flag-icon-usw {
background-image: url('/images/flag_usw.png');
background-size: 16px 11px;
width: 16px;
height: 11px;
}

9
html/src/index.pug
View File

@@ -90,7 +90,8 @@ html
span \#{{ currentInstanceLocation.instanceName }} {{ currentInstanceLocation.accessType }}
span.famfamfam-flags(v-if="currentInstanceLocation.region === 'eu'" class="europeanunion" style="display:inline-block;margin-left:5px")
span.famfamfam-flags(v-else-if="currentInstanceLocation.region === 'jp'" class="jp" style="display:inline-block;margin-left:5px")
span.famfamfam-flags(v-else class="us" style="display:inline-block;margin-left:5px")
span.flag-icon-use(v-else-if="currentInstanceLocation.region === 'use'" style="display:inline-block;margin-left:5px")
span.flag-icon-usw(v-else style="display:inline-block;margin-left:5px")
span(v-if="lastLocation.playerList.size > 0" style="margin-left:5px")
| {{ lastLocation.playerList.size }}
| #[template(v-if="lastLocation.friendList.size > 0") ({{ lastLocation.friendList.size }})]
@@ -1542,7 +1543,8 @@ html
span \#{{ room.$location.instanceName }} {{ room.$location.accessType }}
span.famfamfam-flags(v-if="room.$location.region === 'eu'" class="europeanunion" style="display:inline-block;margin-left:5px")
span.famfamfam-flags(v-else-if="room.$location.region === 'jp'" class="jp" style="display:inline-block;margin-left:5px")
span.famfamfam-flags(v-else class="us" style="display:inline-block;margin-left:5px")
span.flag-icon-use(v-else-if="currentInstanceLocation.region === 'use'" style="display:inline-block;margin-left:5px")
span.flag-icon-usw(v-else style="display:inline-block;margin-left:5px")
el-tooltip(placement="top" content="Invite yourself" :disabled="hideTooltips")
invite-yourself(:location="room.$location.tag" style="margin-left:5px")
el-tooltip(placement="top" content="Copy to clipboard" :disabled="hideTooltips")
@@ -1828,7 +1830,8 @@ html
el-radio-button(label="invite")
el-form-item(label="Region")
el-radio-group(v-model="newInstanceDialog.region" size="mini" @change="buildInstance")
el-radio-button(label="USA")
el-radio-button(label="US West")
el-radio-button(label="US East")
el-radio-button(label="Europe")
el-radio-button(label="Japan")
el-form-item(label="World ID")

4
html/src/vr.js
View File

@@ -146,8 +146,10 @@ Vue.component('marquee-text', MarqueeText);
this.region = 'europeanunion';
} else if (L.region === 'jp') {
this.region = 'jp';
} else if (L.region === 'use') {
this.region = 'flag-icon-use';
} else {
this.region = 'us';
this.region = 'flag-icon-usw';
}
}
}

14
html/src/vr.scss
View File

@@ -397,3 +397,17 @@ i.x-user-status.busy {
right: -160px;
bottom: 0;
}
.flag-icon-use {
background-image: url('/images/flag_use.png');
background-size: 16px 11px;
width: 16px;
height: 11px;
}
.flag-icon-usw {
background-image: url('/images/flag_usw.png');
background-size: 16px 11px;
width: 16px;
height: 11px;
}