Skip to content

Commit eb79547

Browse files
authored
Merge pull request #18 from oslabs-beta/CHRONOS-59-Updating-UX-UI
Chronos 59 updating ux UI
2 parents a33c352 + 85d31d9 commit eb79547

File tree

19 files changed

+622
-170
lines changed

19 files changed

+622
-170
lines changed

app/components/About/About.tsx

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@ const About: React.FC = React.memo(() => {
1313
const currentMode = mode === 'light' ? lightAndDark.lightModeText : lightAndDark.darkModeText;
1414
const currentStyle = mode === 'light' ? lightAndDark.lightModeData : lightAndDark.darkModeData;
1515
return (
16-
17-
18-
<div className="about" >
16+
<div className="about">
1917
<div className="blurb" data-testid="aboutPage" style={currentStyle}>
20-
<h3 style={currentStyle} className="mainTitle">About</h3>
21-
<p style={currentStyle} className="text" >
22-
The Chronos Team has a passion for building tools that are powerful, beautifully
23-
designed, and easy to use. Chronos was conceived as an Open Source endeavor that directly benefits the developer
24-
community. It can also monitor applications deployed using AWS, EC2, and ECS from Amazon.
18+
<h3 style={currentStyle} className="mainTitle">About </h3>
19+
<p style={currentStyle} className="text">
20+
The Chronos Team has a passion for building tools that are powerful, beautifully designed,
21+
and easy to use. Chronos was conceived as an Open Source endeavor that directly benefits
22+
the developer community. It can also monitor applications deployed using AWS, EC2, and ECS
23+
from Amazon.
2524
</p>
2625
<br></br>
2726
<TeamMembers />
@@ -31,4 +30,4 @@ const About: React.FC = React.memo(() => {
3130
);
3231
});
3332

34-
export default About;
33+
export default About;

app/components/About/styles.scss

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,39 @@
99
align-items: center;
1010
width: 100%;
1111
height: 100%;
12+
padding: 0;
13+
1214
}
1315

1416
.sprout {
1517
margin: 0;
18+
1619
}
1720

1821
.mainTitle {
1922
font-size: 36px;
2023
color: $background;
2124
text-align: left;
2225
font-weight: 600;
26+
margin: 0;
2327
}
2428

2529
.title {
2630
font-size: 18px;
2731
color: $background;
2832
text-align: left;
2933
font-weight: 600;
34+
padding: 0;
35+
margin: 0;
3036
}
3137

3238
.text {
3339
font-size: 20px;
3440
color: $background;
3541
text-align: left;
3642
font-weight: 300;
43+
padding: 0;
44+
margin: 0;
3745
}
3846

3947
.blurb {
@@ -46,7 +54,7 @@
4654
border: none;
4755
box-shadow: $boxshadow2;
4856
padding: 30px;
49-
57+
margin: 0;
5058
&:hover {
5159
background-color: rgba(255, 255, 255, 0.1);
5260
}
@@ -63,13 +71,19 @@
6371
background-color: transparent;
6472
border-radius: 50%;
6573
background-size: scale-down;
74+
padding: 0;
75+
margin: 0;
6676
&:hover {
6777
background-color: $hover;
6878
opacity: 0.85;
6979
animation: none;
7080
}
7181
}
72-
82+
#OSPNames p{
83+
margin: 10px 0px;
84+
}
7385
p {
7486
padding-left: 10px;
87+
margin: 0;
88+
// border:2px green solid;
7589
}

app/components/ApplicationsCard/ApplicationsCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const ApplicationsCard:React.FC<ApplicationCardProps> = (props) => {
2626
key={`card-${i}`}
2727
className={classes.paper}
2828
variant="outlined"
29-
onClick={() => handleClick(application[0], application[3], i)}
29+
onClick={() => handleClick(application[0], application[3], i)}
3030
>
3131
<div className="databaseIconContainer">
3232
<div className="databaseIconHeader"></div>

app/components/ApplicationsCard/styles.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
padding: 0;
99
cursor: pointer;
1010
transition: all 0.5s;
11-
11+
// border: 2px solid green;
1212
&:after,
1313
&:before {
1414
content: ' ';

app/components/Contact/styles.scss

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../index.scss' as *;
1+
@use '../../index' as *;
22

33
.contact {
44
display: flex;
@@ -10,13 +10,13 @@
1010
justify-items: center;
1111
top: 0;
1212
left: 0;
13+
height: auto;
1314
min-height: 100vh;
1415
opacity: 1;
1516
vertical-align: top;
1617
justify-content: center;
1718
align-items: center;
1819
color: $background;
19-
2020
}
2121
.contact-border {
2222
display: flex;
@@ -167,6 +167,12 @@ input[type='file'] {
167167
}
168168
}
169169

170-
.contact-blurb p{
170+
.contact-blurb p {
171+
margin: 0;
171172
font-weight: 300;
172-
}
173+
174+
}
175+
.contact-blurb h1 {
176+
margin: 0;
177+
padding: 0;
178+
}

app/components/DashboardIcons/styles.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
.dashboardIconWrapper {
44
margin-right: 37px;
5+
56
}
67

78
.dashboardIconArea {
@@ -25,6 +26,7 @@
2526
z-index: 1;
2627
top: 50px;
2728
right: -14px;
29+
2830
}
2931

3032
.dashboardIconArea .dashboardTooltip::after {
@@ -134,6 +136,7 @@
134136
.personIconArea {
135137
position: relative;
136138
display: inline-block;
139+
137140
}
138141

139142
.personIconArea:hover .personTooltip {

app/components/FirstLaunch/styles.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
.home {
99
background: $darkblue;
10+
1011
display: flex;
1112
flex-direction: column;
1213
align-content: center;

0 commit comments

Comments
 (0)