Skip to content

Commit

Permalink
stylizing ingress/egress and setup
Browse files Browse the repository at this point in the history
  • Loading branch information
adenjonah committed May 17, 2024
1 parent 5c0e4b3 commit 013b7ed
Show file tree
Hide file tree
Showing 9 changed files with 314 additions and 215 deletions.
64 changes: 31 additions & 33 deletions src/components/Navbar.js
Original file line number Diff line number Diff line change
@@ -1,41 +1,39 @@
import React from "react";
import { Nav, NavLink, NavMenu } from "./NavbarElements";
import { NavLink as Link } from "react-router-dom";
import './navbar.css';

const Navbar = () => {
return (
<>
<Nav style={{ height: '10vh' }}>
<NavMenu>
<img className="img" src={require("./../assets/Images/logo.jpg")} alt="Logo"/>
<h1 id="title">CUITS 2024 LMCC</h1>
<NavLink to="/Constant" activeStyle>
Constant
</NavLink>
<NavLink to="/Setup" activeStyle>
Setup
</NavLink>
<NavLink to="/Egress" activeStyle>
Egress
</NavLink>
<NavLink to="/Nav" activeStyle>
Nav
</NavLink>
<NavLink to="/Equipment" activeStyle>
Equipment
</NavLink>
<NavLink to="/Rocks" activeStyle>
Rocks
</NavLink>
<NavLink to="/Rover" activeStyle>
Rover
</NavLink>
<NavLink to="/Ingress" activeStyle>
Ingress
</NavLink>
</NavMenu>
</Nav>
</>
<nav className="Navbar">
<div className="NavMenu">
<img className="img" src={require("./../assets/Images/logo.jpg")} alt="Logo"/>
<h1 id="title">CUITS 2024 LMCC</h1>
<Link className="NavLink" to="/Constant" activeStyle={{ color: '#69b3e7' }}>
Constant
</Link>
<Link className="NavLink" to="/Setup" activeStyle={{ color: '#69b3e7' }}>
Setup
</Link>
<Link className="NavLink" to="/Egress" activeStyle={{ color: '#69b3e7' }}>
Egress
</Link>
<Link className="NavLink" to="/Nav" activeStyle={{ color: '#69b3e7' }}>
Nav
</Link>
<Link className="NavLink" to="/Equipment" activeStyle={{ color: '#69b3e7' }}>
Equipment
</Link>
<Link className="NavLink" to="/Rocks" activeStyle={{ color: '#69b3e7' }}>
Rocks
</Link>
<Link className="NavLink" to="/Rover" activeStyle={{ color: '#69b3e7' }}>
Rover
</Link>
<Link className="NavLink" to="/Ingress" activeStyle={{ color: '#69b3e7' }}>
Ingress
</Link>
</div>
</nav>
);
};

Expand Down
1 change: 0 additions & 1 deletion src/components/ProcedureItem.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React from 'react';
import './procedureitem.css';

