Skip to content

Commit ee10a8b

Browse files
author
Matt Swanson
committed
In progress
1 parent 2039d61 commit ee10a8b

File tree

117 files changed

+4056
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+4056
-30
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
*.sw*
22
_site/
3+
.sass-cache/
4+
.DS_Store

‎404.md

+3-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
---
22
permalink: /404.html
3-
title: "Page Not Found"
4-
layout: static
3+
title: "Whelp - Page Not Found"
4+
layout: post
55
---
66

7-
<br/>
8-
<br/>
9-
10-
![Air Bud]({{site.baseurl}}/static/404-airbud.jpg)
11-
12-
<br/>
13-
<br/>
7+
![Air Bud]({{site.baseurl}}/static/404-airbud.jpg)

‎Gemfile

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
source "https://rubygems.org"
22

33
gem "github-pages"
4-
gem "rake"
4+
gem "rake"
5+
6+
gem "bourbon"
7+
gem "neat"
8+
gem "bitters"

‎Gemfile.lock

+14
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,14 @@ GEM
88
minitest (~> 5.1)
99
thread_safe (~> 0.1)
1010
tzinfo (~> 1.1)
11+
bitters (0.10.0)
12+
bourbon (>= 3.2)
13+
sass (>= 3.2)
14+
thor
1115
blankslate (2.1.2.4)
16+
bourbon (4.0.2)
17+
sass (~> 3.3)
18+
thor
1219
celluloid (0.15.2)
1320
timers (~> 1.1.0)
1421
classifier (1.3.4)
@@ -85,6 +92,9 @@ GEM
8592
mercenary (0.3.4)
8693
mini_portile (0.6.0)
8794
minitest (5.4.0)
95+
neat (1.6.0)
96+
bourbon (>= 3.1)
97+
sass (>= 3.3)
8898
nokogiri (1.6.3.1)
8999
mini_portile (= 0.6.0)
90100
parslet (1.5.0)
@@ -101,6 +111,7 @@ GEM
101111
redcarpet (3.1.2)
102112
safe_yaml (1.0.3)
103113
sass (3.3.14)
114+
thor (0.19.1)
104115
thread_safe (0.3.4)
105116
timers (1.1.0)
106117
toml (0.1.1)
@@ -113,5 +124,8 @@ PLATFORMS
113124
ruby
114125

115126
DEPENDENCIES
127+
bitters
128+
bourbon
116129
github-pages
130+
neat
117131
rake

‎_includes/header.html

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<header class="navigation">
2+
<a href="/" class="logo" title="A majestic moose">
3+
<img src="/static/moose.png" alt="Moose">
4+
</a>
5+
<nav>
6+
<ul>
7+
<li><a href="/">home</a></li>
8+
<li><a href="/about">about</a></li>
9+
<li><a href="/writing">writing</a></li>
10+
<li class="no-bullet"><a href="/projects">projects</a></li>
11+
</ul>
12+
</nav>
13+
</header>

‎_layouts/default.html

+19-14
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,39 @@
99
<meta name="viewport" content="width=device-width, initial-scale=1">
1010
<title>Matt Swanson - {{ page.title }}</title>
1111
<meta name="author" content="Matt Swanson" />
12-
<meta name="description" content="blog posts, talks, book writeups and projects by a software engineer in Indiana" />
12+
<meta name="description" content="blog posts, talks, book writeups and projects by a software engineer from Indiana" />
1313
<link rel="canonical" href="http://mdswanson.com{{ page.url | replace:'index.html','' }}" />
1414

15-
<link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700,800" rel="stylesheet" type="text/css">
15+
<link href="//fonts.googleapis.com/css?family=Nunito:400,700,300" rel="stylesheet" type="text/css">
16+
<link href="//fonts.googleapis.com/css?family=Varela+Round" rel="stylesheet" type="text/css">
1617
<link rel="shortcut icon" href="/static/favicon.png">
1718
<link rel="alternate" type="application/rss+xml" title="Matt Swanson" href="{{site.baseurl}}/atom.xml" />
1819

