Skip to content
Snippets Groups Projects
Commit fb499e9a authored by Planoetscher Daniel (Student Com20)'s avatar Planoetscher Daniel (Student Com20)
Browse files

bugfixes and project slider updates

parent 6803e5ab
No related branches found
No related tags found
No related merge requests found
...@@ -2,13 +2,16 @@ ...@@ -2,13 +2,16 @@
import './linear-progress.scss'; import './linear-progress.scss';
interface Props { interface Props {
percent: number percent: number;
color: string;
} }
export default function LinearProgress({ percent }: Props) { export default function LinearProgress({ percent, color }: Props) {
return ( return (
<div className="linear-progress"> <div className="linear-progress">
<div className="progress" style={{width: percent + '%'}}></div> <div
className={'progress' + (color ? 'bg-gradient-horizontal-' + color : '')}
style={{ width: percent + '%' }}></div>
</div> </div>
); );
} }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
padding: 30px 30px; padding: 30px 30px;
margin: -30px -30px; margin: -30px -42px;
position: relative; position: relative;
.prev-button, .next-button { .prev-button, .next-button {
...@@ -51,14 +51,14 @@ ...@@ -51,14 +51,14 @@
width: calc(50% - 24px); width: calc(50% - 24px);
} }
@include mx.breakpoint(xlarge) { @include mx.breakpoint(large) {
width: calc(33.3% - 24px); width: calc(33.3% - 24px);
} }
} }
@include mx.breakpoint(large) { @include mx.breakpoint(large) {
padding: 30px 90px; padding: 30px 90px;
margin: -30px -90px; margin: -30px -102px;
.prev-button { .prev-button {
left: 70px; left: 70px;
......
...@@ -45,14 +45,17 @@ export default function ProjectSlide({ project }: ProjectSlideProps) { ...@@ -45,14 +45,17 @@ export default function ProjectSlide({ project }: ProjectSlideProps) {
} }
</div> </div>
<div className="details"> <div className="details">
<AssigneeList assignees={assignees} max={3} /> {
assignees.length > 0 &&
<AssigneeList assignees={assignees} max={3} />
}
{ {
(time !== undefined && totalTime !== undefined) (time !== undefined && totalTime !== undefined)
? ( ? (
<div className="progress"> <div className="progress">
<LinearProgress percent={time / totalTime * 100} /> <LinearProgress percent={time / totalTime * 100} color={project.color} />
<div className="label">{(time / 60 / 60 / 1000).toFixed(2)}h / <div className="label">{(time / 60 / 60 / 1000).toFixed(2)}h /
<strong>{(totalTime / 60 / 60 / 1000).toFixed(2)}h</strong></div> <strong>{(totalTime / 60 / 60 / 1000).toFixed(2)}h</strong></div>
</div> </div>
) )
: <LoadingScreen /> : <LoadingScreen />
......
...@@ -6,11 +6,13 @@ import Tag from 'components/ui/Tag'; ...@@ -6,11 +6,13 @@ import Tag from 'components/ui/Tag';
export default function Team() { export default function Team() {
return ( return (
<section className="team-section content-container"> <section className="team-section content-container">
<h2>Our Team</h2> <header className="heading-container">
<p className="heading-lead"> <h2>Our Team</h2>
People are what makes a project great, and here are the people that make us <p className="heading-lead">
great. People are what makes a project great, and here are the people that make us
</p> great.
</p>
</header>
<div className="team-list"> <div className="team-list">
<div className="team-member"> <div className="team-member">
<img className="team-member-image" src={ImageDaniel} width="200" height="200" <img className="team-member-image" src={ImageDaniel} width="200" height="200"
......
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
.landing-page { .landing-page {
.team-section { .team-section {
.heading-container {
text-align: center;
}
.team-container { .team-container {
@include mx.breakpoint(large) { @include mx.breakpoint(large) {
display: flex; display: flex;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment