From 6cac66a38987296ca9790f2d1101c2436a834f50 Mon Sep 17 00:00:00 2001 From: Kyle Hodgetts Date: Sun, 20 Nov 2016 21:24:27 +0000 Subject: [PATCH 1/2] Removed style rules out of HTML head and into styles file. Increased font size to 18px. Looks good on all devices. Created a partial file called variables to store global variables in (good practice) --- _layouts/page.html | 6 +----- css/partials/_variables.sass | 1 + css/styles.sass | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 css/partials/_variables.sass diff --git a/_layouts/page.html b/_layouts/page.html index 6a0807c..8fe84ae 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -62,10 +62,6 @@ - - \ No newline at end of file + diff --git a/css/partials/_variables.sass b/css/partials/_variables.sass new file mode 100644 index 0000000..1c22751 --- /dev/null +++ b/css/partials/_variables.sass @@ -0,0 +1 @@ +$font-size: 18px diff --git a/css/styles.sass b/css/styles.sass index 245e863..eaca2c5 100644 --- a/css/styles.sass +++ b/css/styles.sass @@ -1,5 +1,18 @@ --- --- +@import 'variables' + +body + padding-top: 70px + font-size: $font-size + +#share-buttons img + width: 35px + padding: 5px + border: 0 + box-shadow: 0 + display: inline + // begin .navbar-form @@ -20,3 +33,7 @@ padding: 1em body padding-top: 132px !important + +@media screen and (min-width:600px) + p a td + font-size: $font-size From fcc0d18d007d0fae258eddcde6eea395bcbda7a3 Mon Sep 17 00:00:00 2001 From: Kyle Hodgetts Date: Sun, 20 Nov 2016 21:25:03 +0000 Subject: [PATCH 2/2] Added sass partials dir to Jekyll config to allow for import statements --- Gemfile.lock | 9 +++++---- _config.yml | 6 +++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2392cbe..febc13b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,18 +29,19 @@ GEM safe_yaml (~> 1.0) jekyll-feed (0.8.0) jekyll (~> 3.3) - jekyll-sass-converter (1.4.0) + jekyll-sass-converter (1.5.0) sass (~> 3.4) jekyll-watch (1.5.0) listen (~> 3.0, < 3.1) json (2.0.2) - kramdown (1.12.0) + kramdown (1.13.0) liquid (3.0.6) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) mercenary (0.3.6) - minima (2.0.0) + minima (2.1.0) + jekyll (~> 3.3) multi_css (0.1.0) css_press multi_js (0.1.0) @@ -74,7 +75,7 @@ DEPENDENCIES octopress-minify-html RUBY VERSION - ruby 2.2.3p173 + ruby 2.2.1p85 BUNDLED WITH 1.13.6 diff --git a/_config.yml b/_config.yml index b1249e5..326e5b8 100644 --- a/_config.yml +++ b/_config.yml @@ -27,6 +27,10 @@ markdown: kramdown theme: minima gems: - jekyll-feed + +sass: + sass_dir: css/partials + exclude: - Gemfile - Gemfile.lock @@ -34,4 +38,4 @@ exclude: # Be sure to exclude vendor from your _config.yml # Travis bundles all gems in the vendor directory on its build servers, which Jekyll will mistakenly read and explode on. -# https://jekyllrb.com/docs/continuous-integration/ \ No newline at end of file +# https://jekyllrb.com/docs/continuous-integration/