diff --git a/package.json b/package.json
index 1a5f41a..1386d1a 100644
--- a/package.json
+++ b/package.json
@@ -28,8 +28,6 @@
},
"eslintConfig": {
"extends": [
- "react-app",
- "react-app/jest"
]
},
"browserslist": {
diff --git a/src/components/documentation/Documentation.js b/src/components/documentation/Documentation.js
index aa4734e..b5b6fe2 100644
--- a/src/components/documentation/Documentation.js
+++ b/src/components/documentation/Documentation.js
@@ -217,11 +217,11 @@ function Documentation() {
-
{r.name}
+
{r.name}
{r.category}
diff --git a/src/components/styles/pages.css b/src/components/styles/pages.css
index e1238aa..3ced09f 100644
--- a/src/components/styles/pages.css
+++ b/src/components/styles/pages.css
@@ -130,11 +130,10 @@
}
.info-card {
- border: 1.5px solid var(--border-muted);
+ border: 2px solid black;
border-radius: 0;
padding: 14px 16px;
background: rgba(255, 255, 255, 0.65);
- box-shadow: 0 10px 24px rgba(0, 0, 0, 0.05);
transition:
transform 0.15s ease,
box-shadow 0.2s ease,
@@ -142,8 +141,9 @@
background-color 0.2s ease;
display: flex;
flex-direction: column;
+ border-radius: 4px;
gap: 8px;
-
+ box-shadow: 3px 3px rgba(0, 0, 0, 0.44);
}
.info-card.clickable {
@@ -152,9 +152,7 @@
.info-card:hover {
transform: translateY(-2px);
- background: var(--accent-soft);
- border-color: var(--accent);
- box-shadow: 0 14px 28px rgba(196, 62, 92, 0.18);
+ box-shadow: 3px 3px rgb(0,0,0, 1);
}
.info-card .pill-row {
@@ -169,6 +167,8 @@
border: 1px solid #ccc;
border-radius: 999px;
background: rgba(0, 0, 0, 0.03);
+ font-family: "DIN Condensed Web";
+ font-size: 18px;
}
.info-card .top-row,
@@ -181,6 +181,7 @@
.info-card .muted {
opacity: 0.8;
+ font-family: 'DIN Condensed Web';
}
.page-cta-row {
diff --git a/src/components/timeline/timeline.css b/src/components/timeline/timeline.css
index e5e0156..3ba06ba 100644
--- a/src/components/timeline/timeline.css
+++ b/src/components/timeline/timeline.css
@@ -30,10 +30,16 @@
}
.content-title {
- font-family: "DIN Condensed Web";
+ font-family: "Yearbook Solid W01";
font-size: 3rem;
- color: #bc6c25;
- margin-top: 5px;
+ letter-spacing: 2px;
+ color: black;
+ margin-top: 0px;
+ background-color: #bc6c25;
+ padding: 5px 0px 5px 0px;
+ border: 2px solid black;
+ box-shadow: 3px 3px rgba(0,0,0,.2);
+ border-radius: 6px;
width: 600px;
margin-left: 50%;
transform: translateX(-50%);
@@ -81,8 +87,8 @@
width: 100%;
height: 100%;
object-fit: cover;
- transform: translateY(-400px) scale(1);
- object-position: center 50%;
+ transform: translateY(-400px) scale(1) translateX(10px);
+ object-position: top 50%;
opacity: 0.8;
animation: imageZoom 0.8s cubic-bezier(0.25, 1, 0.5, 1);
}
@@ -193,6 +199,12 @@
.year-image {
margin-top: 320px;
}
+ .image-mask-container{
+ width: 1200px;
+ height: 1200px;
+ top: 240px;
+ margin-left: -600px;
+ }
}
@media (max-width: 900px) {
@@ -211,6 +223,13 @@
height: 120px;
margin-top: 350px;
}
+
+ .image-mask-container{
+ width: 900px;
+ height: 900px;
+ top: 220px;
+ margin-left: -450px;
+ }
}
@media (max-width: 600px) {
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 1622104..f6a24ad 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -56,7 +56,7 @@ const timelineData = [
description:
"Rapid population growth leads to major expansion and master-planned communities.",
fact: "During this time Katy grew from around 8000 people to over 11000. Katy saw a 3000 person increase!",
- image: `${process.env.PUBLIC_URL}/images/katy-hero.jpg`,
+ image: `${process.env.PUBLIC_URL}/images/katy-view.jpg`,
},
{
id: 5,
@@ -65,7 +65,7 @@ const timelineData = [
description:
"Katy continues to grow with new neighborhoods, businesses, and community services.",
fact: "In 1919 KISD was found with only 1 school, and it now registers over 85,000 students and over 40 schools",
- image: `${process.env.PUBLIC_URL}/images/Katy-Tower.jpg`,
+ image: `${process.env.PUBLIC_URL}/images/2nd-katy-stock.jpg`,
},
];
diff --git a/src/components/timeline/timelineApp.css b/src/components/timeline/timelineApp.css
index 588b0c5..240fdb7 100644
--- a/src/components/timeline/timelineApp.css
+++ b/src/components/timeline/timelineApp.css
@@ -2,4 +2,72 @@
border: 1px solid #606c38;
width: 100%;
justify-self: center;
+}
+
+.timeline-header{
+ background-color: #606c38;
+ height: 450px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: space-around;
+ margin-top: 50px;
+ padding-top: 0px;
+
+}
+
+.timeline-header span{
+ font-size: 27px;
+
+ background-color: #bc6c25;
+ border-radius: 3px;
+ border: 2px solid black;
+ padding: 5px 10px 5px 10px;
+ margin-top: 5px;
+ box-shadow: 2px 2px rgba(0,0,0, .5);
+}
+
+.timeline-div{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+}
+.timeline-header p{
+ text-align: center;
+ margin-bottom: 0px;
+ line-height: 120px;
+ font-family: "DIN Condensed Web";
+ margin-top: 0px;
+ font-size: 150px;
+}
+
+
+
+.timeline-header .line{
+ height: 0px;
+ border-top: 4px solid black;
+ display: flex;
+ justify-content: space-around;
+ width: 85%;
+}
+
+.timeline-header .dot{
+
+ width: 24px;
+ height: 24px;
+ background-color: black;
+ border: 4px solid #606c38;
+ border-radius: 50%;
+ transition: all 0.3s ease;
+ z-index: 2;
+ box-shadow: 0 0 0 1px black;
+ margin-top: -18px;
+ color: black;
+ text-align: center;
+ cursor: pointer;
+}
+
+.timeline-header .dot:hover {
+ transform: scale(1.2);
}
\ No newline at end of file
diff --git a/src/components/timeline/timelineApp.js b/src/components/timeline/timelineApp.js
index d6d4ba6..612b55e 100644
--- a/src/components/timeline/timelineApp.js
+++ b/src/components/timeline/timelineApp.js
@@ -4,6 +4,22 @@ import Timeline from './timeline';
function TimelineApp() {
return (
<>
+
>