From: Ben Beltran <redacted>
Date: Mon, 2 Jul 2018 20:55:01 +0000 (-0500)
Subject: Merge branch 'hotfix/3.0.0' into develop
X-Git-Url: https://git.r.bdr.sh/rbdr/r.bdr.sh/commitdiff_plain/70ae85b7dcfbf34419d516132d4fab0e84d99ad2?hp=d95867614fba963a22ae1dda1aa45dfe92ea6886

Merge branch 'hotfix/3.0.0' into develop
---

diff --git a/Gemfile b/Gemfile
index 66ddc69..b5bb5c1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,5 @@
 source :rubygems
 
 #Blog stuff
-gem 'thin'
 gem 'jekyll'
-gem 'rack-jekyll'
 gem 'rdiscount'
diff --git a/Gemfile.lock b/Gemfile.lock
index b0d38b4..f43aa4e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,65 +1,65 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    blankslate (2.1.2.4)
-    classifier (1.3.4)
-      fast-stemmer (>= 1.0.0)
-    colorator (0.1)
-    commander (4.1.6)
-      highline (~> 1.6.11)
-    daemons (1.1.9)
-    eventmachine (1.0.7)
-    fast-stemmer (1.0.2)
-    ffi (1.9.6)
-    highline (1.6.21)
-    jekyll (1.5.1)
-      classifier (~> 1.3)
-      colorator (~> 0.1)
-      commander (~> 4.1.3)
-      liquid (~> 2.5.5)
-      listen (~> 1.3)
-      maruku (= 0.7.0)
-      pygments.rb (~> 0.5.0)
-      redcarpet (~> 2.3.0)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    colorator (1.1.0)
+    concurrent-ruby (1.0.5)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    eventmachine (1.2.7)
+    ffi (1.9.25)
+    forwardable-extended (2.6.0)
+    http_parser.rb (0.6.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    jekyll (3.8.3)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 0.7)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 1.14)
+      liquid (~> 4.0)
+      mercenary (~> 0.3.3)
+      pathutil (~> 0.9)
+      rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-      toml (~> 0.1.0)
-    liquid (2.5.5)
-    listen (1.3.1)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    maruku (0.7.0)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
-    posix-spawn (0.3.9)
-    pygments.rb (0.5.4)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
-    rack (1.5.2)
-    rack-jekyll (0.4.1)
-      jekyll (>= 0.12.0, < 2.0)
-      rack (~> 1.5.0)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.3)
-      ffi (>= 0.5.0)
-    rdiscount (2.1.8)
-    redcarpet (2.3.0)
+    jekyll-sass-converter (1.5.2)
+      sass (~> 3.4)
+    jekyll-watch (2.0.0)
+      listen (~> 3.0)
+    kramdown (1.17.0)
+    liquid (4.0.0)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    mercenary (0.3.6)
+    pathutil (0.16.1)
+      forwardable-extended (~> 2.6)
+    public_suffix (3.0.2)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rdiscount (2.2.0.1)
+    rouge (3.1.1)
+    ruby_dep (1.5.0)
     safe_yaml (1.0.4)
-    thin (1.6.3)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
-      rack (~> 1.0)
-    toml (0.1.2)
-      parslet (~> 1.5.0)
-    yajl-ruby (1.1.0)
+    sass (3.5.6)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   jekyll
-  rack-jekyll
   rdiscount
-  thin
+
+BUNDLED WITH
+   1.16.2
diff --git a/jekyll/_layouts/default.html b/jekyll/_layouts/default.html
index c411f9a..872abc2 100644
--- a/jekyll/_layouts/default.html
+++ b/jekyll/_layouts/default.html
@@ -6,7 +6,6 @@
     <meta charset="utf-8" />
     <meta name="author" content="Rubén Beltrán del Río" />
     <meta name="description" content="{{ page.description }}" />
-    <link href='https://fonts.googleapis.com/css?family=VT323' rel='stylesheet' type='text/css'>
     <link rel="stylesheet" type="text/css" href="/css/application.css" />
     <title>Unlimited &#127829; {{ page.title }}</title>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
@@ -30,7 +29,6 @@
                 * Tomato Sauce: Random Telnet Renderer
     -->
     <script src="js/unlimited_pizza.js"></script>
-    <script src="js/unlimited_pizza/melty_cheese.js"></script>
     <script src="js/unlimited_pizza/pepperoni.js"></script>
     <script type="text/javascript">
 
@@ -53,9 +51,9 @@
     </script>
 </head>
   <body>
-    <header>
-      <a class="logo" href="/"><span>N, S o Vocal</span></a>
-    </header>
+    <h1>
+      <a class="logo" href="/">Unlimited 🍕  Pizza</a>
+    </h1>
     <div class="main-container">
       <section>
         {{ content }}
