merge develop

This commit is contained in:
_Bastler
2021-04-13 15:40:02 +02:00
3 changed files with 12 additions and 7 deletions
+9 -4
View File
@@ -88,21 +88,26 @@
}
}
@media (max-aspect-ratio: 1/1) {
#main-container {
display: flex;
flex-direction: column-reverse;
}
#cowebsite {
left: 0;
bottom: 0;
top: 0;
width: 100%;
height: 50%;
display: flex;
flex-direction: column;
flex-direction: column-reverse;
&.loading {
transform: translateY(90%);
transform: translateY(-90%);
}
&.hidden {
transform: translateY(100%);
transform: translateY(-100%);
}
main {
+1 -1
View File
@@ -14,7 +14,7 @@ export function isUserNameValid(value: string): boolean {
return regexp.test(value);
}
export function areCharacterLayersValid(value: string[]): boolean {
export function areCharacterLayersValid(value: string[] | null): boolean {
if (!value || !value.length) return false;
for (let i = 0; i < value.length; i++) {
if (/^\w+$/.exec(value[i]) === null) {
+2 -2
View File
@@ -32,7 +32,7 @@ class CoWebsiteManager {
private resizing: boolean = false;
private cowebsiteMainDom: HTMLDivElement;
private cowebsiteAsideDom: HTMLDivElement;
get width(): number {
return this.cowebsiteDiv.clientWidth;
}
@@ -74,7 +74,7 @@ class CoWebsiteManager {
private initResizeListeners() {
const movecallback = (event:MouseEvent) => {
this.verticalMode ? this.height -= event.movementY / this.getDevicePixelRatio() : this.width -= event.movementX / this.getDevicePixelRatio();
this.verticalMode ? this.height += event.movementY / this.getDevicePixelRatio() : this.width -= event.movementX / this.getDevicePixelRatio();
this.fire();
}