Skip to content

Commit

Permalink
Merge branch 'main' into Matt-G
Browse files Browse the repository at this point in the history
  • Loading branch information
adenjonah authored Feb 22, 2024
2 parents 0b825a0 + 9181331 commit 43113f3
Show file tree
Hide file tree
Showing 9 changed files with 373 additions and 58 deletions.
1 change: 1 addition & 0 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ function App() {
<Router>
<Navbar />
<Routes>
<Route path="" element={<Constant />} />
<Route path="/Constant" element={<Constant />} />
<Route path="/Focus" element={<Focus />} />
<Route path="/TSS" element={<Tss />} />
Expand Down
Binary file added src/assets/MapGif.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/RoverGif.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/ThermalGif.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/astronautstream.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
171 changes: 141 additions & 30 deletions src/pages-style/constant.css
Original file line number Diff line number Diff line change
@@ -1,31 +1,142 @@
* {
box-sizing: border-box;
}

.container {
display: flex;
height: 100vh;
}

.column {
flex: 1;
border-left: 1px solid;
padding: 5px;
text-align: center; /* Center the content within each column */
}

.column h3 {
margin: 5px 0;
}

.column p {
text-align: left; /* Justify text to the left within paragraphs */
margin: 0; /* Remove default margin for paragraphs */
padding: 0; /* Remove default padding for paragraphs */
}

.column ol {
text-align: left; /* Justify text to the left within ordered lists */
padding-left: 20px; /* Add some left padding for better visual separation */
}

.column ol li {
margin-bottom: 8px; /* Adjust margin between list items */
}

display: flex;
height: 85vh;
}

.subContainer {
display: flex;
height: 50%;
}

.data {
background: green;
height: 12.5%;
display: flex;
align-items: center;
justify-content: center;
padding: 5px;
margin: 0;
border-bottom: 1px solid black;
}

.column.Mission {
position: relative;
}

.map-title {
position: absolute;
top: 5%;
left: 50%;
transform: translate(-50%, -50%);
background: transparent;
padding: 10px;
font-weight: bold;
}

.twoTasks {
height: 12%;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0px;
margin: 0;
border-bottom: 1px solid black;
}

.taskContainer {
flex: 1;
display: flex;
align-items: center;
justify-content: center;
position: relative;
width: 100%;
height: 100%; /* Set the height to 100% to cover the entire height of twoTasks */
}

.taskContainer + .taskContainer::before {
content: '';
position: absolute;
height: 100%;
width: 1px;
background-color: black;
left: 0;
}

.timer-container {
background-color: blue;
text-align: center;
font-weight: bold;
display: flex;
align-items: center;
justify-content: center;
height: 50px;
}

.column {
flex: 1;
border-left: 1px solid;
padding: 0px;
text-align: center;
}

.column h3 {
margin: 0;
}

.column p {
text-align: left;
margin: 0;
padding: 0;
}

.column ol {
text-align: left;
padding-left: 20px;
}

.column ol li {
margin-bottom: 8px;
}

.lmccImg {
max-width: 70%;
height: auto;
}

.header-banner {
background: lightblue;
padding: 5px;
height: 40px;
display: flex;
align-items: center;
justify-content: center;
}

.smallHB {
background: lightblue;
height: 30px;
display: flex;
align-items: center;
justify-content: center;
padding: 5px;
margin: 0;
}

.gif-container {
max-width: 100%;
height: auto;
padding: 0;
margin: 0;
}

.gif-container img {
display: block;
width: 100%;
height: auto;
margin: 0;
padding: 0;
}
31 changes: 31 additions & 0 deletions src/pages-style/rocks.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
.warning-modal {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
justify-content: center;
align-items: center;
}

.warning-modal-content {
background-color: lightcoral;
padding: 20px;
border-radius: 8px;
}

button {
display: block;
margin: 0 auto;
}

.close {
position: absolute;
top: 10px;
right: 10px;
cursor: pointer;
}


Loading

0 comments on commit 43113f3

Please sign in to comment.