Skip to content

Commit

Permalink
Merge pull request #20 from chingu-voyage7/develop
Browse files Browse the repository at this point in the history 
Style navbar and fix newsletter on main page. This closes #14, closes 7
  • Loading branch information
@andrzejzysko
andrzejzysko authored Dec 10, 2018
2 parents 9f9ca58 + a7959a7 commit aaa8f85
Show file tree
Hide file tree
Showing 5 changed files with 122 additions and 147 deletions.
52 changes: 26 additions & 26 deletions public/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,40 +21,40 @@
<body>
<!-- Create name/logo (left) and menu (right) -->
<header>
<div class="container">
<div class="row">
<div id="brand" class="col-sm-8">
Toucans-9 Company
</div>
<div id="nav">
<nav>
<ul class="nav nav-pills">
<li class="nav-item">
<a class="nav-link" href="index.html">HOME</a>
</li>
<li class="nav-item">
<a class="nav-link active" href="about.html">ABOUT</a>
</li>
<li class="nav-item">
<a class="nav-link" href="services.html">SERVICES</a>
</li>
<li class="nav-item">
<a class="nav-link" href="contact.html">CONTACT</a>
</li>
</ul>
</nav>
</div>
<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
<a class="navbar-brand text-success" id="navbar-brand" href="index.html">Toucans-9 Company</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" href="index.html">HOME</a>
</li>
<li class="nav-item active">
<a class="nav-link" href="about.html">ABOUT</a>
</li>
<li class="nav-item">
<a class="nav-link" href="services.html">SERVICES</a>
</li>
<li class="nav-item">
<a class="nav-link" href="contact.html">CONTACT</a>
</li>
</ul>
</div>
</div>
</nav>
</header>
<main>
<!-- Section: about -->
<section id="about">
</section>
</main>
<!-- Footer & copyright -->
<footer>
<div>Toucans-9 Company, Copyright © 2018</div>
<footer class="footer bg-success">
<div class="container text-center">
<span class="text-light">Toucans-9 Company, Copyright © 2018</span>
</div>
</footer>

<!-- Bootstrap JS, Popper.js, and jQuery -->
Expand Down
52 changes: 26 additions & 26 deletions public/contact.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,40 +21,40 @@
<body>
<!-- Create name/logo (left) and menu (right) -->
<header>
<div class="container">
<div class="row">
<div id="brand" class="col-sm-8">
Toucans-9 Company
</div>
<div id="nav">
<nav>
<ul class="nav nav-pills">
<li class="nav-item">
<a class="nav-link" href="index.html">HOME</a>
</li>
<li class="nav-item">
<a class="nav-link" href="about.html">ABOUT</a>
</li>
<li class="nav-item">
<a class="nav-link" href="services.html">SERVICES</a>
</li>
<li class="nav-item">
<a class="nav-link active" href="contact.html">CONTACT</a>
</li>
</ul>
</nav>
</div>
<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
<a class="navbar-brand text-success" id="navbar-brand" href="index.html">Toucans-9 Company</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" href="index.html">HOME</a>
</li>
<li class="nav-item">
<a class="nav-link" href="about.html">ABOUT</a>
</li>
<li class="nav-item">
<a class="nav-link" href="services.html">SERVICES</a>
</li>
<li class="nav-item active">
<a class="nav-link" href="contact.html">CONTACT</a>
</li>
</ul>
</div>
</div>
</nav>
</header>
<main>
<!-- Section: contact -->
<section id="contact">
</section>
</main>
<!-- Footer & copyright -->
<footer>
<div>Toucans-9 Company, Copyright © 2018</div>
<footer class="footer bg-success">
<div class="container text-center">
<span class="text-light">Toucans-9 Company, Copyright © 2018</span>
</div>
</footer>

<!-- Bootstrap JS, Popper.js, and jQuery -->
Expand Down
77 changes: 39 additions & 38 deletions public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<!-- <meta http-equiv="X-UA-Compatible" content="IE=edge"> -->
<title>Toucans9</title>
<title>Toucans-9 Company</title>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<!-- Font Awesome -->
<script defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script>
Expand All @@ -26,31 +26,29 @@
<body>
<!-- Create name/logo (left) and menu (right) -->
<header>
<div class="container">
<div class="row">
<div id="brand" class="col-sm-8">
Toucans-9 Company
</div>
<div id="nav">
<nav>
<ul class="nav nav-pills">
<li class="nav-item">
<a class="nav-link active" href="index.html">HOME</a>
</li>
<li class="nav-item">
<a class="nav-link" href="about.html">ABOUT</a>
</li>
<li class="nav-item">
<a class="nav-link" href="services.html">SERVICES</a>
</li>
<li class="nav-item">
<a class="nav-link" href="contact.html">CONTACT</a>
</li>
</ul>
</nav>
</div>
<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
<a class="navbar-brand text-success" id="navbar-brand" href="index.html">Toucans-9 Company</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav">
<li class="nav-item active">
<a class="nav-link" href="index.html">HOME</a>
</li>
<li class="nav-item">
<a class="nav-link" href="about.html">ABOUT</a>
</li>
<li class="nav-item">
<a class="nav-link" href="services.html">SERVICES</a>
</li>
<li class="nav-item">
<a class="nav-link" href="contact.html">CONTACT</a>
</li>
</ul>
</div>
</div>
</nav>
</header>
<main>
<!-- Section: Jumbotron/hero (background image + short description) -->
Expand Down Expand Up @@ -92,22 +90,25 @@ <h1 class="text-center">Lorem, ipsum dolor.</h1>
</div>