1920
{% if site.github %}
20-
<link rel="stylesheet" href="/css/all.css?sha={{ site.github.build_revision }}">
21+
<link rel="stylesheet" href="/css/site.css?sha={{ site.github.build_revision }}">
2122
{% else %}
22-
<link rel="stylesheet" href="/css/all.css">
23+
<link rel="stylesheet" href="/css/site.css">
2324
{% endif %}
2425
</head>
2526
<body>
26-
<div class="container">
27-
<div class="four columns sidebar">
27+
<!--<section>
28+
<aside>
2829
{% include sidebar.html %}
29-
</div>
30+
</aside>
3031
31-
<div class="eleven columns content">
32+
<article> -->
33+
<section>
3234
{{ content }}
35+
</section>
36+
<!-- </article>
37+
</section>
3338
34-
<div class="footer">
35-
{% include footer.html %}
36-
</div>
37-
</div>
38-
</div>
39+
<footer>
40+
{% include footer.html %}
41+
</footer> -->
3942

40-
{% include analytics.html %}
43+
{% if site.github %}
44+
{% include analytics.html %}
45+
{% endif %}
4146
</body>
4247
</html>

‎_layouts/post.html

+8-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@
22
layout: default
33
---
44

5-
<p class="meta"> {{ page.date | date: "%B %d, %Y" }}
6-
<a href="/"><i class="home fa fa-home"></i></a>
7-
</p>
5+
{% include header.html %}
6+
7+
<article>
88
<h1 class="title">{{ page.title }}</h1>
99

10+
<p class="date">
11+
{{ page.date | date: "%B %d, %Y" }}
12+
</p>
1013

1114
<div id="post">
1215
{{ content }}
@@ -26,3 +29,5 @@ <h3>Related Posts</h3>
2629
<p style="text-align: left; color: #666;">Disclaimer: Matt Swanson is a participant in the Amazon Services LLC Associates Program, an affiliate advertising program designed to provide a means for sites to earn advertising fees by advertising and linking to amazon.com</p>
2730
</div>
2831
{% endif %}
32+
33+
</article>

‎_posts/2014-05-14-open-source-tale.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ categories:
1010

1111
It all started with a JavaScript error...
1212

13-
```
13+
```javascript
1414
Uncaught SyntaxError: Unexpected token ILLEGAL
1515
```
1616

@@ -47,7 +47,7 @@ about that string.
4747

4848
I pasted it into an `irb` session and found the likely culprit:
4949

50-
```
50+
```ruby
5151
irb(main):001:0> "QNk8n\U+FFE2\U+FFA8"
5252
```
5353

‎_posts/2014-06-02-android-form-models.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ at home).
238238
Coming from other frameworks (and speaking with other developers), data binding is
239239
pretty lacking on Android. Something still seems a bit off with this design because we
240240
are coupled tightly to Android classes and there is dependency on knowing the order of
241-
methods to call (e.g.`initialize()` should be called before `validate()`) &mdash; however
241+
methods to call (e.g. `initialize()` should be called before `validate()`) &mdash; however
242242
I think it is an improvement over the "giant mud ball Activity".
243243

244244
As your form models get more and more complex, you may want to think about extracting

‎_sass/alg/_alg.scss

