Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove jQuery #35

Merged
merged 7 commits into from
Mar 6, 2018
Merged

Remove jQuery #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ddd9269
Stared removing jQuery and reorganizing partials
tomanistor Feb 18, 2018
509b5a6
Removed jQuery from index.js
tomanistor Feb 18, 2018
4337a96
Merge branch 'master' into remove-jquery
tomanistor Feb 18, 2018
3910027
Started removing jQuery from contact.js
tomanistor Feb 20, 2018
2c2741d
Created contact partial for homepage footer
tomanistor Feb 25, 2018
ce75017
Contact form thank you message
tomanistor Feb 26, 2018
89668e1
Removed jQuery from contact form, minor styling adjustments
tomanistor Mar 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions layouts/404.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
{{ partial "header.html" . }}
<!DOCTYPE html>
<html lang="{{ .Site.LanguageCode }}">
{{ partial "header.html" . }}
<body>
{{ partial "body-top" . }}
<main>

<div class="row full center-xs middle-xs">
<div class="row full center-xs middle-xs">
<div class="col-xs-12">
<h1>404!</h1>
<p>WHAT DID YOU DO?!</p>
</div>
</div>
</div>

{{ partial "footer.html" . }}
</main>
{{ partial "footer.html" . }}
</body>
</html>
50 changes: 29 additions & 21 deletions layouts/_default/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,31 @@
{{ partial "header.html" . }}
<!DOCTYPE html>
<html lang="{{ .Site.LanguageCode }}">
{{ partial "header.html" . }}
<body>
{{ partial "body-top" . }}
<main>

<section class="blog" id="blog">
<div class="container">
<div class="row center-xs">
<div class="col-xs-12"><h1>{{ humanize .Type }}</h1></div>
</div>
<div class="row">
<div class="col-xs-12 posts-list">
{{ range .Data.Pages }}
<article>
<h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
<div class=sub-header>
{{ .Date.Format (.Site.Params.dateform | default "January 2006") }} · {{ .ReadingTime }} minute read
</div>
</article>
{{ end }}
</div>
</div>
</div>
</section>
<section class="blog" id="blog">
<div class="container">
<div class="row center-xs">
<div class="col-xs-12"><h1>{{ humanize .Type }}</h1></div>
</div>
<div class="row">
<div class="col-xs-12 posts-list">
{{ range .Data.Pages }}
<article>
<h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
<div class=sub-header>
{{ .Date.Format (.Site.Params.dateform | default "January 2006") }} · {{ .ReadingTime }} minute read
</div>
</article>
{{ end }}
</div>
</div>
</div>
</section>

{{ partial "footer.html" . }}
</main>
{{ partial "footer.html" . }}
</body>
</html>
54 changes: 31 additions & 23 deletions layouts/_default/single.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,36 @@
{{ partial "header.html" . }}
<!DOCTYPE html>
<html lang="{{ .Site.LanguageCode }}">
{{ partial "header.html" . }}
<body>
{{ partial "body-top" . }}
<main>

<section class="container">
<section class="content">
<h1>{{ if .Params.heading }} {{ .Params.heading }} {{ else }} {{ .Title }} {{ end }}</h1>
<section class="container">
<section class="content">
<h1>{{ if .Params.heading }} {{ .Params.heading }} {{ else }} {{ .Title }} {{ end }}</h1>

<div class="sub-header">
{{ .Date.Format (.Site.Params.dateform | default "January 2006") }} · {{ .ReadingTime }} minute read
</div>
<div class="sub-header">
{{ .Date.Format (.Site.Params.dateform | default "January 2006") }} · {{ .ReadingTime }} minute read
</div>

<article class="entry-content">
{{ .Content }}
</article>
<article class="entry-content">
{{ .Content }}
</article>

<div class="pagination">
{{ if .PrevInSection }}
<a href="{{ .PrevInSection.Permalink }}">&laquo; {{ .PrevInSection.Title }}</a>
{{ end }}
{{ if .NextInSection }}
<a href="{{ .NextInSection.Permalink }}">{{ .NextInSection.Title }} &raquo;</a>
{{ end }}
</div>
</section>
<br>
{{ partial "disqus" . }}
</section>
<div class="pagination">
{{ if .PrevInSection }}
<a href="{{ .PrevInSection.Permalink }}">&laquo; {{ .PrevInSection.Title }}</a>
{{ end }}
{{ if .NextInSection }}
<a href="{{ .NextInSection.Permalink }}">{{ .NextInSection.Title }} &raquo;</a>
{{ end }}
</div>
</section>
<br>
{{ partial "disqus" . }}
</section>

