showoff 0.15.3 → 0.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1045e98280df58f247a2bd2cbfc6cfd8737edad
-  data.tar.gz: 6a2b723b8f401ce9807f27eb0b8b85e6022e5f0e
+  metadata.gz: e1365af2ab2a7098157389c2b50e549f2d142db0
+  data.tar.gz: 483b890328201a844ea2f69ae1f4123bfae6ecc2
 SHA512:
-  metadata.gz: db4bbe7b17021c6365a15cb3281022a642ae6d2c3fb82749a47a74958bbff4206b1e1b0d3d852989764428dfa259bf3ca360efed48d1efc608e49c98584cb5a8
-  data.tar.gz: 951a2673da40ab2cc7b39eebe4708f9646a3dbd040619aa9cffdd3dde0bad37af14ae1f922ae0b78588ebeaf9199ba7f0cd4209f67874d4916fec78c0601aaa7
+  metadata.gz: c65507cec293d851664342e4db7aae7e9d57dda4f47fb8ef132b3637f1454dd7ca47e33b267f33b579ab614818f31beab24415475dc5bcc78610bf5085a80883
+  data.tar.gz: 6f72ce0aa88793fe127dabb72c1373d0b0fd02b4371d672e773b2fa3fc4c5c1ffb84eb6c234e2be57c163efbc27589e06ec3203a2821d3334286e6d3aa7a776b

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.15.3'
+SHOWOFF_VERSION = '0.15.4'

data/lib/showoff.rb

@@ -424,6 +424,8 @@ class ShowOff < Sinatra::Application
         content += "<canvas class=\"annotations\"></canvas>\n"
         content += "</div>\n"
 
+        content = final_slide_fixup(content)
+
         final += update_commandline_code(content)
 
         if seq
@@ -523,6 +525,30 @@ class ShowOff < Sinatra::Application
       doc.to_html
     end
 
+    # TODO: damn, this one is bad. It's named generically so we can add to it if needed.
+    #
+    #       This method is intended to be the dumping ground for the slide fixups that we can't do in
+    #       other places until we get #615 implemented. Then this method should be refactored away.
+    #
+    def final_slide_fixup(text)
+      # Turn this into a document for munging
+      doc     = Nokogiri::HTML::DocumentFragment.parse(text)
+      slide   = doc.at_css 'div.slide'
+      content = doc.at_css 'div.content'
+
+      # move each notes section outside of the content div
+      doc.css('div.notes-section').each do |note|
+        content.add_next_sibling(note)
+      end
+
+      # this is a list of classes that we want applied *only* to content, and not to the slide,
+      # typically so that overly aggressive selectors don't match more than they should.
+      blacklist = ['bigtext']
+      slide['class'] = slide['class'].split.reject { |klass| blacklist.include? klass }.join(' ')
+
+      doc.to_html
+    end
+
     def process_content_for_all_slides(content, num_slides, opts={})
       content.gsub!("~~~NUM_SLIDES~~~", num_slides.to_s)
 

data/public/css/mermaid-6.0.0.css

