Skip to content

Commit

Permalink
Merge pull request #30 from intrepidbird/revert-26-MyNewBranchAg
Browse files Browse the repository at this point in the history
Revert "Added Navbar and Footer"
  • Loading branch information
intrepidbird authored Oct 29, 2023
2 parents 79edfdb + dad2345 commit a062db0
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 104 deletions.
Binary file removed images/facebook.png
Binary file not shown.
Binary file removed images/instagram-sketched.png
Binary file not shown.
Binary file removed images/twitter.png
Binary file not shown.
40 changes: 3 additions & 37 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
Expand All @@ -14,9 +13,7 @@
<!-- Favicon -->
<link rel="shortcut icon" href="images/graph_fav.png" type="image/x-icon">

<link rel="stylesheet" href="styles.css">
</head>

<body >
<!-- Header Section -->
<header class="bg-dark text-white text-center p-4">
Expand All @@ -26,24 +23,6 @@ <h1>Graphing Calculator</h1>
<button onclick="darkMode()">🌜 Dark Mode</button>
</div>
</header>


<div class="nav2">
<div class="navContent">
<a class="nav_a" href="index.html">Home</a>
</div>
<div class="navContent">
<a class="nav_a" href="">About Us</a>
</div>
<div class="navContent">
<a class="nav_a" href="">Contact Us</a>
</div>
<div class="navContent">
<a class="nav_a" href="">Login/Signup</a>
</div>
</div>



<!-- Calculator Section -->
<section id="calculator" class="container mt-5">
Expand All @@ -53,10 +32,8 @@ <h2 class="text-center mb-3">Graph Your Equations</h2>
<form id="calculatorForm">
<div class="form-group">
<label for="equations">Enter Equations (comma-separated):</label>
<input type="text" class="form-control" id="equations" placeholder="e.g., y = x^2, y = sin(x)"
required>
<small class="form-text text-muted">Supported Functions: sin, cos, tan, sqrt, log, exp, pi, e,
and more.</small>
<input type="text" class="form-control" id="equations" placeholder="e.g., y = x^2, y = sin(x)" required>
<small class="form-text text-muted">Supported Functions: sin, cos, tan, sqrt, log, exp, pi, e, and more.</small>
</div>
<div class="form-group">
<label for="minX">Min X:</label>
Expand All @@ -82,16 +59,6 @@ <h2 class="text-center mb-3">Graph Your Equations</h2>
</div>
</section>

<div class="connect">
Connect with us <br>
© 2023, IntrepidGraph.com
</div>
<div class="iconAlign">
<a href="https://www.instagram.com/9GAG/"><img src="images/instagram-sketched.png" class="icon"></a>
<a href="https://www.facebook.com/9gag"><img src="images/facebook.png" class="icon"></a>
<a href="https://twitter.com/9GAG"><img src="images/twitter.png" class="icon"></a>
</div>

<!-- Bootstrap & jQuery JS -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
Expand All @@ -100,5 +67,4 @@ <h2 class="text-center mb-3">Graph Your Equations</h2>
<script src="calculator.js"></script>

</body>

</html>
</html>
67 changes: 0 additions & 67 deletions styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ button:hover{
height: 400px;
}

/* Set the font for the entire document */
body {
font-family: Arial, sans-serif;
}

/* Style for the header with a specific class name */
.header-style {
font-weight: bold;
Expand Down Expand Up @@ -60,68 +55,6 @@ body {
position: relative;
}


.nav2 {
display: flex;
justify-content: center;
align-items: center;
font-family: sans-serif;
background: #ED7D31;
color: white;
margin-top: 0px;
padding: 15px;
font-size: 20px;
text-align: center;
line-height: 100%;
}

.navContent {
margin-left: 50px;
margin-right: 50px
}

.nav_a {
color: white;
margin-left: 20px;
}

.nav_a:hover {
color: white;
}

.footer {
width: 170px;
list-style-type: none;
text-align: center;
align-items: center;
}

.foot {
display: flex;
justify-content: space-between;
font-family: sans-serif;
}

.connect {
color: #f7f7f7;
background: black;
text-align: center;
font-family: sans-serif;
padding: 10px;
}

.icon {
height: 30px;
width: 30px;
padding: 5px;
}

.iconAlign {
text-align: center;
padding: 10px;
background: #ED7D31;
}

#theme-icon {
width: 30px;
height: 30px;
Expand Down

0 comments on commit a062db0

Please sign in to comment.