Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

fix(create-new-team): design issues #424

Merged
merged 3 commits into from
Aug 4, 2021
Merged
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
3 changes: 1 addition & 2 deletions src/components/CustomerScroll/styles.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,19 @@
color: #7f7f7f;
text-align: center;
text-transform: uppercase;
margin-bottom: 30px;
}

.customer-logos {
background-image: url("../../assets/images/customer-logos.svg");
background-size: contain;
background-repeat: no-repeat;
background-position: center;
height: 56px;
width: 100%;
}

@media only screen and (max-height: 859px) {
.title {
font-size: 16px;
margin-bottom: 15px;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
flex-direction: row;
justify-content: center;
align-items: flex-start;
margin: 42px 35px;
margin: 42px 35px 30px;
.right-side {
display: flex;
flex-direction: column;
Expand Down
33 changes: 16 additions & 17 deletions src/routes/CreateNewTeam/components/Progress/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,61 +8,60 @@ import Button from "components/Button";
import React from "react";
import cn from "classnames";
import PT from "prop-types";
import Spinner from "components/CenteredSpinner";
import ProgressBar from "../ProgressBar";
import "./styles.module.scss";
import IconMultipleActionsCheck from "../../../../assets/images/icon-multiple-actions-check-2.svg";
import IconListQuill from "../../../../assets/images/icon-list-quill.svg";
import IconOfficeFileText from "../../../../assets/images/icon-office-file-text.svg";

function Progress({
extraStyleName,
isDisabled,
isSearching,
onClick,
buttonLabel,
stages,
percentage,
}) {

let backgroundIcon
if (extraStyleName === "input-skills") {
backgroundIcon= <IconListQuill styleName="transparent-icon" />
} else if (extraStyleName === "input-job-description") {
backgroundIcon= <IconOfficeFileText styleName="transparent-icon" />
} else {
backgroundIcon= <IconMultipleActionsCheck styleName="transparent-icon" />
}

return (
<div styleName={cn("progress", extraStyleName)}>
<ProgressBar percentDone={percentage} />
<ul styleName="list">
{stages.map((stage) => (
{stages.map((stage, idx) => (
<li
styleName={cn("list-item", {
active: stage.isCurrent,
done: stage.completed,
})}
data-index={idx + 1}
>
{stage.name}
</li>
))}
</ul>
<Button
styleName={cn({ searching: isSearching })}
size="medium"
type="secondary"
disabled={isDisabled}
onClick={onClick}
>
{buttonLabel}
{isSearching ? (
<>
<div styleName="spinner">
<Spinner stype="Oval" width="16" height="16" />
</div>
Searching
</>
) : (
buttonLabel
)}
</Button>
{backgroundIcon}
</div>
);
}

Progress.propTypes = {
extraStyleName: PT.string,
isDisabled: PT.bool,
isSearching: PT.bool,
onClick: PT.func,
buttonLabel: PT.string,
currentStageIdx: PT.number,
Expand Down
39 changes: 20 additions & 19 deletions src/routes/CreateNewTeam/components/Progress/styles.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@
color: #fff;
button {
border: none;
&.searching {
pointer-events: none;
}
.spinner {
margin-top: 3px;
margin-right: 5px;
}
}
}

Expand Down Expand Up @@ -39,47 +46,41 @@
font-size: 14px;
line-height: 16px;
font-weight: 400;
color: rgba(255, 255, 255, 0.6);
color: rgba(#fff, 0.6);

&:before {
content: "";
color: #fff;
border: 1px solid #ffffff;
content: attr(data-index);
font-size: 10px;
line-height: 14px;
font-weight: 600;
padding-left: 4px;
color: rgba(#fff, 0.6);
border: 1px solid rgba(#fff, 0.6);
border-radius: 100%;
width: 16px;
height: 16px;
margin-right: 10px;
display: block;
float: left;
visibility: hidden;
}

&.active {
font-weight: 500;
color: #fff;
&:before {
visibility: visible;
color: #555555;
background-color: #fff;
}
}

&.done {
font-weight: 400;
font-weight: 500;
&:before {
content: "✓";
padding-left: 3px;
font-size: 9px;
line-height: 14px;
padding-left: 4px;
visibility: visible;
font-weight: 900;
background-color: #0AB88A;
}
}
}

.transparent-icon {
position: absolute;
right: -50px;
top: 85px;
opacity: 10%;
width: 144px;
height: 144px;
}
2 changes: 1 addition & 1 deletion src/routes/CreateNewTeam/components/ProgressBar/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function ProgressBar({ percentDone }) {
return (
<div styleName="progress">
<div styleName="heading">
<p>Progress</p>
<p>Completeness</p>
<h6>{percentDone}%</h6>
</div>
<div styleName="progress-bar">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
flex-direction: row;
justify-content: center;
align-items: flex-start;
margin: 42px 35px;
margin: 42px 35px 30px;
.right-side {
display: flex;
flex-direction: column;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
flex-direction: row;
justify-content: center;
align-items: flex-start;
margin: 42px 35px;
margin: 42px 35px 30px;
.right-side {
display: flex;
flex-direction: column;
Expand Down
72 changes: 0 additions & 72 deletions src/routes/CreateNewTeam/components/progress/index.jsx

This file was deleted.

85 changes: 0 additions & 85 deletions src/routes/CreateNewTeam/components/progress/styles.module.scss

This file was deleted.

2 changes: 1 addition & 1 deletion src/routes/CreateNewTeam/styles.module.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.logos {
padding: 0 35px 15px;
padding: 0 35px 8px;
width: 100%;
}