Skip to content
This repository has been archived by the owner on Oct 7, 2021. It is now read-only.

Switch to CloudFront and TLS #228

Merged
merged 5 commits into from
Jan 25, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ link:
pinboard: https://pinboard.in/u:opattison
source: http://github.com/opattison/olivermakes
subscribe:
full: http://olivermak.es/full.xml
writing: http://olivermak.es/writing/feed.xml
photography: http://olivermak.es/photography/feed.xml
projects: http://olivermak.es/projects/feed.xml
full: https://olivermak.es/full.xml
writing: https://olivermak.es/writing/feed.xml
photography: https://olivermak.es/photography/feed.xml
projects: https://olivermak.es/projects/feed.xml
twitter: http://twitter.com/olivermakes
vsco: http://olivermakes.vsco.co

Expand Down Expand Up @@ -80,7 +80,7 @@ exclude: [s3_website.yml, Rakefile]

## Configuration URLs
domain: olivermak.es
url: http://olivermak.es
url: https://olivermak.es
patterns_url: /patterns
image_url: /resources/images
icon_url: /resources/icons
Expand Down
2 changes: 1 addition & 1 deletion _posts/2014-12-12-fujifilm-vector.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ image:
caption: '… and dark themes.'
- src: 2014-12-12-photo-meta-example.jpg
alt: 'an example of the graphics in action a photo metadata excerpt'
caption: 'What the vector graphic looks like [in context on a photo page](http://olivermak.es/2014/11/turntable/).'
caption: 'What the vector graphic looks like [in context on a photo page](/2014/11/turntable/).'

---

Expand Down
2 changes: 1 addition & 1 deletion _posts/2015-10-26-jekyll-mix-blend-mode.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ h2 {
}
```

[^1]: Jekyll is the technology behind this website – it is a static site generator that helps build and publish very fast websites, and I have used it for much of my recent work on the web. [I have written quite a bit about it](http://olivermak.es/label/jekyll/) as well.
[^1]: Jekyll is the technology behind this website – it is a static site generator that helps build and publish very fast websites, and I have used it for much of my recent work on the web. [I have written quite a bit about it](/label/jekyll/) as well.
8 changes: 4 additions & 4 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# olivermak.es an archive

![concentric circle logo](http://olivermak.es/resources/icons/favicon144.png)
# <a href="https://olivermak.es/"><img src="https://olivermak.es/resources/icons/favicon32.svg" width="32" height="32"></a> <a href="https://olivermak.es/">olivermak.es</a> an archive

## Goals

Expand Down Expand Up @@ -57,4 +55,6 @@

All writing and photography on the site is my original work and is licensed under [Creative Commons Attribution-NonCommercial 4.0 (CC BY-NC)](http://creativecommons.org/licenses/by-nc/4.0/). All design and code is under conventional copyright (as opposed to CC-style “copyleft” copyright), but is available for fair use [on GitHub](https://github.com/opattison/olivermakes). If you are looking at the repository, almost everything in the `_static` and `_posts` folders is CC BY-NC and the most of the rest of it is under copyright, where applicable.

[Read more](http://olivermak.es/about/#copyright) on attribution and copyright for the site. If you have any questions about licensing or use of content from the site, please [contact me by email](oliverpattison@gmail.com).
[Read more](https://olivermak.es/about/#copyright) on attribution and copyright for the site. If you have any questions about licensing or use of content from the site, please [contact me by email](oliverpattison@gmail.com).

<a href="https://olivermak.es/"><img src="https://olivermak.es/resources/icons/favicon144.svg" width="100%" height="144"></a>
16 changes: 8 additions & 8 deletions resources/fragments/base16-newbound.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
font-size: 14px;
padding: 10px 20px;
}

.base00-background { background-color: #292f32; }
.base01-background { background-color: #373e43; }
.base02-background { background-color: #49535a; }
Expand All @@ -27,7 +27,7 @@
.base0D-background { background-color: #397eac; }
.base0E-background { background-color: #5a6faf; }
.base0F-background { background-color: #734d80; }

.base00 { color: #292f32; }
.base01 { color: #373e43; }
.base02 { color: #49535a; }
Expand All @@ -48,7 +48,7 @@
</head>
<body>
<h1 class="scheme">Base16 newbound</h1>
<p class="author">Oliver Pattison (http://olivermak.es)</p>
<p class="author">Oliver Pattison (https://olivermak.es)</p>
<div>
<div class="block base00-background base07">00</div>
<div class="block base01-background base07">01</div>
Expand Down Expand Up @@ -83,13 +83,13 @@ <h1 class="scheme">Base16 newbound</h1>

<span class="base03"># This is a comment</span>
<span class="base0E">class</span> <span class="base0A">Person</span>

<span class="base0D">attr_accessor</span> <span class="base0B">:name</span>

<span class="base0E">def</span> <span class="base0D">initialize</span>(<span class="base08">attributes</span> = {})
<span class="base08">@name</span> = <span class="base08">attributes</span>[<span class="base0B">:name</span>]
<span class="base0E">end</span>

<span class="base0E">def</span> <span class="base0E">self</span>.<span class="base0D">greet</span>
<span class="base02-background"><span class="base0B">"hello"</span></span>
<span class="base0E">end</span>
Expand All @@ -99,7 +99,7 @@ <h1 class="scheme">Base16 newbound</h1>
<span class="base0D">print</span> <span class="base0A">Person</span>::<span class="base0D">greet</span>, <span class="base0B">" "</span>, <span class="base08">person1</span>.<span class="base0D">name</span>, <span class="base0B">"<span class="base09">\n</span>"</span>
<span class="base0D">puts</span> <span class="base0B">"another </span><span class="base0F">#{</span><span class="base0A">Person</span>::<span class="base0D">greet</span><span class="base0F">}</span> <span class="base0F">#{</span><span class="base08">person1</span>.<span class="base0D">name</span><span class="base0F">}</span><span class="base0B">"</span>
</pre>

<pre class="base07-background base02">
<span class="base0E">require</span> <span class="base0B">"rubygems"</span>

Expand Down Expand Up @@ -132,4 +132,4 @@ <h1 class="scheme">Base16 newbound</h1>
</pre>
</div>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions resources/fragments/newbound.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
scheme: "newbound"
author: "Oliver Pattison (http://olivermak.es)"
author: "Oliver Pattison (https://olivermak.es)"
base00: "292f32" #gray1
base01: "373e43" #gray2
base02: "49535a" #gray3
Expand All @@ -15,4 +15,4 @@ base0B: "2d8650" #green
base0C: "427c80" #bluegreen
base0D: "397eac" #blue
base0E: "5a6faf" #violet
base0F: "734d80" #purple
base0F: "734d80" #purple
2 changes: 2 additions & 0 deletions s3_website.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
s3_id: <%= ENV['S3_ID'] %>
s3_secret: <%= ENV['S3_SECRET'] %>
s3_bucket: <%= ENV['DEPLOY'] == 'production' ? '' : 'dev.' %>olivermak.es
cloudfront_distribution_id: <%= ENV['DEPLOY'] == 'production' ? 'E12X056WJY9NPN' : 'E1ZEUSCMK4SFIP' %>
cloudfront_invalidate_root: true

max_age:
"*.css": 2419200
Expand Down