showoff 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adcfd9d5011c040a280a60fd5087b939583949ce
-  data.tar.gz: 2b912728780a73bfc3c290ce0f8571f019b48da8
+  metadata.gz: ef6abad0c121f10cf72c52574b55becd5a96bbb2
+  data.tar.gz: 5f0b3645d70f14ce2bd52b7b12795e5f7a9f8257
 SHA512:
-  metadata.gz: 5343aac662c6221e1b3658dd4a47437a1ae4a3b372e35e2dd9915f5e61feaad45669dc4155e303947090cfdb3040a18e246eb186fb054117f924328d4e7a481b
-  data.tar.gz: bc0ae7e4ad3ce12dcb3f511512bcbb5be2fc59e0fe7241baba52b3c21cdb68ece6d50355a82c0e3c740cff9b2a027659d1adc1b2781911427680997441d46854
+  metadata.gz: 38a5a8e750d7b51a7a57c9a1af3a7298c06af179ad537c908541481714bd8bd1ccf7bcf0ab52d58dcaaca2957ec5e4f64a40950dfd4c7dbd5cc48d80da87da85
+  data.tar.gz: 754e19b73fa586e817e480f7da8fcdb6788f38237076079570f4aaf861a6a2eb371ea6a4d2921c11a8d8962b6f905b3c11eacb23ec04a141f15d05b653c33184

data/lib/showoff/version.rb

@@ -1,3 +1,3 @@
 # No namespace here since ShowOff is a class and I'd have to inherit from
 # Sinatra::Application (which we don't want to load here)
-SHOWOFF_VERSION = '0.14.1'
+SHOWOFF_VERSION = '0.14.2'

data/public/css/presenter.css

@@ -217,6 +217,7 @@
     -webkit-order: 1;
             order: 1;
     min-width: 0px;
+    justify-content: space-between;
   }
     #frame {
       display: -webkit-flex;
@@ -225,6 +226,7 @@
               flex-flow: row;
       -webkit-flex: 10;
               flex: 10;
+      max-height: 95%;  /* dear Firefox; what's the point of flex-box if we still have to do this crap? */
     }
 
     #preview {
@@ -268,6 +270,7 @@
       -webkit-flex: 0.5;
               flex: 0.5;
       height: 22px;
+      max-height: 22px;
       line-height: 22px;
       text-transform: uppercase;
       vertical-align: middle;

data/public/css/showoff.css

@@ -574,7 +574,8 @@ img#disconnected {
 }
 
 /* Add Console "code highlighting" styles to resemble the look of a terminal window. */