diff --git a/jekyll/css/application.css b/jekyll/css/application.css
index ce03fd5..f5cee80 100644
--- a/jekyll/css/application.css
+++ b/jekyll/css/application.css
@@ -1,17 +1,18 @@
 body {
-  background-color: #fff;
-  font-family: 'VT323', monospace;
+  background-color: white;
+  font-family: times, 'Times New Roman', serif;
+  font-smooth: never;
+  -webkit-font-smoothing: none;
 }
-a.logo {
-  display: block;
-  margin: 20px;
-  background-size: 100% 100%;
-  height: 80px;
-  width: 720px;
-  background-image: url(/img/unlimited-pizza-animated-logo.gif);
+
+h1 a {
+  color: black;
+}
+
+h1 a:visited {
+  color: black;
 }
 
-a.logo span {display:none}
 em {color:#99a3a4}
 
 .main-container {
@@ -21,31 +22,32 @@ em {color:#99a3a4}
 h1,
 h2,
 h3 {
-  text-transform: uppercase;
   font-weight: 300;
 }
 
-h1{
-  font-size: 72px;
-  line-height: 81px;
+h1 {
+  font-size: 3.33em;
+}
+
+h2 {
+  font-size: 1.61em;
 }
 
 a {
-  color: #00dddd;
+  color: blue;
 }
 
-.content {
-  margin: 20px;
-  font-size: 24px;
+a:visited {
+  color: purple;
 }
 
 ul {
   list-style: square;
 }
 
-.main-container section,
-.main-container aside{ text-align: left}
-
+li {
+  line-height: 1.82em;
+}
 
 /* Guestbook */
 .guestbook-feed, .guestbook-form ul {
@@ -54,32 +56,15 @@ ul {
 
 .guestbook-form li {
   display: block;
+  max-width: 28em;
 }
 
 .guestbook-form .guestbook-label {
-  width: 8.571em;
-  float: left;
-  text-align: right;
-  padding: 0.5em  1.071em;
   text-transform: uppercase;
-}
-
-.guestbook-form .guestbook-control {
-  float: left;
-}
-
-.guestbook-form .guestbook-control-group {
-  clear: both;
-}
-
-.guestbook-form .comment-control {
-  width: 42.857em;
-  height: 10em;
-}
-
-.guestbook-content, .guestbook-form {
-  clear: both;
-  padding: 2.142em 0;
+  text-align: center;
+  max-width: 28em;
+  width: 100%;
+  text-style: italic;
 }
 
 .guestbook-feed .guestbook-post {
@@ -88,104 +73,85 @@ ul {
   padding: 1.071em;
 }
 
-.guestbook-post .author {
-  font-weight: bold;
-}
-
 /*
  * The Recorder CSS
  */
-.pepperoni-widget {
-  justify-content: space-between;
-  display: flex;
-}
 
+.pepperoni-widget .record-clear,
 .pepperoni-widget .record-button {
-  display: flex;
-  font-size: 1.538461em;
-  padding: 15px 20px 30px;
-  margin: 1em;
-  height: 1em;
-  background-color: #f1f1f1;
+  margin: 1em 0;
+  padding: 1em 0;
+  background-color: blue;
+  color: white;
   cursor: pointer;
   transition: background-color 0.2s ease, color 0.2s ease;
-}
-
-.record-info {
-  margin: 1em 0;
+  display: block;
+  text-align: center;
 }
 
 .pepperoni-widget .record-button.recording {
-  background-color: #ff00ff;
+  background-color: magenta;
   color: white;
-  padding: 20px 25px 25px 15px
 }
 
+.guestbook-submit:hover,
+.pepperoni-widget .record-clear:hover,
 .pepperoni-widget .record-button:hover {
-  text-decoration: none;
-  background-color: #fafafa;
-}
-
-.pepperoni-widget .record-button.recording:hover {
-  background-color: #ff00ff;
-  color: #f1f1f1;
-}
-
-.pepperoni-widget .record-progress {
-  justify-content: space-between;
-  display: flex;
-  margin: 0.5em 0.76em;
+  background-color: red;
 }
 
 .record-progress-bar-container {
   background-color: #f1f1f1;
-  height: 2em;
-  width: 15.385em;
-  margin-right: 0.76em;
+  height: 4em;
 }
 
 .record-progress-bar {
-  height: 2em;
-  background-color: #d30058;
+  height: 4em;
+  background-color: cyan;
   width: 0;
 }
 
-.record-clear {
-  margin-top: 0.1em;
-  text-transform: uppercase;
-  font-size: 1em;
-  width: 4em;
-  cursor: pointer;
-}
-
 .record-clear:hover {
   text-decoration: none;
 }
 
 .record-preview {
-  margin: 0.76em;
-  width: 15.385em;
-  height: 2em;
+  max-width: 28em;
+  width: 100%;
+  height: 4em;
+  display: block;
+}
+
+.guestbook-control input {
+  width: 100%;
+  font-family: times, 'Times New Roman', serif;
 }
 
 .guestbook-submit {
-  border-radius: 0;
+  background-color: magenta;
+  color: white;
+  display: block;
+  height: 4em;
+  font-size: 1em;
+  max-width: 28em;
+  padding: 0;
   border: 0;
-  background-color: #ff00ff;
-  font-family: 'VT323', monospace;
-  font-size: 24px;
-  color: #fff;
-  padding: 10px;
-  margin-left: 15px;
+  cursor: pointer;
 }
 
-.filter-switches label {
-  display: inline;
-  margin-right: 2em;
+.name-control {
+  max-width: 27.5em;
+  padding: 0.2em;
+  font-size: 1em;
+  display: block;
 }
 
-.guestbook-control input {
-  font-family: 'VT323', monospace;
-  padding: 10px;
-  font-size: 24px;
+.filter-switches {
+  padding: 1em 0;
+}
+
+.filter-switches input {
+  display: inline;
+  width: auto;
+  margin-left: 1em;
 }
diff --git a/jekyll/guestbook.html b/jekyll/guestbook.html
index 69cbd3f..1d67a02 100644
--- a/jekyll/guestbook.html
+++ b/jekyll/guestbook.html
@@ -5,8 +5,8 @@ description: "Audio Guestbook"
 ---
 
 <div class="content">
+  <h2>Audio Guestbook</h2>
   <div class="guestbook-form">
-    <h1>Audio Guestbook</h1>
     <p>
     Record, change effects, leave a nice message, give yourself memos for the
     future, hide riddles, broadcast spells.
@@ -14,7 +14,7 @@ description: "Audio Guestbook"
     <form method="post">
       <ul>
           <div class="guestbook-control-group">
-            <li class="guestbook-label"><label for="name-control">Nombre / Name</label></li>
+            <li class="guestbook-label"><label for="name-control">Name</label></li>
             <li class="guestbook-control"><input name="name" class="name-control" id="name-control" /></li>
           </div>
           <div class="guestbook-control-group">
@@ -28,7 +28,7 @@ description: "Audio Guestbook"
   </div>
   <p><a href="/index.html">Back to /index.html</a>
   <div class="guestbook-content">
-    <h1>CLIPS</h1>
+    <h2>Clips</h2>
     <ul class="guestbook-feed">
     </ul>
   </div>
diff --git a/jekyll/index.html b/jekyll/index.html
index 8912a7f..8da8a45 100644
--- a/jekyll/index.html
+++ b/jekyll/index.html
@@ -4,7 +4,7 @@ title: /index.html
 description: "unlimited.pizza - ruben beltran del río surfs the internet: programming, music, fun times, hugs, bad jokes, and unlimited pizza"
 ---
 <div class="content">
-  <h1> Projects</h1>
+  <h2> Projects</h2>
 
   <ul>
     <li>
@@ -61,7 +61,7 @@ description: "unlimited.pizza - ruben beltran del río surfs the internet: progr
     </li>
   </ul>
 
-  <h1>Even more stuff.</h1>
+  <h2>Even more stuff.</h2>
 
   <p><img src="/img/selfie.gif" alt="An image of @pigeonfolk."/></p>
 
diff --git a/jekyll/js/unlimited_pizza/pepperoni.js b/jekyll/js/unlimited_pizza/pepperoni.js
index c20f285..12dca9d 100644
--- a/jekyll/js/unlimited_pizza/pepperoni.js
+++ b/jekyll/js/unlimited_pizza/pepperoni.js
@@ -2,13 +2,13 @@
 
 Class(UnlimitedPizza, "Pepperoni").inherits(Widget)({
   INNER_HTML : ' \
-<a class="record-button">&#11044</a> \
+<a class="record-button">Record.</a> \
 <div class="record-info"> \
   <div class="record-progress"> \
     <div class="record-progress-bar-container"> \
       <div class="record-progress-bar"></div> \
     </div> \
-    <a class="record-clear">X</a> \
+    <a class="record-clear">Clear recording.</a> \
   </div> \
   <audio class="record-preview" controls></audio> \
   <div class="filter-switches"> \
@@ -20,8 +20,8 @@ Class(UnlimitedPizza, "Pepperoni").inherits(Widget)({
   </div> \
 </div> \
   ',
-  PAUSE : '&#9616;&#9616;',
-  RECORD : '&#11044;',
+  PAUSE : 'Pause.',
+  RECORD : 'Record.',
   prototype : {
     maxSize : 1048576,
     recording : false,