Skip to content

Commit 8f55a4d

Browse files
committed
premerge
1 parent 855da62 commit 8f55a4d

6 files changed

Lines changed: 52 additions & 161 deletions

File tree

app/components/About.tsx

Lines changed: 0 additions & 61 deletions
This file was deleted.

app/components/About/About.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@ import React from 'react';
22
import './style.scss';
33
import TeamMembers from './TeamMembers';
44
import PastContributors from './PastContributors';
5+
import { useStylingContext } from './StylingContext';
6+
57

68
const About: React.FC = React.memo(() => {
9+
const currentMode = useStylingContext();
10+
711
return (
812
<div className="about">
913
<div className="blurb" data-testid="aboutPage">
10-
<h3 className="mainTitle">About</h3>
11-
<p className="text">
14+
<h3 style={currentMode} className="mainTitle">About</h3>
15+
<p style={currentMode} className="text">
1216
The Chronos Team has a passion for building tools that are powerful, beautifully
1317
designed, and easy to use. Chronos was conceived as an Open Source endeavor that directly benefits the developer
1418
community. It can also monitor applications deployed using AWS, EC2, and ECS from Amazon.

app/components/About/style.scss

Lines changed: 43 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,31 @@
1111
height: 100%;
1212
}
1313

14+
.sprout {
15+
margin: 0;
16+
}
17+
18+
.mainTitle {
19+
font-size: 36px;
20+
color: $background;
21+
text-align: left;
22+
font-weight: 600;
23+
}
24+
25+
.title {
26+
font-size: 18px;
27+
color: $background;
28+
text-align: left;
29+
font-weight: 600;
30+
}
31+
32+
.text {
33+
font-size: 18px;
34+
color: $background;
35+
text-align: left;
36+
font-weight: 100;
37+
}
38+
1439
.blurb {
1540
width: 100%;
1641
margin: auto;
@@ -21,33 +46,30 @@
2146
border: none;
2247
box-shadow: $boxshadow2;
2348
padding: 30px;
24-
background-color: $background; // Use your theme's background variable
2549

2650
&:hover {
2751
background-color: rgba(255, 255, 255, 0.1);
2852
}
2953
}
3054

31-
.mainTitle, .title {
32-
font-size: 18px;
33-
color: $textColor;
34-
text-align: left;
35-
font-weight: 600;
36-
}
37-
38-
.mainTitle {
39-
font-size: 36px; // Larger font for the main title
40-
}
41-
42-
.text {
43-
font-size: 16px;
44-
color: $textColor;
45-
text-align: left;
46-
font-weight: 400;
47-
margin-bottom: 20px; // Add some space after paragraphs
55+
#sproutSpan {
56+
display: inline-block;
57+
margin-top: 0px;
58+
margin-bottom: 0px;
59+
margin-left: 15px;
60+
margin-right: 10px;
61+
height: $sproutSize;
62+
width: $sproutSize;
63+
background-color: transparent;
64+
border-radius: 50%;
65+
background-size: scale-down;
66+
&:hover {
67+
background-color: $hover;
68+
opacity: 0.85;
69+
animation: none;
70+
}
4871
}
4972

50-
#OSPNames {
51-
margin-top: 10px;
52-
margin-bottom: 20px; // Space before the past contributors section
73+
p {
74+
padding-left: 10px;
5375
}

app/containers/MainContainer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useContext,useState } from 'react';
22
import { Route, Routes } from 'react-router-dom';
3-
import About from '../components/About';
3+
import About from '../components/About/About';
44
import Contact from '../components/Contact';
55
import Settings from '../components/Settings';
66
import Occupied from '../components/Occupied/Occupied';

app/stylesheets/About.scss

Lines changed: 0 additions & 75 deletions
This file was deleted.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@
8888
"test": "nyc jest",
8989
"backend-test": "npx jest --config __backend-tests__/jest.config.js --verbose",
9090
"start:selenium": "node e2e/seleniumTest.js",
91-
"start:e2e": "npm run dev:electron & npm run start:selenium"
91+
"start:e2e": "npm run dev:electron & npm run start:selenium",
92+
"start": "concurrently \"npm:build\" \"npm:dev:app\" \"npm:dev:electron\""
9293
},
9394
"repository": {
9495
"type": "git",

0 commit comments

Comments
 (0)