Skip to content

Commit

Permalink
Ready to merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Ian Barnes committed Dec 20, 2020
1 parent c40b32a commit bef561a
Show file tree
Hide file tree
Showing 23 changed files with 140 additions and 826 deletions.
8 changes: 2 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ GEM
faraday (1.1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords
ffi (1.13.1)
ffi (1.14.1)
forwardable-extended (2.6.0)
gemoji (3.0.1)
github-pages (209)
Expand Down Expand Up @@ -229,10 +229,6 @@ GEM
rubyzip (2.3.0)
safe_yaml (1.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
Expand All @@ -243,7 +239,7 @@ GEM
thread_safe (0.3.6)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.8)
tzinfo (1.2.9)
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

Minimal personal web site

View it at <http://www.ianbarnes.me.uk/>
View it at <https://www.ianbarnes.me.uk/>
45 changes: 8 additions & 37 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,69 +19,40 @@
# in the templates via {{ site.myvariable }}.

title: Ian Barnes
name: Ian Barnes
author: Ian Barnes
email: ianbarnes1963@gmail.com

# author:
# name: Ian Barnes
# email: ianbarnes1963@gmail.com

description: Software developer
baseurl: "" # the subpath of your site, e.g. /blog
url: "http://www.ianbarnes.me.uk" # the base hostname & protocol for your site, e.g. http://example.com
# github_username: barnes1463
url: "https://www.ianbarnes.me.uk" # the base hostname & protocol for your site, e.g. https://example.com

# Build settings
theme: minima
minima:
date_format: "%Y-%m-%d %H:%M:%S %Z"
plugins:
- jekyll-feed

# Exclude from processing.
# The following items will not be processed, by default.
# Any item listed under the `exclude:` key here will be automatically added to
# the internal "default list".
#
# Excluded items can be processed by explicitly listing the directories or
# their entries' file path in the `include:` list.
#
# exclude:
# - .sass-cache/
# - .jekyll-cache/
# - gemfiles/
# - Gemfile
# - Gemfile.lock
# - node_modules/
# - vendor/bundle/
# - vendor/cache/
# - vendor/gems/
# - vendor/ruby/

minima:
social_links:
facebook: barnes1463
linkedin: barnes1463
github: barnes1463

show_excerpts: true
show_excerpts: true

timezone: Europe/Paris

github_username: barnes1463
github_username: ian-barnes
facebook_username: barnes1463
linkedin_username: barnes1463

# Enable SmartyPants (curly quotes, long dashes, ellipses etc)

markdown: kramdown
kramdown:
extensions: ["smart", "footnotes"]
smart_quotes: lsquo,rsquo,ldquo,rdquo

# Create RSS/Atom feed for blog
rss: true

# Set navigation links in header
header_pages:
- home.md
- index.md
- cv.md
- projects.md
- blog.md
Expand Down
12 changes: 0 additions & 12 deletions _includes/cc.html

This file was deleted.

22 changes: 10 additions & 12 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,18 @@
<data class="u-url" href="{{ "/" | relative_url }}"></data>

<div class="wrapper">

<div class="footer-col-wrapper">
<div class="footer-col footer-col-1">
{%- if site.author -%}
{{ site.author | escape }}
<p>
Copyright &copy;
{% if site.author -%}
{{ site.author | escape }},
{%- else -%}
{{ site.title | escape }}
{%- endif -%}
</div>

<div class="footer-col footer-col-2">
{{ site.title | escape }},
{%- endif %}
{{ site.time | date: "%Y" }}<br/>
Page last rebuilt {{ site.time | date: site.minima.date_format }}
<br/>
{%- include social.html -%}
</div>
</div>
</p>

</div>

Expand Down
5 changes: 5 additions & 0 deletions _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,9 @@
{%- include google-analytics.html -%}
{%- endif -%}
<script src="https://kit.fontawesome.com/842ddd62e4.js" crossorigin="anonymous"></script>
{%- if page.usemathjax -%}
<script type="text/javascript" async
src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-MML-AM_CHTML">
</script>
{%- endif -%}
</head>
2 changes: 1 addition & 1 deletion _layouts/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h3>
</a>
</h3>
{%- if site.show_excerpts -%}
{{ post.excerpt }}
{{ post.excerpt }} <a href="{{ post.url | relative_url }}">More...</a>
{%- endif -%}
</li>
{%- endfor -%}
Expand Down
29 changes: 0 additions & 29 deletions _posts/2020-12-05-welcome-to-jekyll.markdown

This file was deleted.

36 changes: 36 additions & 0 deletions _posts/2020-12-20-visualisation-of-periodic-surfaces.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
---
layout: post
title: Visualisation of periodic surfaces
date: 2020-12-20T01:26:08+01:00
usemathjax: true
---

Here's an image I generated while I was writing my [PhD thesis][thesis]. This is
one repeating unit of the surface $$ \cos X + \cos Y + \cos Z = 0 $$, which is
similar in many ways to the Schwarz P-surface, a periodic minimal surface.

![The surface cosX + cosY + cosZ = 0](/images/Schwarz-P-Surface.png)

Here's another. This one approximates the Neovius minimal surface, and is
the solution of the equation
$$
3 ( \cos X + \cos Y + \cos Z ) + 4 \cos X \cos Y \cos Z = 0
$$

![Not quite the Neovius surface](/images/Neovius-Surface.png)

These images were all generated by a Pascal program that divided the repeating
unit cube into 20x20x20 smaller cubes. For each small cube, it computed the
function values at the 8 vertices, and if there were any sign changes,
approximated the positions of the zeros of the function along each edge by
linear interpolation, then joined these points to form a polygon that
approximates the part of the surface inside that little cube. This was done in
order from back to front so that closer polygons overwrote and obscured those
further away from the viewing point, thus avoiding the need for complex hidden
surface removal algorithms.

Each image took about an hour to produce on [Macintosh IIci][], a pretty powerful
desktop workstation back in 1989.

[thesis]: https://openresearch-repository.anu.edu.au/handle/1885/49316
[Macintosh IIci]: https://en.wikipedia.org/wiki/Macintosh_IIci
29 changes: 22 additions & 7 deletions _sass/minima/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,10 @@ main {
* Images
*/
img {
max-width: 100%;
vertical-align: middle;
max-width: 60%;
margin-left: auto;
margin-right: auto;
display: block;
}


Expand Down Expand Up @@ -88,6 +90,19 @@ li {
}
}

dl {
margin-left: 0;
}

dt {
margin-top: $spacing-unit / 2;
margin-left: 0;
}

dd {
margin-left: $spacing-unit;
}



/**
Expand Down Expand Up @@ -217,11 +232,11 @@ pre {
vertical-align: text-top;
}

.social-media-list {
li + li {
padding-top: 5px;
}
}
// .social-media-list {
// li + li {
// padding-top: 5px;
// }
// }



Expand Down
53 changes: 5 additions & 48 deletions _sass/minima/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -101,76 +101,33 @@
}



/**
* Site footer
*/
.site-footer {
border-top: 1px solid $grey-color-light;
padding: $spacing-unit 0;
text-align: center;
color: $grey-color;
@include relative-font-size(0.8);
}

.footer-heading {
@include relative-font-size(1.125);
margin-bottom: $spacing-unit / 2;
}

.social-media-list {
list-style-type: none;
display: inline;
margin: 0;
}

.social-media-list-item {
display: inline-block;
margin-left: 1em;
margin-right: 1em;
}

.footer-col-wrapper {
@include relative-font-size(0.9375);
color: $grey-color;
margin-left: -$spacing-unit / 2;
@extend %clearfix;
}

.footer-col {
margin-bottom: $spacing-unit / 2;
padding-left: $spacing-unit / 2;
}

.footer-col-1 {
width: -webkit-calc(20% - (#{$spacing-unit} / 2));
width: calc(20% - (#{$spacing-unit} / 2));
text-align: left;
}

.footer-col-2 {
width: -webkit-calc(70% - (#{$spacing-unit} / 2));
width: calc(70% - (#{$spacing-unit} / 2));
text-align: center;
}

@include media-query($on-laptop) {
.footer-col-1,
.footer-col-2 {
width: -webkit-calc(50% - (#{$spacing-unit} / 2));
width: calc(50% - (#{$spacing-unit} / 2));
}

.footer-col-3 {
width: -webkit-calc(100% - (#{$spacing-unit} / 2));
width: calc(100% - (#{$spacing-unit} / 2));
}
}

@include media-query($on-palm) {
.footer-col {
float: none;
width: -webkit-calc(100% - (#{$spacing-unit} / 2));
width: calc(100% - (#{$spacing-unit} / 2));
}
}



/**
* Page content
Expand Down
17 changes: 0 additions & 17 deletions about.md

This file was deleted.

Loading

0 comments on commit bef561a

Please sign in to comment.