+140
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
@import 'variables';
2+
@import 'syntax';
3+
4+
body {
5+
border-top: 7px solid $accent-color;
6+
}
7+
8+
header {
9+
height: $nav-height;
10+
margin-bottom: $nav-height / 4;
11+
display: block;
12+
width: 100%;
13+
@include clearfix;
14+
15+
a.logo {
16+
float: left;
17+
max-height: $nav-height;
18+
19+
img {
20+
max-height: $nav-height - 20;
21+
margin-top: 10px;
22+
margin-bottom: 10px;
23+
}
24+
}
25+
26+
nav {
27+
float: right;
28+
text-align: center;
29+
30+
ul li {
31+
display: inline;
32+
text-decoration: none;
33+
line-height: $nav-height;
34+
font-size: .9em;
35+
36+
a {
37+
color: $accent-color;
38+
39+
&:hover {
40+
color: darken($accent-color, 15);
41+
}
42+
}
43+
44+
:after {
45+
content: " \00b7";
46+
font-weight: bold;
47+
}
48+
}
49+
50+
li.no-bullet :after {
51+
content: none;
52+
}
53+
}
54+
}
55+
56+
section {
57+
@include outer-container;
58+
59+
width: 720px;
60+
margin: 0 auto;
61+
padding-top: 10px;
62+
}
63+
64+
article {
65+
@include clearfix;
66+
text-align: left;
67+
68+
h1 {
69+
font-family: $sans-serif-article-2;
70+
font-size: 1.3em;
71+
72+
@include media($medium-screen) {
73+
font-size: 1.8em;
74+
}
75+
}
76+
77+
h2 {
78+
font-family: $sans-serif-article-2;
79+
font-size: 1.2em;
80+
font-weight: 400;
81+
line-height: 1.4em;
82+
margin-bottom: .9em;
83+
84+
@include media($medium-screen) {
85+
font-size: 1.4em;
86+
}
87+
}
88+
89+
h3 {
90+
font-family: $sans-serif-article-2;
91+
font-size: 1.2em;
92+
font-weight: 400;
93+
line-height: 1.3em;
94+
margin-bottom: .4em;
95+
}
96+
97+
p.date {
98+
color: transparentize($base-font-color, .6);
99+
font-family: $sans-serif-article;
100+
font-size: .9em;
101+
margin-bottom: .5em;
102+
margin-top: .3em;
103+
}
104+
105+
p {
106+
font-family: $sans-serif-article;
107+
line-height: 1.4em;
108+
font-size: 1.05em;
109+
font-weight: 300;
110+
margin-bottom: 1em;
111+
112+
span {
113+
font-family: $sans-serif-article-2;
114+
text-transform: uppercase;
115+
font-size: 0.8em;
116+
}
117+
}
118+
119+
p.author {
120+
font-family: $sans-serif-article;
121+
}
122+
123+
ul {
124+
margin: 1em 0;
125+
list-style: disc;
126+
}
127+
128+
pre code {
129+
border: none;
130+
font-size: 100%;
131+
}
132+
133+
code {
134+
border: 1px solid #ddd;
135+
background-color: #eef;
136+
font-size: 85%;
137+
padding: 0 .3em;
138+
}
139+
}
140+