{{ partial "footer.html" . }}
</main>
{{ partial "footer.html" . }}
</body>
</html>
22 changes: 16 additions & 6 deletions layouts/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
{{ partial "header.html" . }}
{{ partial "about.html" . }}
{{ partial "gallery.html" . }}
{{ partial "blog.html" . }}
{{ partial "contact.html" . }}
{{ partial "footer.html" . }}
<!DOCTYPE html>
<html lang="{{ .Site.LanguageCode }}">
{{ partial "header.html" . }}
<body>
{{ partial "body-top" . }}
<main>

{{ partial "about.html" . }}
{{ partial "gallery.html" . }}
{{ partial "blog.html" . }}
{{ partial "contact.html" . }}

</main>
{{ partial "footer.html" . }}
</body>
</html>
22 changes: 12 additions & 10 deletions layouts/partials/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
{{ $directory := "content/" }}
{{ $filename := "about.md" }}
{{ if (where (readDir $directory) "Name" $filename) }}
<section class="about" id="about">
<section class="about" id="about">
<div class="container middle-xs">
<div class="row center-xs">
<div class="col-xs-12"><h1>{{ with $.Site.GetPage "page" "about.md" }}{{ .Title }}{{ end }}</h1></div>
<div class="row center-xs">
<div class="col-xs-12">
<h1>{{ with $.Site.GetPage "page" "about.md" }}{{ .Title }}{{ end }}</h1>
</div>
<div class="row">
<div class="col-xs-12 middle-xs">
{{ with $.Site.GetPage "page" "about.md" }}
{{ .Content }}
{{ end }}
</div>
</div>
<div class="row">
<div class="col-xs-12 middle-xs">
{{ with $.Site.GetPage "page" "about.md" }}
{{ .Content }}
{{ end }}
</div>
</div>
</div>
</section>
</section>
{{ end }}
36 changes: 18 additions & 18 deletions layouts/partials/blog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<section class="blog" id="blog">
<div class="container">
<div class="row center-xs">
<div class="col-xs-12"><h1>Latest Posts</h1></div>
</div>
<div class="row">
<div class="col-xs-12 posts-list">
{{ range first 5 (where .Data.Pages "Section" "blog") }}
<article>
<h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
<div class=sub-header>
{{ .Date.Format (.Site.Params.dateform | default "January 2006") }} · {{ .ReadingTime }} minute read
</div>
</article>
{{ end }}
<div class="container">
<div class="row center-xs">
<div class="col-xs-12"><h1>Latest Posts</h1></div>
</div>
<div class="row">
<div class="col-xs-12 posts-list">
{{ range first 5 (where .Data.Pages "Section" "blog") }}
<article>
<h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
<div class=sub-header>
{{ .Date.Format (.Site.Params.dateform | default "January 2006") }} · {{ .ReadingTime }} minute read
</div>
</div>
<div class="row center-xs">
<div class="col-xs-12"><h3><a href="{{ .Site.BaseURL }}/blog/">View All</a></h3></div>
</div>
</article>
{{ end }}
</div>
</div>
<div class="row center-xs">
<div class="col-xs-12"><h3><a href="{{ .Site.BaseURL }}/blog/">View All</a></h3></div>
</div>
</div>
</section>
45 changes: 45 additions & 0 deletions layouts/partials/body-top.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{{ if .Site.Params.googleTagManager }}
<!-- Google Tag Manager (noscript) -->
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{ .Site.Params.googleTagManager }}"
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<!-- End Google Tag Manager (noscript) -->
{{ end }}

{{ if .IsHome }}
<header class="row middle-xs center-xs">
<div class="col-xs-12">
<div class="row middle-xs center-xs">
<div class="col-xs-12"><img src="{{ .Site.Params.logoBig}}" alt="{{ .Site.Title }}"></div>
</div>
<div class="row middle-xs center-xs">
<div class="col-xs-12">
<h1>{{ .Site.Params.tagline }}<span class="cursor">|</span></h1>
</div>
</div>
</div>
</header>
{{ end }}

