From b278d7530eb99dbc29385fd0f8e616cea5e8f3f1 Mon Sep 17 00:00:00 2001 From: Aeris Date: Mon, 29 Aug 2016 21:47:16 +0200 Subject: [PATCH] Upgrade Middleman to v4 --- Gemfile | 8 +++----- source/{header.haml => _header.haml} | 0 source/{index.haml => index.html.haml} | 0 source/javascripts/{all.coffee => all.js.coffee} | 0 source/stylesheets/{all.scss => all.css.scss} | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) rename source/{header.haml => _header.haml} (100%) rename source/{index.haml => index.html.haml} (100%) rename source/javascripts/{all.coffee => all.js.coffee} (100%) rename source/stylesheets/{all.scss => all.css.scss} (98%) diff --git a/Gemfile b/Gemfile index 345de78..91ae1b5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,12 +1,10 @@ source 'https://rubygems.org' gem 'rake' -gem 'middleman', '~> 3.3.12' -gem 'middleman-livereload', '~> 3.4.3' +gem 'middleman', '~> 4.1.10' +gem 'middleman-livereload', '~> 3.4.6' gem 'therubyracer', require: false -gem 'bootstrap-sass', '~> 3', require: false -gem 'font-awesome-sass', '~> 4', require: false gem 'wdm', '~> 0.1.1', platforms: %i(mswin mingw), require: false -gem 'tzinfo-data', platforms: %i(mswin mingw jruby), require: false +gem 'tzinfo-data', '~> 1.2016.6', platforms: %i(mswin mingw jruby), require: false diff --git a/source/header.haml b/source/_header.haml similarity index 100% rename from source/header.haml rename to source/_header.haml diff --git a/source/index.haml b/source/index.html.haml similarity index 100% rename from source/index.haml rename to source/index.html.haml diff --git a/source/javascripts/all.coffee b/source/javascripts/all.js.coffee similarity index 100% rename from source/javascripts/all.coffee rename to source/javascripts/all.js.coffee diff --git a/source/stylesheets/all.scss b/source/stylesheets/all.css.scss similarity index 98% rename from source/stylesheets/all.scss rename to source/stylesheets/all.css.scss index 3becdd7..adf75b9 100644 --- a/source/stylesheets/all.scss +++ b/source/stylesheets/all.css.scss @@ -9,7 +9,7 @@ } html { - font-family: Arial, Helvetica, sans-serif; + font-family: Tahoma, "Helvetica Neue", Helvetica, Arial, sans-serif; } body {