Skip to content

Commit cc9df73

Browse files
MWDelaneyMWDelaney
committed
Revert
1 parent 735a87d commit cc9df73

12 files changed

Lines changed: 1668 additions & 2729 deletions

File tree

‎package-lock.json‎

Lines changed: 1557 additions & 2492 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,17 @@
2525
"devDependencies": {
2626
"@11ty/eleventy": "^3.1.0",
2727
"@11ty/eleventy-img": "^6.0.2",
28+
"@popperjs/core": "^2.11.8",
2829
"autoprefixer": "^10.3.1",
30+
"bootstrap": "^5.3.5",
2931
"chalk": "^4.0.0",
3032
"cross-env": "^7.0.3",
3133
"eleventy-plugin-metagen": "^1.8.3",
3234
"esbuild": "^0.25.2",
3335
"esbuild-sass-plugin": "^3.3.1",
3436
"js-beautify": "^1.15.0",
3537
"markdown-it": "^14.1.0",
36-
"npm-run-all": "^2.1.0",
38+
"npm-run-all": "^4.1.5",
3739
"postcss": "^8.1.0",
3840
"stylelint": "^14.0.1",
3941
"stylelint-config-standard": "^23.0.0"

‎src/assets/scripts/main.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
2+
import 'bootstrap';
3+
14
// Javascript goes here
25
console.log('up to zero!');

‎src/assets/styles/_branding.scss‎

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,14 @@
1-
:root {
2-
/**
3-
Colors
4-
*/
5-
--color-text: #222;
6-
--color-background: white;
7-
--color-light: silver;
8-
--color-primary: #7950f2;
1+
/** Global Settings **/
2+
$enable-rounded: false;
93

10-
/**
11-
Spacing and units
12-
*/
13-
--unit: 1rem;
14-
--container-width: 60ch;
4+
/** Colors **/
5+
$primary: #7950f2;
6+
$light: silver;
7+
$custom: #ec560d;
158

16-
/**
17-
Fonts
18-
*/
19-
--font-family-sans-serif:
20-
system,
21-
-apple-system;
22-
23-
@media (prefers-color-scheme: dark) {
24-
--color-text: #fff;
25-
--color-background: #222;
26-
}
27-
}
9+
/** Override or add colors **/
10+
$custom-theme-colors: (
11+
"primary": $primary,
12+
"light": $light,
13+
"custom": $custom
14+
);

‎src/assets/styles/_reset.scss‎

Lines changed: 0 additions & 79 deletions
This file was deleted.

‎src/assets/styles/styles.scss‎

Lines changed: 1 addition & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,4 @@
11
/**
22
* Import stylesheet partials
33
*/
4-
@import "reset";
5-
@import "branding";
6-
7-
/**
8-
* ZeroPoint starter styling
9-
*/
10-
body {
11-
color: var(--color-text);
12-
background-color: var(--color-background);
13-
font-family: var(--font-family-sans-serif);
14-
}
15-
16-
a {
17-
color: var(--color-primary);
18-
}
19-
20-
#main {
21-
max-width: var(--container-width);
22-
margin: calc(var(--unit) * 5) auto;
23-
}
24-
25-
#navigation {
26-
display: flex;
27-
border-bottom: 1px solid var(--color-light);
28-
margin: var(--unit);
29-
}
30-
31-
#footer {
32-
margin: auto;
33-
max-width: var(--container-width);
34-
border-top: 1px solid var(--color-light);
35-
text-align: center;
36-
}
37-
38-
hr {
39-
border-color: var(--color-light);
40-
}
41-
42-
img {
43-
height: auto;
44-
}
45-
46-
.navigation-item,
47-
.navigation-label,
48-
button {
49-
padding: calc(var(--unit) / 2);
50-
}
51-
52-
.visually-hidden {
53-
clip: rect(0 0 0 0);
54-
clip-path: inset(50%);
55-
height: 1px;
56-
overflow: hidden;
57-
position: absolute;
58-
white-space: nowrap;
59-
width: 1px;
60-
}
61-
62-
label,
63-
input,
64-
textarea {
65-
width: 100%;
66-
display: block;
67-
}
68-
69-
button {
70-
margin: 0;
71-
}
72-
73-
label {
74-
padding: calc(var(--unit) / 2) 0;
75-
}
4+
@import "bootstrap";

‎src/assets/views/layouts/base.njk‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@
3030
<a class="visually-hidden" href="#main">Skip to content</a>
3131

3232
{# Site header with navigation #}
33-
<header>
33+
<header class="site-header">
3434
{% include "partials/navigation.njk" %}
3535
</header>
3636

3737
{# Main content #}
38-
<main id="main" tabindex="-1">
39-
<header id="page-header">
38+
<main id="main" class="container" tabindex="-1">
39+
<header class="page-header" id="pageHeader">
4040
<h1>
4141
{{ title | safe }}
4242
</h1>
4343
</header>
44-
{{ content | safe }}
44+
{{ content | markdown | safe }}
4545
</main>
4646

4747
{# Site footer with copyright #}
48-
<footer id="footer">
48+
<footer id="footer" class="site-footer container">
4949
{% year %} &copy; {{ site.siteName }}
5050
</footer>
5151

‎src/assets/views/partials/nav-item.njk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<div class="navigation-item {{ dropdown }}">
1+
<li class="nav-item {{ dropdown }}">
22
<a
3-
class="navigation-link {{ active }} {{ dropdownToggle }}"
3+
class="nav-link {{ active }} {{ dropdownToggle }}"
44
href="{{ itemUrl }}"
55
{{ currentAttribute | safe }}
66
{{ target }}
@@ -17,4 +17,4 @@
1717
{% endfor %}
1818
</div>
1919
{% endif %} #}
20-
</div>
20+
</li>

‎src/assets/views/partials/navigation.njk‎

Lines changed: 51 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,52 @@
1-
<nav id="navigation" role="navigation">
2-
<span class="navigation-label">Navigation:</span>
3-
4-
{% for item in navigation.items %}
5-
6-
{# Set attributes and classes to blank to start #}
7-
{% set relAttribute = '' %}
8-
{% set currentAttribute = '' %}
9-
{% set itemUrl = item.url %}
10-
{% set target = '' %}
11-
{% set active = '' %}
12-
13-
{# Set Attributes #}
14-
{% if item.rel %}
15-
{% set relAttribute = ' rel="' + item.rel + '"' %}
16-
{% endif %}
17-
18-
{% if page.url | lower == item.url | lower %}
19-
{% set currentAttribute = ' aria-current="page"' %}
20-
{% set active = 'active' %}
21-
{% endif %}
22-
23-
{# {% set hasSubmenu = '' %}
24-
{% set dropdown = '' %}
25-
{% set dropdownToggle = '' %}
26-
{% set dropdownAttributes = '' %} #}
27-
28-
{# {% if item.submenuitems | length %}
29-
{% set hasSubmenu = true %}
30-
{% set dropdown = 'dropdown' %}
31-
{% set dropdownToggle = 'dropdown-toggle' %}
32-
{% set dropdownAttributes = 'role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"' %}
33-
{% set itemUrl = '#' %}
34-
{% endif %} #}
35-
36-
{# {% if item.external %}
37-
{% set target = 'target="_blank"' %}
38-
{% endif %} #}
39-
40-
{% include "partials/nav-item.njk" %}
41-
42-
{% endfor %}
1+
<nav id="navigation" class="navbar navbar-expand-lg" role="navigation">
2+
<div class="container">
3+
<a class="navbar-brand" href="#">Navbar</a>
4+
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navigation-content" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
5+
<span class="navbar-toggler-icon"></span>
6+
</button>
7+
8+
<div class="collapse navbar-collapse" id="navigation-content">
9+
<ul class="navbar-nav">
10+
{% for item in navigation.items %}
11+
12+
{# Set attributes and classes to blank to start #}
13+
{% set relAttribute = '' %}
14+
{% set currentAttribute = '' %}
15+
{% set itemUrl = item.url %}
16+
{% set target = '' %}
17+
{% set active = '' %}
18+
19+
{# Set Attributes #}
20+
{% if item.rel %}
21+
{% set relAttribute = ' rel="' + item.rel + '"' %}
22+
{% endif %}
23+
24+
{% if page.url | lower == item.url | lower %}
25+
{% set currentAttribute = ' aria-current="page"' %}
26+
{% set active = 'active' %}
27+
{% endif %}
28+
29+
{% set hasSubmenu = '' %}
30+
{% set dropdown = '' %}
31+
{% set dropdownToggle = '' %}
32+
{% set dropdownAtttributes = '' %}
33+
34+
{% if item.submenuitems | length %}
35+
{% set hasSubmenu = true %}
36+
{% set dropdown = 'dropdown' %}
37+
{% set dropdownToggle = 'dropdown-toggle' %}
38+
{% set dropdownAttributes = 'role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"' %}
39+
{% set itemUrl = '#' %}
40+
{% endif %}
41+
42+
{% if item.external %}
43+
{% set target = 'target="_blank"' %}
44+
{% endif %}
45+
46+
{% include "partials/nav-item.njk" %}
47+
48+
{% endfor %}
49+
</ul>
50+
</div>
51+
</div>
4352
</nav>

‎src/content/pages/contact.md‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,21 @@ permalink: /contact/
44
---
55

66
<form name="contact" method="POST" data-netlify="true" action="/thank-you/">
7-
<p>
8-
<label>Your Name: <input type="text" name="name" /></label>
9-
</p>
10-
<p>
11-
<label>Your Email: <input type="email" name="email" /></label>
12-
</p>
13-
<p>
14-
<label>Message: <textarea name="message"></textarea></label>
15-
</p>
16-
<p>
7+
<div class="row">
8+
<div class="col-lg-6">
9+
<label for="name">Your Name:</label>
10+
<input class="form-control" type="text" name="name" required />
11+
</div>
12+
<div class="col-lg-6">
13+
<label for="email">Your Email:</label>
14+
<input class="form-control" type="email" name="email" required />
15+
</div>
16+
<div class="col">
17+
<label for="message">Message:</label>
18+
<textarea class="form-control" name="message"></textarea>
19+
</div>
20+
</div>
21+
<p class="mt-3">
1722
<button type="submit">Send</button>
1823
</p>
1924
</form>

0 commit comments

Comments
 (0)