-pre.highlight code.language-console {
+pre.highlight code.language-console,
+pre.highlight code.console {
   background: #222;
   background: url(titlebar/left.png) left top no-repeat, url(titlebar/right.png) right top no-repeat, url(titlebar/center.png) center top repeat-x #222;
   color: #63de00;
@@ -587,7 +588,8 @@ pre.highlight code.language-console {
   overflow: hidden;
 }
 
-pre.highlight code.language-powershellconsole {
+pre.highlight code.language-powershellconsole,
+pre.highlight code.powershellconsole {
   background: rgb(1, 36, 86);
   background: url(titlebar/powershell-controls.png) right top no-repeat, url(titlebar/powershell.png) left top repeat-x rgb(1, 36, 86);
   color: rgb(238, 237, 240);
@@ -927,6 +929,25 @@ form .element {
 ***  end callouts   ***
 **********************/
 
+/* Render hidden headlines so that when we print with wkhtmltopdf, we can use section
+   titles for page headers.  it would make sense to put this in the print section, but
+   then you get a weird double headline when previewing a print in the browser. */
+
+/* make this invisible as possible, while still rendering so that wkhtmltopdf doesn't ignore it */
+h1.section_title {
+  color: transparent !important;
+  opacity: 0 !important;
+  font-size: 0 !important;
+  margin: 0 !important;
+  padding: 0 !important;
+}
+
+/* because the above section headers are h1 elements rendered only in print */
+.content:not(.cover) h1:not(.section_title) {
+  border-bottom: 2px solid #222;
+}
+
+/**** end hidden headlines ****/
 
 /* Tiny mobile devices. Larger devices scale automatically. */
 @media screen and (max-width: 320px)
@@ -991,20 +1012,6 @@ form .element {
     height: 100% !important; /* because otherwise handout notes are cutoff by the inline height set on the slide */
   }
 
-  /* make this invisible as possible, while still rendering so that wkhtmltopdf doesn't ignore it */
-  h1.section_title {
-    color: transparent !important;
-    opacity: 0 !important;
-    font-size: 0 !important;
-    margin: 0 !important;
-    padding: 0 !important;
-  }
-
-  /* because the above section headers are h1 elements rendered only in print */
-  .content:not(.cover) h1:not(.section_title) {
-    border-bottom: 2px solid #222;
-  }
-
   /* prevent large images from running off the page */
   .content img {
     max-width: 7in;

data/public/js/presenter.js

@@ -711,8 +711,10 @@ function toggleAnnotations()
 
   if(mode.annotations) {
     $('#annotationToolbar').show();
-    currentSlide.find('canvas.annotations').annotate(annotations);
     $('canvas.annotations').show();
+    if (typeof(currentSlide) != 'undefined') {
+      currentSlide.find('canvas.annotations').annotate(annotations);
+    }
   }
   else {
     $('#annotationToolbar').hide();

data/public/js/showoff.js

@@ -179,16 +179,21 @@ function zoom(presenter) {
   var wBody  = parseFloat(preso.parent().width());
 
   var newZoom = Math.min(hBody/hSlide, wBody/wSlide);
+
   // Because Firefox's transform doesn't scale up very well
   newZoom = newZoom > 1 ? 1 : newZoom - .04;
 
+  // Calculate the new offsets to roughly center the preview again
+  var hPos = (hBody - (hSlide * newZoom)) / 2;
+  var wPos = (wBody - (wSlide * newZoom)) / 2;
+
   preso.css("zoom", newZoom);
   preso.css("-ms-zoom", newZoom);
   preso.css("-webkit-zoom", newZoom);
   // Firefox doesn't support zoom
   // Don't use standard transform to avoid modifying Chrome
-  preso.css("-moz-transform", "scale(" + newZoom + ")");
-  preso.css("-moz-transform-origin", "0 0 0");
+  preso.css("-moz-transform", "scale(" + newZoom + ") translateX(" + wPos + "px) translateY(" + hPos + "px)");
+  preso.css("-moz-transform-origin", "0 0");
 
   // correct the zoom factor for the presenter
   if (presenter) {

data/views/presenter.erb

@@ -104,13 +104,13 @@
         </span>
         <div id="debugInfo"></div>
         <span id="enableRemote" title="Enables tracking of other presenters.">
-          <label for="remoteToggle">Enable Remote</label><input type="checkbox" id="remoteToggle" checked />
+          <label for="remoteToggle">Enable Remote</label><input type="checkbox" id="remoteToggle" autocomplete="off" checked />
         </span>
         <span id="enableFollower" title="Send slide change notifications.">
-          <label for="followerToggle">Update Follower</label><input type="checkbox" id="followerToggle" checked />
+          <label for="followerToggle">Update Follower</label><input type="checkbox" id="followerToggle" autocomplete="off" checked />
         </span>
         <span id="enableAnnotations" title="Enable the annotation system.">
-          <label for="annotationsToggle">Annotations</label><input type="checkbox" id="annotationsToggle" />
+          <label for="annotationsToggle">Annotations</label><input type="checkbox" id="annotationsToggle" autocomplete="off" />
         </span>
 
       </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: showoff
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2
 platform: ruby
 authors:
 - Scott Chacon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -342,29 +342,7 @@ homepage: https://puppetlabs.github.io/showoff
 licenses:
 - MIT
 metadata: {}
-post_install_message: |2+
-                 _________________________________________
-                /               Ahoy ahead!               \
-               |      Style changes in this release.       |
-               |                                           |
-                \    Please clear your browser cache.     /
-                 -----------------------------------------
-                        \   ^__^
-                         \  (oo)\_______
-                            (__)\       )\/\
-                                ||----w |
-                                ||     ||
-
-    ************************************************************************
-    The default styles have been significantly improved. Unfortunately, this
-    means that if you've created your own custom styles, that you'll need to
-    refactor them. We do hope you find the new styles simpler and better looking.
-
-    Showoff can optionally use the PDFKit gem to build PDF files using the
-    `showoff pdf` command. If you'd like your audience to download the PDF,
-    place it in `_files/share`.
-    ************************************************************************
-
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib