Skip to content
This repository has been archived by the owner on Jun 27, 2023. It is now read-only.

Commit

Permalink
Merge branch 'main' of github.com:arthyn/taisho into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Hunter Miller committed Apr 24, 2021
2 parents 7c4840a + b7f64c4 commit 8160f1c
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 9 deletions.
3 changes: 2 additions & 1 deletion src/background/services/pier-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,12 @@ export class PierService {
async resumePier(pier: Pier): Promise<Pier | null> {
const accuratePier = await this.checkPier(pier)
if (accuratePier.running)
return accuratePier
return await this.updatePier({ ...accuratePier, lastUsed: (new Date()).toISOString() });

const ports = await this.spawnUrbit(this.getSpawnArgs(accuratePier), accuratePier.slug)
const updatedPier: Pier = {
...accuratePier,
lastUsed: (new Date()).toISOString(),
webPort: ports.web,
loopbackPort: ports.loopback,
running: true
Expand Down
6 changes: 3 additions & 3 deletions src/renderer/shared/MessageLogger.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ export const MessageLogger: React.FC<{ slug: string }> = ({ slug }) => {
}, [])

return (
<div className="relative">
<div className="absolute top-0 left-0 right-0 bottom-0 z-20 bg-gradient-to-b from-black to-transparent" />
<pre className="flex flex-col-reverse h-56 space-y-0 pt-10 pl-10 font-mono text-xs text-gray-500 overflow-y-auto">
<div className="relative min-w-xl">
<div className="absolute top-0 left-0 right-0 bottom-0 z-20 bg-gradient-to-b from-black to-transparent pointer-events-none" />
<pre className="flex flex-col-reverse h-56 space-y-0 pt-10 pl-10 font-mono text-xs text-gray-500 overflow-auto">
{messages.map((msg, index) => (
<div key={index + msg.text}>{msg.text}</div>
))}
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/ship/components/ShipList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const ShipList = ({ piers }: { piers: Pier[]}) => {
}

return (
<ul className="space-y-4">
<ul className="space-y-4 overflow-y-auto max-h-96 pr-1">
{piers.sort((a,b) => b.lastUsed.localeCompare(a.lastUsed)).map(pier => (
<li key={pier.slug} className="flex items-center p-2 bg-gray-900 rounded">
<div>
Expand Down
24 changes: 24 additions & 0 deletions src/renderer/styles/base.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
a {
@apply inline-block focus:outline-none focus:ring focus:ring-gray-600 focus:ring-opacity-50;
}

* {
scrollbar-width: thin;
}

*::-webkit-scrollbar {
@apply w-1.5 h-1.5 bg-transparent;
}

*::-webkit-scrollbar-track {
@apply bg-transparent;
}

*::-webkit-scrollbar-thumb {
@apply bg-gray-700 rounded-full;
}

*::-webkit-scrollbar-corner,
*::-webkit-resizer {
@apply hidden;
}
5 changes: 1 addition & 4 deletions src/renderer/styles/index.css
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
@import "tailwindcss/base";
@import "./base";

@import "tailwindcss/components";
@import "./components";

@import "tailwindcss/utilities";

a {
@apply inline-block focus:outline-none focus:ring focus:ring-gray-600 focus:ring-opacity-50;
}

.border-t-gray-300 {
border-top-color: rgba(209,213,219,var(--tw-border-opacity));
}
Expand Down
1 change: 1 addition & 0 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ module.exports = {
},
minWidth: {
...theme.spacing,
...theme.maxWidth,
'22': '5.5rem'
},
height: {
Expand Down

0 comments on commit 8160f1c

Please sign in to comment.