‎_sass/alg/_syntax.scss

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
.highlight{background-color:#073642;color:#93a1a1}.highlight .c{color:#586e75 !important;font-style:italic !important}.highlight .cm{color:#586e75 !important;font-style:italic !important}.highlight .cp{color:#586e75 !important;font-style:italic !important}.highlight .c1{color:#586e75 !important;font-style:italic !important}.highlight .cs{color:#586e75 !important;font-weight:bold !important;font-style:italic !important}.highlight .err{color:#dc322f !important;background:none !important}.highlight .k{color:#cb4b16 !important}.highlight .o{color:#93a1a1 !important;font-weight:bold !important}.highlight .p{color:#93a1a1 !important}.highlight .ow{color:#2aa198 !important;font-weight:bold !important}.highlight .gd{color:#93a1a1 !important;background-color:#372c34 !important;display:inline-block}.highlight .gd .x{color:#93a1a1 !important;background-color:#4d2d33 !important;display:inline-block}.highlight .ge{color:#93a1a1 !important;font-style:italic !important}.highlight .gr{color:#aa0000}.highlight .gh{color:#586e75 !important}.highlight .gi{color:#93a1a1 !important;background-color:#1a412b !important;display:inline-block}.highlight .gi .x{color:#93a1a1 !important;background-color:#355720 !important;display:inline-block}.highlight .go{color:#888888}.highlight .gp{color:#555555}.highlight .gs{color:#93a1a1 !important;font-weight:bold !important}.highlight .gu{color:#6c71c4 !important}.highlight .gt{color:#aa0000}.highlight .kc{color:#859900 !important;font-weight:bold !important}.highlight .kd{color:#268bd2 !important}.highlight .kp{color:#cb4b16 !important;font-weight:bold !important}.highlight .kr{color:#d33682 !important;font-weight:bold !important}.highlight .kt{color:#2aa198 !important}.highlight .n{color:#268bd2 !important}.highlight .na{color:#268bd2 !important}.highlight .nb{color:#859900 !important}.highlight .nc{color:#d33682 !important}.highlight .no{color:#b58900 !important}.highlight .ni{color:#800080}.highlight .nl{color:#859900 !important}.highlight .ne{color:#268bd2 !important;font-weight:bold !important}.highlight .nf{color:#268bd2 !important;font-weight:bold !important}.highlight .nn{color:#b58900 !important}.highlight .nt{color:#268bd2 !important;font-weight:bold !important}.highlight .nx{color:#b58900 !important}.highlight .bp{color:#999999}.highlight .vc{color:#008080}.highlight .vg{color:#268bd2 !important}.highlight .vi{color:#268bd2 !important}.highlight .nv{color:#268bd2 !important}.highlight .w{color:#bbbbbb}.highlight .mf{color:#2aa198 !important}.highlight .m{color:#2aa198 !important}.highlight .mh{color:#2aa198 !important}.highlight .mi{color:#2aa198 !important}.highlight .mo{color:#009999}.highlight .s{color:#2aa198 !important}.highlight .sb{color:#d14}.highlight .sc{color:#d14}.highlight .sd{color:#2aa198 !important}.highlight .s2{color:#2aa198 !important}.highlight .se{color:#dc322f !important}.highlight .sh{color:#d14}.highlight .si{color:#268bd2 !important}.highlight .sx{color:#d14}.highlight .sr{color:#2aa198 !important}.highlight .s1{color:#2aa198 !important}.highlight .ss{color:#990073}.highlight .il{color:#009999}.highlight div .gd,.highlight div .gd .x,.highlight div .gi,.highlight div .gi .x{display:inline-block;width:100%}
2+
3+
code, pre { font-family: Monaco,Menlo,Consolas,"Courier New",monospace; }
4+
pre {
5+
border: 1px solid #ddd;
6+
background-color: #eef;
7+
padding: 0 .4em;
8+
margin-bottom: 20px !important;
9+
font-size: .9em;
10+
}

‎_sass/alg/_variables.scss

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
$sans-serif-article: 'Nunito', sans-serif;
2+
$sans-serif-article-2: 'Varela Round', sans-serif;
3+
4+
$accent-color: #40526b;
5+
$nav-height: 50px;

‎_sass/base/_base.scss

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Bitters v0.10.0
2+
// http://bitters.bourbon.io
3+
4+
// Variables
5+
@import 'variables';
6+
7+
// Neat Settings -- uncomment if using Neat -- must be imported before Neat
8+
@import 'grid-settings';
9+
10+
// Mixins
11+
@import 'mixins/flash';
12+
13+
// Extends
14+
@import 'extends/button';
15+
@import 'extends/clearfix';
16+
@import 'extends/hide-text';
17+
18+
// Typography and Elements
19+
@import 'typography';
20+
@import 'forms';
21+
@import 'tables';
22+
@import 'lists';
23+
@import 'flashes';
24+
@import 'buttons';

‎_sass/base/_buttons.scss

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
button,
2+
input[type="submit"] {
3+
@extend %button;
4+
@include appearance(none);
5+
border: none;
6+
cursor: pointer;
7+
user-select: none;
8+
vertical-align: middle;
9+
white-space: nowrap;
10+
}

0 commit comments

Comments
 (0)