Merge branch 'main' into tasiaiso-format
This commit is contained in:
		| @@ -1,5 +1,5 @@ | ||||
| { | ||||
| 	"type": "tildefriends-app", | ||||
| 	"emoji": "🐌", | ||||
| 	"previous": "&raSj7ozmSDNGmB6TtjDk7oOiTc33ZN+RrBMASJ2F4cA=.sha256" | ||||
| 	"previous": "&cN1BLgsD5fU8QzkNbtKR/Ie1fO3miBq8FVSpgNqFbrc=.sha256" | ||||
| } | ||||
|   | ||||
| @@ -345,13 +345,15 @@ class TfElement extends LitElement { | ||||
| 					([k, v]) => html` | ||||
| 						<button | ||||
| 							title=${v} | ||||
| 							class="w3-bar-item w3-padding-large w3-hover-theme tab ${self.tab == | ||||
| 							v | ||||
| 							class="w3-bar-item w3-padding w3-hover-theme tab ${self.tab == v | ||||
| 								? 'w3-theme-l2' | ||||
| 								: 'w3-theme-l1'}" | ||||
| 							@click=${() => self.set_tab(v)} | ||||
| 						> | ||||
| 							${k} | ||||
| 							<span class=${self.tab == v ? '' : 'w3-hide-small'} | ||||
| 								>${v.charAt(0).toUpperCase() + v.substring(1)}</span | ||||
| 							> | ||||
| 						</button> | ||||
| 					` | ||||
| 				)} | ||||
|   | ||||
| @@ -193,12 +193,16 @@ class TfTabConnectionsElement extends LitElement { | ||||
| 					${this.identities.map( | ||||
| 						(x) => | ||||
| 							html`<li class="w3-bar"> | ||||
| 								${x == this.server_identity ? | ||||
| 									html`<span class="w3-tag w3-medium w3-round w3-theme-l1">🖥 local server</span>` : | ||||
| 									undefined} | ||||
| 								${this.my_identities.indexOf(x) != -1 ? | ||||
| 									html`<span class="w3-tag w3-medium w3-round w3-theme-d1">😎 you</span>` : | ||||
| 									undefined} | ||||
| 								${x == this.server_identity | ||||
| 									? html`<span class="w3-tag w3-medium w3-round w3-theme-l1" | ||||
| 											>🖥 local server</span | ||||
| 										>` | ||||
| 									: undefined} | ||||
| 								${this.my_identities.indexOf(x) != -1 | ||||
| 									? html`<span class="w3-tag w3-medium w3-round w3-theme-d1" | ||||
| 											>😎 you</span | ||||
| 										>` | ||||
| 									: undefined} | ||||
| 								<tf-user id=${x} .users=${this.users}></tf-user> | ||||
| 							</li>` | ||||
| 					)} | ||||
|   | ||||
| @@ -115,13 +115,17 @@ class TfTabNewsElement extends LitElement { | ||||
| 				></tf-profile>` | ||||
| 			: undefined; | ||||
| 		let edit_profile; | ||||
| 		if (!this.loading && | ||||
| 		if ( | ||||
| 			!this.loading && | ||||
| 			this.users[this.whoami]?.name === undefined && | ||||
| 			this.hash.substring(1) != this.whoami) { | ||||
| 			edit_profile = html` | ||||
| 				<div class="w3-panel w3-padding w3-round w3-card-4 w3-theme-l3"> | ||||
| 					ℹ️ Follow your identity link ☝️ above to edit your profile and set your name. | ||||
| 				</div>`; | ||||
| 			this.hash.substring(1) != this.whoami | ||||
| 		) { | ||||
| 			edit_profile = html` <div | ||||
| 				class="w3-panel w3-padding w3-round w3-card-4 w3-theme-l3" | ||||
| 			> | ||||
| 				ℹ️ Follow your identity link ☝️ above to edit your profile and set your | ||||
| 				name. | ||||
| 			</div>`; | ||||
| 		} | ||||
| 		return html` | ||||
| 			<p class="w3-bar"> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user