<!-- Section: Sign-up newsletter form -->
<section id="newsletter">
<form class="form-inline">
<div class="input-group mb-2 mr-sm-2">
<label for="newsletter-in-mail">Subscribe to my newsletter</label>
</div>
<div class="input-group mb-2 mr-sm-2">
<input type="email" class="form-control" id="newsletter-in-mail" placeholder="Enter email" required>
</div>
<button type="submit" class="btn btn-primary mb-2">Subscribe</button>
</div>
</form>
<section id="newsletter" class="bg-dark text-light">
<div class="container">
<form class="form-inline">
<div class="input-group mr-sm-2">
<label for="newsletter-in-mail">Subscribe to my newsletter</label>
</div>
<div class="input-group mr-sm-2 my-1">
<input type="email" class="form-control" id="newsletter-in-mail" placeholder="Enter email" required>
</div>
<button type="submit" class="btn btn-primary btn-outline-success my-1 full-width">Subscribe</button>
</form>
</div>
</section>
</main>
<!-- Footer & copyright -->
<footer>
<div>Toucans-9 Company, Copyright © 2018</div>
<footer class="footer bg-success">
<div class="container text-center">
<span class="text-light">Toucans-9 Company, Copyright © 2018</span>
</div>
</footer>

<!-- Bootstrap JS, Popper.js, and jQuery -->
Expand Down
52 changes: 26 additions & 26 deletions public/services.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,40 +21,40 @@
<body>
<!-- Create name/logo (left) and menu (right) -->
<header>
<div class="container">
<div class="row">
<div id="brand" class="col-sm-8">
Toucans-9 Company
</div>
<div id="nav">
<nav>
<ul class="nav nav-pills">
<li class="nav-item">
<a class="nav-link" href="index.html">HOME</a>
</li>
<li class="nav-item">
<a class="nav-link" href="about.html">ABOUT</a>
</li>
<li class="nav-item">
<a class="nav-link active" href="services.html">SERVICES</a>
</li>
<li class="nav-item">
<a class="nav-link" href="contact.html">CONTACT</a>
</li>
</ul>
</nav>
</div>
<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
<a class="navbar-brand text-success" id="navbar-brand" href="index.html">Toucans-9 Company</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" href="index.html">HOME</a>
</li>
<li class="nav-item">
<a class="nav-link" href="about.html">ABOUT</a>
</li>
<li class="nav-item active">
<a class="nav-link" href="services.html">SERVICES</a>
</li>
<li class="nav-item">
<a class="nav-link" href="contact.html">CONTACT</a>
</li>
</ul>
</div>
</div>
</nav>
</header>
<main>
<!-- Section: services -->
<section id="sub-services">
</section>
</main>
<!-- Footer & copyright -->
<footer>
<div>Toucans-9 Company, Copyright © 2018</div>
<footer class="footer bg-success">
<div class="container text-center">
<span class="text-light">Toucans-9 Company, Copyright © 2018</span>
</div>
</footer>

<!-- Bootstrap JS, Popper.js, and jQuery -->
Expand Down
36 changes: 5 additions & 31 deletions public/stylesheets/style.css
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,9 @@
/* body {
padding: 50px;
font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
}
a {
color: #00B7FF;
} */

body {
font-family: 'Montserrat', sans-serif;
}

header {
/* text-align: center; */
padding: 20px;
color: #ffffff;
background-color: #333;
}

footer {
text-align: center;
padding: 20px;
color: #ffffff;
background-color: #5ebd5e;
}

#description {
Expand All @@ -32,22 +13,15 @@ footer {
background-color: aliceblue;
}

#section {
text-align: center;
padding: 20px;
color: #ffffff;
background-color: aliceblue;
}

#newsletter {
text-align: center;
padding: 20px;
color: #ffffff;
background-color: #333;
}

/* Section: Descritption */

@media(max-width: 575px) {
button.full-width {
width: 100%;
}
}

/* Section: Services */
.services {
Expand Down

0 comments on commit aaa8f85

Please sign in to comment.