function ProcedureItem({ name, description, className }) {
const descriptionItems = description.split('\n').map((item, index) => (
Expand Down
42 changes: 40 additions & 2 deletions src/components/navbar.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.img{
/* navbar.css */

.img {
height: 3rem;
width: auto;
margin-right: 10px;
Expand All @@ -8,4 +10,40 @@
color: white;
font-size: x-large;
margin-right: 50px;
}
font-family: 'Arial', sans-serif; /* Use a clean font */
letter-spacing: 1px; /* Slight spacing for better readability */
}

.Navbar {
background: darkblue;
height: 10vh;
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 2rem;
border-radius: 0 0 10px 10px; /* Rounded bottom edges */
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); /* Subtle shadow */
}

.NavLink {
color: #808080;
text-decoration: none;
padding: 1rem;
font-weight: bold;
transition: color 0.2s ease-in-out;
border-radius: 5px; /* Slightly rounded edges */

&:hover {
color: white;
background-color: rgba(255, 255, 255, 0.1); /* Add slight background on hover */
}

&.active {
color: #69b3e7;
}
}

.NavMenu {
display: flex;
align-items: center;
}
58 changes: 0 additions & 58 deletions src/components/procedureitem.css

This file was deleted.

154 changes: 98 additions & 56 deletions src/pages-style/ingressegress.css
Original file line number Diff line number Diff line change
@@ -1,105 +1,147 @@
/* ingressegress.css */

/* Define CSS variables for colors */
:root {
--background-color: #f8f9fa;
--column-background-color: #ffffff;
--left-column-background-color: #007bff;
--right-column-background-color: #80bdff;
--shadow-color: rgba(0, 0, 0, 0.1);
--primary-color: #007bff;
--primary-hover-color: #0056b3;
--text-color-main: #343a40;
--text-color-secondary: #495057;
--border-color: #ced4da;
--select-border-color: #ccc;
--select-focus-border-color: #007bff;
}

.ingressegress-container {
height: 90vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
justify-content: space-between;
padding: 20px;
background-color: #f4f4f9;
border-radius: 8px;
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
background-color: var(--background-color);
border-radius: 10px;
box-shadow: 0 4px 6px var(--shadow-color);
}

.header {
font-size: 2.5rem;
color: #333;
margin-bottom: 20px;
}

.content {
.left-column, .right-column {
margin: 10px;
padding: 20px;
background-color: var(--column-background-color);
border-radius: 10px;
box-shadow: 0 4px 6px var(--shadow-color);
display: flex;
flex-direction: row;
width: 100%;
max-width: 1200px;
background-color: #fff;
border-radius: 8px;
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
overflow: hidden;
flex-grow: 1;
flex-direction: column;
}

.left-column {
flex: 1;
padding: 20px;
display: flex;
align-items: center;
flex-basis: 60%; /* Take up 60% of the container's width */
justify-content: center;
border-right: 1px solid #ddd;
align-items: center;
background-color: var(--left-column-background-color);
}

.left-column img {
max-width: 100%;
height: auto;
border-radius: 8px;
.right-column {
flex-basis: 40%; /* Take up 40% of the container's width */
align-items: center;
justify-content: space-between;
background-color: var(--right-column-background-color);
overflow-y: auto; /* Enable vertical scrolling if content exceeds the maximum height */
}

.right-column {
flex: 3;
padding: 20px;
max-height: 100%;
display: flex;
flex-direction: column;
height: 100%;
.left-column h1 {
font-size: 24px;
margin-bottom: 20px;
color: var(--text-color-main);
}

.left-column img {
width: auto;
max-width: 100%;
max-height: 70vh;
border-radius: 10px;
}

.right-column h2 {
font-size: 1.5rem;
color: #333;
font-size: 20px;
margin-bottom: 10px;
color: var(--text-color-secondary);
}

.select-container {
margin-bottom: 20px;
margin-bottom: 10px;
}

.select-container select {
width: 100%;
padding: 10px;
font-size: 1rem;
border: 1px solid #ddd;
padding: 8px;
font-size: 16px;
border: 1px solid var(--select-border-color);
border-radius: 4px;
box-sizing: border-box;
}

.select-container select:focus {
outline: none;
border-color: var(--select-focus-border-color);
}

.ProcedureList {
flex: 1;
margin: 20px;
overflow-y: auto;
margin-bottom: 20px;
flex: 1; /* Allow the ProcedureList to take up available space */
display: flex;
flex-direction: column;
}

.ProcedureItem {
display: flex;
flex-direction: column;
width: 100%; /* Ensure ProcedureItem spans the entire width */
margin-bottom: 20px; /* Add margin to separate ProcedureItems */
}

.ProcedureList .show {
word-wrap: break-word;
white-space: pre-wrap;
.procedureTitle {
margin: 10px; /* Add margin between title and description */
font-size: large;
}

.procedureDescription {
padding-left: 20px; /* Add padding to the description for better readability */
flex-grow: 1; /* Allow description to grow to fill available space */
}

.navigation-buttons {
display: flex;
justify-content: space-between;
margin-top: auto;
align-items: flex-end;
margin-top: auto; /* Push buttons to the bottom */
}

.navigation-buttons button {
padding: 10px 20px;
font-size: 1rem;
color: #fff;
background-color: #007bff;
padding: 8px 12px;
border: none;
border-radius: 4px;
border-radius: 5px;
background-color: var(--primary-color);
color: #ffffff;
font-size: 16px;
cursor: pointer;
transition: background-color 0.3s;
margin-right: 10px; /* Add margin between buttons */
}

.navigation-buttons button:hover {
background-color: #0056b3;
background-color: var(--primary-hover-color);
}

@media (max-width: 768px) {
.ingressegress-container {
flex-direction: column;
}

.left-column, .right-column {
margin: 10px 0;
flex-basis: auto;
}
}
Loading

0 comments on commit 013b7ed

Please sign in to comment.