Browse Source

Fix broken navigation

master
Eduard Kuzmenko 4 years ago
parent
commit
2cdae0ddd3
  1. 4
      src/components/appNavigationController.ts
  2. 6
      src/components/sidebarRight/tabs/sharedMedia.ts
  3. 9
      src/scss/partials/_profile.scss

4
src/components/appNavigationController.ts

@ -137,6 +137,7 @@ export class AppNavigationController { @@ -137,6 +137,7 @@ export class AppNavigationController {
const ret = this.findItemByType(type);
if(ret) {
this.manual = true;
// ! commented because 'popstate' event will be fired with delay
//if(ret.index !== (this.navigations.length - 1)) {
this.navigations.splice(ret.index, 1);
this.handleItem(ret.item);
@ -145,8 +146,7 @@ export class AppNavigationController { @@ -145,8 +146,7 @@ export class AppNavigationController {
}
}
// ! commented because 'popstate' event will be fired with delay
//history.back();
history.back();
}
public pushItem(item: NavigationItem) {

6
src/components/sidebarRight/tabs/sharedMedia.ts

@ -166,6 +166,7 @@ class PeerProfileAvatars { @@ -166,6 +166,7 @@ class PeerProfileAvatars {
public static BASE_CLASS = 'profile-avatars';
public container: HTMLElement;
public avatars: HTMLElement;
//public gradient: HTMLElement;
public info: HTMLElement;
public tabs: HTMLDivElement;
public listLoader: ListLoader<string>;
@ -178,13 +179,16 @@ class PeerProfileAvatars { @@ -178,13 +179,16 @@ class PeerProfileAvatars {
this.avatars = document.createElement('div');
this.avatars.classList.add(PeerProfileAvatars.BASE_CLASS + '-avatars');
//this.gradient = document.createElement('div');
//this.gradient.classList.add(PeerProfileAvatars.BASE_CLASS + '-gradient');
this.info = document.createElement('div');
this.info.classList.add(PeerProfileAvatars.BASE_CLASS + '-info');
this.tabs = document.createElement('div');
this.tabs.classList.add(PeerProfileAvatars.BASE_CLASS + '-tabs');
this.container.append(this.avatars, this.info, this.tabs);
this.container.append(this.avatars, /* this.gradient, */this.info, this.tabs);
let cancel = false;
attachClickEvent(this.container, (_e) => {

9
src/scss/partials/_profile.scss

@ -57,6 +57,15 @@ @@ -57,6 +57,15 @@
}
}
/* &-gradient {
position: absolute;
left: 0;
right: 0;
bottom: 0;
height: 80px;
background: linear-gradient(360deg, var(--secondary-color) 8.98%, rgba(0, 0, 0, 0) 100%);
} */
&-info {
position: absolute;
bottom: 0;

Loading…
Cancel
Save