diff --git a/Gemfile b/Gemfile index f60b144..bd40d74 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ source "https://rubygems.org" gem "jekyll", "~> 3.6.2" # This is the default theme for new Jekyll sites. You may change this to anything you like. -gem "minima", "~> 2.0" +gem "minima", "~> 2.0", path: '/home/rob/dev/minima' # If you want to use GitHub Pages, remove the "gem "jekyll"" above and # uncomment the line below. To upgrade, run `bundle update github-pages`. @@ -21,7 +21,7 @@ gem "minima", "~> 2.0" group :jekyll_plugins do gem "jekyll-feed", "~> 0.6" gem 'jekyll-seo-tag' - gem 'jekyll-stealthy-share', git: 'https://github.com/rfwatson/jekyll-stealthy-share.git' + gem 'jekyll-stealthy-share', path: '/home/rob/dev/jekyll-stealthy-share' end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem diff --git a/Gemfile.lock b/Gemfile.lock index 81c7f9b..4f02dae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,15 @@ -GIT - remote: https://github.com/rfwatson/jekyll-stealthy-share.git - revision: 935cd054662c2987ea88e782794ea8d4f764bae2 +PATH + remote: /home/rob/dev/jekyll-stealthy-share specs: jekyll-stealthy-share (0.1.0) +PATH + remote: /home/rob/dev/minima + specs: + minima (2.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.1) + GEM remote: https://rubygems.org/ specs: @@ -38,8 +44,6 @@ GEM rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) mercenary (0.3.6) - minima (2.1.1) - jekyll (~> 3.3) pathutil (0.16.1) forwardable-extended (~> 2.6) public_suffix (3.0.1) @@ -63,7 +67,7 @@ DEPENDENCIES jekyll-feed (~> 0.6) jekyll-seo-tag jekyll-stealthy-share! - minima (~> 2.0) + minima (~> 2.0)! tzinfo-data BUNDLED WITH diff --git a/_includes/sidebar.html b/_includes/sidebar.html index cacd432..1873b12 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -1,7 +1,7 @@ -
Welcome to Netflux.io, the personal tech blog of Rob Watson.
+Welcome to Netflux.io, the tech blog of Rob Watson.
I am co-founder and CTO of Mixlr. -
You can find me on Twitter, GitHub and GitLab. +
You can find me on Twitter, GitHub, GitLab and LinkedIn.
You can also subscribe to this blog via RSS.
diff --git a/assets/images/background.jpg b/assets/images/background.jpg new file mode 100644 index 0000000..e179977 Binary files /dev/null and b/assets/images/background.jpg differ diff --git a/assets/main.scss b/assets/main.scss index 6483eb1..46b1d3d 100644 --- a/assets/main.scss +++ b/assets/main.scss @@ -1,19 +1,25 @@ --- --- +$content-width: 750px; +$sidebar-width: 300px; +$on-xl: 1100px; + @import 'minima'; -@import url('https://fonts.googleapis.com/css?family=Archivo+Black|Tenor+Sans|Ubuntu+Mono'); +@import url('https://fonts.googleapis.com/css?family=Roboto:400,500,700|Archivo+Black|Tenor+Sans|Ubuntu+Mono'); + html, body, div, p { - font-family: 'Tenor' + font-family: 'Tenor'; + letter-spacing: -0.05px; } body { - font-size: 17px; + font-size: 18px; } h1, h2, h3, h4, h5, h6 { - font-family: 'Archivo Black' + font-family: 'Archivo Black'; } pre, code { @@ -25,19 +31,27 @@ a, a:active, a:visited { color: #2d753a; } -body > header { +body > header.site-header { background-color: #000; + border-bottom: none; + border-top: none; + box-shadow: 0px 5px 8px rgba(20, 20, 20, 0.5); + z-index: 1; .site-title, .site-title:visited { - font-family: 'Archivo Black'; + font-family: 'Roboto'; + font-weight: 700; color: #fff; + letter-spacing: 2px; } .site-nav { z-index: 1; .page-link, .page-link:visited { - font-family: 'Archivo Black'; + font-family: 'Roboto'; + font-weight: 500; + letter-spacing: 1px; color: #fff; @include media-query($on-palm) { @@ -47,13 +61,17 @@ body > header { } } -.outer-wrapper { - box-shadow: 5px 2px 15px -4px rgba(0, 0, 0, 0.2); +.page-content { + background: #fff; + padding-top: 0px; } -.page-content { - background: #efefef; - padding-top: 0px; +.outer-wrapper { + box-shadow: 5px 2px 15px -4px rgba(0, 0, 0, 0.1); +} + +.inner-wrapper { + border-left: 1px solid #ccc; } .page-content > .wrapper { @@ -61,6 +79,10 @@ body > header { background: #fff; } +.post-list h3 a { + font-size: 30px; +} + .post-content p { line-height: 2em; } @@ -72,12 +94,13 @@ img.profile { .sidebar { line-height: 1.3em; background: #ddd; + text-align: center; img.me { width: 140px; border-radius: 180px; display: block; - margin: 20px auto; + margin: 0px auto 30px auto; } a[href*=twitter] img { @@ -85,8 +108,35 @@ img.profile { display: block; margin: 25px auto; } + + p { + font-family: 'Roboto', sans-serif; + font-weight: 400; + font-size: 18px; + line-height: 1.5em; + + strong { + font-weight: 500; + } + } } -.share-buttons { +.share_buttons { line-height: 1em; + padding: 30px 0px 20px 0px !important; + + > p { + margin-bottom: 0px; + line-height: 1.5em; + } + + > ul { + margin-left: 0px; + margin-bottom: 0px; + + > li > a > div.button { + font-family: Roboto, Helvetica, Arial, sans-serif; + font-weight: 500; + } + } }