Skip to content

Commit

Permalink
Merge branch 'master' into sbruens/macos-click
Browse files Browse the repository at this point in the history
  • Loading branch information
sbruens committed Feb 22, 2024
2 parents 091d002 + 93f2ecd commit f8a2df2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Outline Client

![Build and Test](https://github.com/Jigsaw-Code/outline-client/actions/workflows/build_and_test_debug.yml/badge.svg?branch=master) [![Mattermost](https://badgen.net/badge/Mattermost/Outline%20Community/blue)](https://community.internetfreedomfestival.org/community/channels/outline-community) [![Reddit](https://badgen.net/badge/Reddit/r%2Foutlinevpn/orange)](https://www.reddit.com/r/outlinevpn/)
![Build and Test](https://github.com/Jigsaw-Code/outline-client/actions/workflows/build_and_test_debug_client.yml/badge.svg?branch=master) [![Mattermost](https://badgen.net/badge/Mattermost/Outline%20Community/blue)](https://community.internetfreedomfestival.org/community/channels/outline-community) [![Reddit](https://badgen.net/badge/Reddit/r%2Foutlinevpn/orange)](https://www.reddit.com/r/outlinevpn/)

> **Test coverage currently only tracks the Apple Libraries and core web view code:**
>
Expand Down
5 changes: 3 additions & 2 deletions src/www/views/servers_view/server_list/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export class ServerList extends LitElement {
width: 100%;
}
/* TODO(daniellacosse): Remove the hard-coded heights. */
server-row-card {
margin: 0 auto 8px auto;
height: 130px;
Expand All @@ -47,11 +48,11 @@ export class ServerList extends LitElement {

render() {
if (this.hasSingleServer) {
return html` <server-hero-card .localize=${this.localize} .server="${this.servers[0]}"></server-hero-card> `;
return html`<server-hero-card .localize=${this.localize} .server=${this.servers[0]}></server-hero-card>`;
} else {
return html`
${this.servers.map(
server => html`<server-row-card .localize=${this.localize} .server="${server}"></server-row-card>`
server => html`<server-row-card .localize=${this.localize} .server=${server}></server-row-card>`
)}
`;
}
Expand Down

0 comments on commit f8a2df2

Please sign in to comment.