updated middleman, jquery and bootstrap; placed message for domain ch…

…ange
Tafkas · Apr 10, 2014 · dad6b05 · dad6b05
1 parent bac38a3
commit dad6b05
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 47 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@
 # the following line to use "https"
 source 'http://rubygems.org'
 
-gem "middleman", "~>3.2.0"
+gem "middleman", "~>3.3.2"
 
 # Live-reloading plugin
 gem "middleman-livereload", "~> 3.1.0"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,97 +1,119 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.15)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    chunky_png (1.2.9)
+    activesupport (4.0.4)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    chunky_png (1.3.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
-    compass (0.12.2)
+    coffee-script-source (1.7.0)
+    compass (0.12.5)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
-      sass (~> 3.1)
+      sass (~> 3.2.19)
+    compass-import-once (1.0.4)
+      sass (>= 3.2, < 3.5)
     em-websocket (0.5.0)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.5.3)
+    erubis (2.7.0)
     eventmachine (1.0.3)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    execjs (2.0.2)
     ffi (1.9.3)
     fssm (0.2.10)
-    haml (4.0.4)
+    haml (4.0.5)
       tilt
     hike (1.2.3)
+    hooks (0.4.0)
+      uber (~> 0.0.4)
     http_parser.rb (0.5.3)
-    i18n (0.6.5)
-    kramdown (1.2.0)
+    i18n (0.6.9)
+    json (1.8.1)
+    kramdown (1.3.3)
     listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    middleman (3.2.0)
+    middleman (3.3.2)
       coffee-script (~> 2.2.0)
-      compass (>= 0.12.2)
-      execjs (~> 1.4.0)
-      haml (>= 3.1.6)
+      compass (>= 0.12.4)
+      compass-import-once (~> 1.0.4)
+      execjs (~> 2.0)
+      haml (>= 4.0.5)
       kramdown (~> 1.2)
-      middleman-core (= 3.2.0)
+      middleman-core (= 3.3.2)
       middleman-sprockets (>= 3.1.2)
-      sass (>= 3.1.20)
-      uglifier (~> 2.1.0)
-    middleman-core (3.2.0)
-      activesupport (~> 3.2.6)
+      sass (>= 3.2.17, < 4.0)
+      uglifier (~> 2.5)
+    middleman-core (3.3.2)
+      activesupport (~> 4.0.1)
       bundler (~> 1.1)
-      i18n (~> 0.6.1)
+      erubis
+      hooks (~> 0.3)
+      i18n (~> 0.6.9)
       listen (~> 1.1)
-      rack (>= 1.4.5)
-      rack-test (~> 0.6.1)
+      padrino-helpers (~> 0.12.1)
+      rack (>= 1.4.5, < 2.0)
+      rack-test (~> 0.6.2)
       thor (>= 0.15.2, < 2.0)
-      tilt (~> 1.3.6)
-    middleman-livereload (3.1.0)
+      tilt (~> 1.4.1, < 2.0)
+    middleman-livereload (3.1.1)
       em-websocket (>= 0.2.0)
       middleman-core (>= 3.0.2)
       multi_json (~> 1.0)
       rack-livereload
-    middleman-sprockets (3.2.0)
-      middleman-core (~> 3.2)
-      sprockets (~> 2.1)
-      sprockets-helpers (~> 1.0.0)
+    middleman-sprockets (3.3.2)
+      middleman-core (>= 3.2)
+      sprockets (~> 2.2)
+      sprockets-helpers (~> 1.1.0)
       sprockets-sass (~> 1.0.0)
-    multi_json (1.8.2)
+    minitest (4.7.5)
+    multi_json (1.9.2)
+    padrino-helpers (0.12.1)
+      i18n (~> 0.6, >= 0.6.7)
+      padrino-support (= 0.12.1)
+      tilt (~> 1.4.1)
+    padrino-support (0.12.1)
+      activesupport (>= 3.1)
     rack (1.5.2)
     rack-livereload (0.3.15)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
+    rb-kqueue (0.2.2)
       ffi (>= 0.5.0)
-    sass (3.2.12)
-    sprockets (2.10.0)
+    sass (3.2.19)
+    sprockets (2.12.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-helpers (1.0.1)
+    sprockets-helpers (1.1.0)
       sprockets (~> 2.0)
-    sprockets-sass (1.0.2)
+    sprockets-sass (1.0.3)
       sprockets (~> 2.0)
       tilt (~> 1.1)
-    thor (0.18.1)
-    tilt (1.3.7)
-    uglifier (2.1.2)
+    thor (0.19.1)
+    thread_safe (0.3.3)
+    tilt (1.4.1)
+    tzinfo (0.3.39)
+    uber (0.0.4)
+    uglifier (2.5.0)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+      json (>= 1.8.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  middleman (~> 3.2.0)
+  middleman (~> 3.3.2)
   middleman-livereload (~> 3.1.0)
   wdm (~> 0.1.0)
diff --git a/source/_footer.html.erb b/source/_footer.html.erb
@@ -3,7 +3,7 @@
     <p class="text-muted credit"><a href="http://blog.tafkas.net">© Tafkas</a></p>
   </div>
 </div>
-<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/highcharts/2.3.5/highcharts.js"></script>
 <%= javascript_include_tag  "all", "main", "chart" %>
 <script type="text/javascript">

diff --git a/source/index.html.erb b/source/index.html.erb
@@ -2,6 +2,7 @@
 title: Tafkas RaspberryPi
 ---
 <div class="page-header">
+    <h2 class="bg-danger">DynDNS is shutting down its free plans. <br/> This website is moving to the domain <a href="http://pi.tafkas.net">http://pi.tafkas.net</a></h2>
   <div class="jumbotron">
     <h1>My Raspberry Pi</h1>
     <p>Here are some or my personal projects that run on this Raspberry Pi</p>

diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
@@ -8,8 +8,8 @@
 
     <!-- Use title if it's in the page YAML frontmatter -->
     <title><%= current_page.data.title || "The Middleman" %></title>
-    <link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.0.2/css/bootstrap.min.css" rel="stylesheet">
-    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.0.2/js/bootstrap.min.js"></script>
+    <link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.1.1/js/bootstrap.min.js"></script>
     <%= stylesheet_link_tag "custom", "sticky-footer-navbar" %>
     <%= javascript_include_tag  "all" %>
   </head>

diff --git a/source/temperatures/index.html.erb b/source/temperatures/index.html.erb
@@ -3,6 +3,7 @@ title: Temperatures - Tafkas' RaspberryPi'
 ---
 <div class="page-header">
 <h1>Home Temperatures</h1>
+<h2 class="bg-danger">DynDNS is shutting down its free plans. <br/> This website is moving to the domain <a href="http://pi.tafkas.net">http://pi.tafkas.net</a></h2>
 </div>
 <div class="row">
   <div class="col-md-2">