Skip to content

Commit

Permalink
Merge branch 'master' of ssh://github.com/tryflame/buildbuddy
Browse files Browse the repository at this point in the history
  • Loading branch information
tylerwilliams committed Feb 19, 2020
2 parents 2078f56 + 2f6766b commit 624bff0
Show file tree
Hide file tree
Showing 16 changed files with 279 additions and 80 deletions.
210 changes: 152 additions & 58 deletions app/invocation/invocation.tsx

Large diffs are not rendered by default.

7 changes: 2 additions & 5 deletions app/menu/menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,8 @@ export default class MenuComponent extends React.Component {
<div className="side-menu">
<ul>
<li><a href="/">Home</a></li>
<li><a href="/">Release notes</a></li>
<li><a href="/">Community slack</a></li>
<li><a href="/">Help page</a></li>
<li><a href="/">Github repo</a></li>
<li><a href="/">Contact us</a></li>
<li><a href="https://github.com/tryflame/buildbuddy">Github repo</a></li>
<li><a href="mailto:help@tryflame.com">Contact us</a></li>
</ul>
</div>}
</div>
Expand Down
5 changes: 1 addition & 4 deletions app/root/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ export default class RootComponent extends React.Component {

getCurrentInvocationId() {
let invocationPath = "/invocation/"
if (this.state.hash.startsWith("#" + invocationPath)) {
return this.state.hash.replace("#" + invocationPath, "");
}
if (!this.state.path.startsWith(invocationPath)) {
return null;
}
Expand All @@ -45,7 +42,7 @@ export default class RootComponent extends React.Component {
return (
<div>
<MenuComponent />
{invocationId && <InvocationComponent invocationId={invocationId} />}
{invocationId && <InvocationComponent invocationId={invocationId} hash={this.state.hash} />}
{!invocationId && <HomeComponent />}
</div>
);
Expand Down
3 changes: 3 additions & 0 deletions static/image/activity-regular.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions static/image/alert-circle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions static/image/check-circle-regular.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions static/image/clock-regular.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions static/image/hard-drive-regular.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions static/image/help-circle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions static/image/play-circle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions static/image/target-regular.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions static/image/tool-regular.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions static/image/user-regular.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions static/image/x-circle-regular.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions static/image/zap-regular.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
86 changes: 73 additions & 13 deletions static/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ a {
/** Container **/

.container {
max-width: 800px;
max-width: 1000px;
margin: 0 auto;
width: 100%;
padding: 0 32px;
Expand All @@ -50,9 +50,9 @@ a {
box-sizing: border-box;
font-weight: 700;
font-size: 24px;
z-index: 1;
z-index: 2;
position: relative;
background-color: rgba(55,71,79 ,1);
background-color: rgba(38,50,56 ,1);
color: #fff;
}

Expand All @@ -74,13 +74,15 @@ a {
/** Side menu **/

.side-menu {
position: fixed;
position: absolute;
top: 64px;
left: 0;
bottom: 0;
background-color: #fff;
padding: 32px 48px;
box-shadow: 0px 1px 4px rgba(0, 0, 0, .15);
border-bottom-right-radius: 8px;
z-index: 1;
}

.side-menu li {
Expand All @@ -104,31 +106,88 @@ a {
.shelf .titles {
display: flex;
align-items: baseline;
flex-wrap: wrap;
}

.shelf .title {
font-weight: 700;
font-size: 24px;
font-weight: 600;
font-size: 32px;
margin-right: 16px;
margin-bottom: 8px;
}

.shelf .subtitle {
font-weight: 600;
margin-left: 8px;
color: #888;
font-size: 18px;
font-weight: 500;
color: rgba(0, 0, 0, .8);
margin-bottom: 8px;
}

.shelf .invocation {
font-size: 16px;
color: #ccc;
margin-bottom: 8px;
}

.shelf .details {
font-size: 16px;
line-height: 1.6em;
margin-top: 2px;
color: #444;
color: rgba(0, 0, 0, .5);
display: flex;
align-items: center;
flex-wrap: wrap;
}

.shelf .detail {
display: flex;
align-items: center;
margin-right: 32px;
margin-top: 8px;
}

.shelf .details img {
opacity: 0.5;
margin-right: 8px;
}

.shelf .details img:first-of-type {
margin-left: 0;
}

/** Tabs **/

.tabs {
display: flex;
align-items: center;
margin-top: 16px;
flex-wrap: wrap;
}

.tab {
box-shadow: 0px 0px 2px rgba(0, 0, 0, .15);
border-radius: 50px;
margin-left: 8px;
padding: 12px 32px;
cursor: pointer;
margin-top: 8px;
color: #ccc;
text-align: center;
flex-shrink: 0;
font-size: 12px;
font-weight: 600;
}

.tab.selected {
background: rgba(38,50,56 ,1);
color: #fff;
}

/** Card **/

.card {
box-shadow: 0px 1px 4px rgba(0, 0, 0, .15);
margin: 32px 0;
padding: 24px;
padding: 32px;
border-radius: 8px;
font-size: 14px;
display: flex;
Expand All @@ -137,7 +196,8 @@ a {
}

.card .icon {
margin-right: 24px;
margin-right: 16px;
padding-top: 2px;
}

.card .title {
Expand Down

0 comments on commit 624bff0

Please sign in to comment.