Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some updates #81

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added public/static/logos/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/assets/scss/_vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ $color-black: #070707 !default;
$color-green: #6f6 !default;

$page-width: 99% !default;
$team-column-width: 350px !default;
$team-column-width: 280px !default;

$skeleton-cell-color: #121212;
$skeleton-placeholder-color: darken($color-white, 80);
$skeleton-highlight-color: darken($color-white, 70);
$skeleton-border-radius: 2px;
$skeleton-border-radius: 4px;

$status-up: #6f6;
$status-mumble: #8a2be2;
Expand Down
3 changes: 1 addition & 2 deletions src/components/App.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
.root {
display: flex;
flex-direction: column;
align-content: center;
align-items: center;
max-width: 100%;
}
2 changes: 1 addition & 1 deletion src/components/Board/Board.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

.board {
margin-bottom: 100px;
width: $page-width;
//width: $page-width;
}
11 changes: 6 additions & 5 deletions src/components/Board/CommandRow/CommandRow.module.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@import 'src/assets/scss/vars';
@import 'src/assets/scss/_vars';

.commandRow {
background-color: rgba(255, 255, 255, 0.02);
border: 2px $color-white solid;
border-bottom: 0;
box-sizing: border-box;
display: flex;
flex-direction: row;
//flex-direction: row;
height: 100px;
padding: 5px;
width: 100%;
Expand All @@ -17,8 +17,9 @@
}

.commandServices {
align-content: center;
justify-content: space-between;
width: calc(100% - #{$team-column-width});
display: flex;
flex-grow: 2;
justify-content: center;
//flex-grow: 1;
//overflow: hidden;
}
8 changes: 8 additions & 0 deletions src/components/Board/CommandRow/InfoCell/InfoCell.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,25 @@
.cell {
border-right: 2px solid $color-white;
display: flex;
position: relative;
flex-direction: row;
box-sizing: border-box;
min-width: $team-column-width;
padding: 15px;
padding-left: 8px;

span {
align-items: center;
display: flex;
}
}

.deltas {
position: absolute;
bottom: 8px;
right: 20px;
}

.logo {
display: flex;
height: 58px;
Expand Down
22 changes: 12 additions & 10 deletions src/components/Board/CommandRow/InfoCell/InfoCell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,18 @@ const InfoCell = (props: IProps) => {
>
{commandData ? commandData.name : <SkeletonText width={100} />}
</p>
</div>
<div className={styles.commandStatsBlock}>
<span>{flagPoints ? flagPoints : <SkeletonText width={30} />}</span>
<span>
{commandData && commandData.totalSLA ? (
`${commandData.totalSLA}%`
) : (
<SkeletonText width={30} />
)}
</span>
</div>
<div className={styles.deltas}>
{commandData?.bias ? (
<Arrow
direction={commandData?.bias > 0 ? 'UP' : 'DOWN'}
Expand All @@ -59,16 +71,6 @@ const InfoCell = (props: IProps) => {
/>
) : null}
</div>
<div className={styles.commandStatsBlock}>
<span>{flagPoints ? flagPoints : <SkeletonText width={30} />}</span>
<span>
{commandData && commandData.totalSLA ? (
`${commandData.totalSLA}%`
) : (
<SkeletonText width={30} />
)}
</span>
</div>
</div>
</div>
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@import 'src/assets/scss/vars';

.cell {
display: flex;
color: $color-black;
position: relative;
display: flex;
flex-direction: column;
flex-grow: 1;
flex-basis: 100%;
Expand Down
2 changes: 2 additions & 0 deletions src/components/Board/CommandRow/ServiceCell/ServiceCell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ const ServiceCell = (props: IProps) => {
>
Firstblood!
</div>

<div className={styles.topInfo}>
<span className={styles.serviceFp}>
{serviceData ? (
Expand All @@ -53,6 +54,7 @@ const ServiceCell = (props: IProps) => {
</span>
<Flags serviceData={serviceData} totalFlags={totalFlags} />
</div>

<div className={styles.bottomInfo}>
<span className={styles.serviceSla}>
{serviceData ? (
Expand Down
14 changes: 8 additions & 6 deletions src/components/Header/Header.module.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'src/assets/scss/vars';
@import 'src/assets/scss/_vars';

header {
display: flex;
Expand All @@ -25,23 +25,25 @@ header {
}

.serviceList {
margin-top: auto;
display: flex;
width: calc(100% - #{$team-column-width});
margin-top: auto;
flex-grow: 1;
padding-right: 4px;
align-items: flex-end;
//align-items: flex-end;
justify-content: space-around;
}

.serviceName {
display: flex;
box-sizing: border-box;
margin-bottom: 5px;
padding-left: 5px;
flex-basis: 100%;
//flex-basis: 100%;
font-weight: bold;
text-transform: uppercase;
justify-content: flex-start;
border-left: 2px solid $color-white;
justify-content: space-between;
//border-left: 2px solid $color-white;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Settings/Settings.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
$margin: calc((100% - #{$page-width}) / 2);

.settings {
position: absolute;
position: fixed;
right: $margin;
top: $margin;
display: flex;
Expand Down
1 change: 0 additions & 1 deletion src/index.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ body {
'Helvetica Neue', sans-serif;
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
margin: 0;
}