@@ -0,0 +1,274 @@
+/* Flowchart variables */
+/* Sequence Diagram variables */
+/* Gantt chart variables */
+/* Updated with Showoff selector to reduce collisions! */
+.language-render-diagram .mermaid .label {
+  color: #333;
+}
+.language-render-diagram .node rect,
+.language-render-diagram .node circle,
+.language-render-diagram .node ellipse,
+.language-render-diagram .node polygon {
+  fill: #ECECFF;
+  stroke: #CCCCFF;
+  stroke-width: 1px;
+}
+.language-render-diagram .edgePath .path {
+  stroke: #333333;
+}
+.language-render-diagram .edgeLabel {
+  background-color: #e8e8e8;
+}
+.language-render-diagram .cluster rect {
+  fill: #ffffde !important;
+  rx: 4 !important;
+  stroke: #aaaa33 !important;
+  stroke-width: 1px !important;
+}
+.language-render-diagram .cluster text {
+  fill: #333;
+}
+.language-render-diagram .actor {
+  stroke: #CCCCFF;
+  fill: #ECECFF;
+}
+.language-render-diagram text.actor {
+  fill: black;
+  stroke: none;
+}
+.language-render-diagram .actor-line {
+  stroke: grey;
+}
+.language-render-diagram .messageLine0 {
+  stroke-width: 1.5;
+  stroke-dasharray: "2 2";
+  marker-end: "url(#arrowhead)";
+  stroke: #333;
+}
+.language-render-diagram .messageLine1 {
+  stroke-width: 1.5;
+  stroke-dasharray: "2 2";
+  stroke: #333;
+}
+.language-render-diagram #arrowhead {
+  fill: #333;
+}
+.language-render-diagram #crosshead path {
+  fill: #333 !important;
+  stroke: #333 !important;
+}
+.language-render-diagram .messageText {
+  fill: #333;
+  stroke: none;
+}
+.language-render-diagram .labelBox {
+  stroke: #CCCCFF;
+  fill: #ECECFF;
+}
+.language-render-diagram .labelText {
+  fill: black;
+  stroke: none;
+}
+.language-render-diagram .loopText {
+  fill: black;
+  stroke: none;
+}
+.language-render-diagram .loopLine {
+  stroke-width: 2;
+  stroke-dasharray: "2 2";
+  marker-end: "url(#arrowhead)";
+  stroke: #CCCCFF;
+}
+.language-render-diagram .note {
+  stroke: #aaaa33;
+  fill: #fff5ad;
+}
+.language-render-diagram .noteText {
+  fill: black;
+  stroke: none;
+  font-family: 'trebuchet ms', verdana, arial;
+  font-size: 14px;
+}
+/** Section styling */
+.language-render-diagram .section {
+  stroke: none;
+  opacity: 0.2;
+}
+.language-render-diagram .section0 {
+  fill: rgba(102, 102, 255, 0.49);
+}
+.language-render-diagram .section2 {
+  fill: #fff400;
+}
+.language-render-diagram .section1,
+.language-render-diagram .section3 {
+  fill: white;
+  opacity: 0.2;
+}
+.language-render-diagram .sectionTitle0 {
+  fill: #333;
+}
+.language-render-diagram .sectionTitle1 {
+  fill: #333;
+}
+.language-render-diagram .sectionTitle2 {
+  fill: #333;
+}
+.language-render-diagram .sectionTitle3 {
+  fill: #333;
+}
+.language-render-diagram .sectionTitle {
+  text-anchor: start;
+  font-size: 11px;
+  text-height: 14px;
+}
+/* Grid and axis */
+.language-render-diagram .grid .tick {
+  stroke: lightgrey;
+  opacity: 0.3;
+  shape-rendering: crispEdges;
+}
+.language-render-diagram .grid path {
+  stroke-width: 0;
+}
+/* Today line */
+.language-render-diagram .today {
+  fill: none;
+  stroke: red;
+  stroke-width: 2px;
+}
+/* Task styling */
+/* Default task */
+.language-render-diagram .task {
+  stroke-width: 2;
+}
+.language-render-diagram .taskText {
+  text-anchor: middle;
+  font-size: 11px;
+}
+.language-render-diagram .taskTextOutsideRight {
+  fill: black;
+  text-anchor: start;
+  font-size: 11px;
+}
+.language-render-diagram .taskTextOutsideLeft {
+  fill: black;
+  text-anchor: end;
+  font-size: 11px;
+}
+/* Specific task settings for the sections*/
+.language-render-diagram .taskText0,
+.language-render-diagram .taskText1,
+.language-render-diagram .taskText2,
+.language-render-diagram .taskText3 {
+  fill: white;
+}
+.language-render-diagram .task0,
+.language-render-diagram .task1,
+.language-render-diagram .task2,
+.language-render-diagram .task3 {
+  fill: #8a90dd;
+  stroke: #534fbc;
+}
+.language-render-diagram .taskTextOutside0,
+.language-render-diagram .taskTextOutside2 {
+  fill: black;
+}
+.language-render-diagram .taskTextOutside1,
+.language-render-diagram .taskTextOutside3 {
+  fill: black;
+}
+/* Active task */
+.language-render-diagram .active0,
+.language-render-diagram .active1,
+.language-render-diagram .active2,
+.language-render-diagram .active3 {
+  fill: #bfc7ff;
+  stroke: #534fbc;
+}
+.language-render-diagram .activeText0,
+.language-render-diagram .activeText1,
+.language-render-diagram .activeText2,
+.language-render-diagram .activeText3 {
+  fill: black !important;
+}
+/* Completed task */
+.language-render-diagram .done0,
+.language-render-diagram .done1,
+.language-render-diagram .done2,
+.language-render-diagram .done3 {
+  stroke: grey;
+  fill: lightgrey;
+  stroke-width: 2;
+}
+.language-render-diagram .doneText0,
+.language-render-diagram .doneText1,
+.language-render-diagram .doneText2,
+.language-render-diagram .doneText3 {
+  fill: black !important;
+}
+/* Tasks on the critical line */
+.language-render-diagram .crit0,
+.language-render-diagram .crit1,
+.language-render-diagram .crit2,
+.language-render-diagram .crit3 {
+  stroke: #ff8888;
+  fill: red;
+  stroke-width: 2;
+}
+.language-render-diagram .activeCrit0,
+.language-render-diagram .activeCrit1,
+.language-render-diagram .activeCrit2,
+.language-render-diagram .activeCrit3 {
+  stroke: #ff8888;
+  fill: #bfc7ff;
+  stroke-width: 2;
+}
+.language-render-diagram .doneCrit0,
+.language-render-diagram .doneCrit1,
+.language-render-diagram .doneCrit2,
+.language-render-diagram .doneCrit3 {
+  stroke: #ff8888;
+  fill: lightgrey;
+  stroke-width: 2;
+  cursor: pointer;
+  shape-rendering: crispEdges;
+}
+.language-render-diagram .doneCritText0,
+.language-render-diagram .doneCritText1,
+.language-render-diagram .doneCritText2,
+.language-render-diagram .doneCritText3 {
+  fill: black !important;
+}
+.language-render-diagram .activeCritText0,
+.language-render-diagram .activeCritText1,
+.language-render-diagram .activeCritText2,
+.language-render-diagram .activeCritText3 {
+  fill: black !important;
+}
+.language-render-diagram .titleText {
+  text-anchor: middle;
+  font-size: 18px;
+  fill: black;
+}
+/*
+
+
+*/
+.language-render-diagram .node text {
+  font-family: 'trebuchet ms', verdana, arial;
+  font-size: 14px;
+}
+.language-render-diagram div.mermaidTooltip {
+  position: absolute;
+  text-align: center;
+  max-width: 200px;
+  padding: 2px;
+  font-family: 'trebuchet ms', verdana, arial;
+  font-size: 12px;
+  background: #ffffde;
+  border: 1px solid #aaaa33;
+  border-radius: 2px;
+  pointer-events: none;
+  z-index: 100;
+}

data/public/css/showoff.css

@@ -620,6 +620,13 @@ pre.highlight code.language-powershellconsole.nochrome {
   overflow: hidden;
 }
 
+/* Diagram styling: overriding mermaid.css as needed */
+.language-render-diagram,
+.language-render-diagram .noteText,
+.language-render-diagram .node text,
+.language-render-diagram div.mermaidTooltip {
+  font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
+}
 
 
 /**********************************