<nav class="row middle-xs center-xs">
<div class="col-xs-6 col-sm-1 logo">
<a href="{{ .Site.BaseURL }}#"><img src="{{ .Site.Params.logoSmall }}" alt="{{ .Site.Title }}"></a>
</div>
{{ range .Site.Menus.main }}
<div class="col-xs-3 col-sm-2">
<h3><a href="{{ .URL }}">{{ .Name }}</a></h3>
</div>
{{ end }}
<div class="col-xs-6 col-sm-1 nav-toggle">
<a href="" class="nav-icon" onclick="return false"><img src="/images/icon-menu.png" alt="Open Menu"><img src="/images/icon-x.png" alt="Close Menu" style="display: none;"></a>
</div>
</nav>

<section class="nav-full row middle-xs center-xs">
<div class="col-xs-12">
<div class="row middle-xs center-xs">
{{ range .Site.Menus.main }}
<div class="col-xs-12"><h1><a href="{{ .URL }}">{{ .Name }}</a></h1></div>
{{ end }}
</div>
</div>
</section>
39 changes: 23 additions & 16 deletions layouts/partials/contact.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,28 @@
{{ if .Site.Params.ajaxFormspree }}
<section class="contact" id="contact">
<div class="container">
<div class="row center-xs">
<div class="col-xs-12"><h1>Let's Chat</h1></div>
</div>
<form id="form-contact" action="https://formspree.io/{{ .Site.Params.email }}" method="POST">
<div class="row center-xs">
<div class="col-xs-12 col-sm-6"><input type="text" name="name" placeholder="Name" required></div>
<div class="col-xs-12 col-sm-6"><input type="email" name="email" placeholder="Email" required></div>
<div class="col-xs-12"><input type="text" name="_subject" placeholder="Subject" required></div>
<div class="col-xs-12"><textarea name="message" placeholder="Message" required></textarea></div>
<input type="text" name="_gotcha" style="display:none">
<input type="hidden" name="_next" value="/">
<div class="col-xs-6" id="form-submit"><input type="submit" value="Send"></div>
<div class="col-xs-12" id="form-thankyou" style="display:none;">Thanks for your email!</div>
</div>
</form>
<div class="container">

<div class="row">
<div class="col-xs-12">
<h1>Let's Chat</h1>
</div>
</div>

<form id="form-contact" action="https://formspree.io/{{ .Site.Params.email }}" method="POST">
<div class="row center-xs">
<div class="col-xs-12 col-sm-6"><input type="text" name="name" placeholder="Name" required></div>
<div class="col-xs-12 col-sm-6"><input type="email" name="email" placeholder="Email" required></div>
<div class="col-xs-12"><input type="text" name="_subject" placeholder="Subject" required></div>
<div class="col-xs-12"><textarea name="message" placeholder="Message" required></textarea></div>
<input type="text" name="_gotcha" style="display:none">
<input type="hidden" name="_next" value="/">
<div class="col-xs-12 contact-submit">
<input id="form-submit" type="submit" value="Send">
<span id="form-thankyou" style="visibility:hidden">Thanks for your email!</span>
</div>
</div>
</form>

</div>
</section>
{{ end }}
28 changes: 14 additions & 14 deletions layouts/partials/disqus.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<section class="disqus">
<div id="disqus_thread"></div>
<script type="text/javascript">
(function() {
// Don't ever inject Disqus on localhost--it creates unwanted
// discussions from 'localhost:1313' on your Disqus account...
if (window.location.hostname == "localhost")
return;
var disqus_shortname = '{{ .Site.DisqusShortname }}';
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
})();
</script>
<noscript>Please enable JavaScript to view comments powered by <a href="http:https://disqus.com/?ref_noscript">Disqus</a>.</noscript>
<div id="disqus_thread"></div>
<script type="text/javascript">
(function() {
// Don't ever inject Disqus on localhost--it creates unwanted
// discussions from 'localhost:1313' on your Disqus account...
if (window.location.hostname == "localhost")
return;
var disqus_shortname = '{{ .Site.DisqusShortname }}';
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
})();
</script>
<noscript>Please enable JavaScript to view comments powered by <a href="http:https://disqus.com/?ref_noscript">Disqus</a>.</noscript>
</section>
Loading