Merge branch 'master' of github.com:NUKnightLab/TimelineJS3

EGANY-Team · Sep 29, 2015 · 0ca53e1 · 0ca53e1
2 parents 02f3cbd + 51dabc1
commit 0ca53e1
Show file tree

Hide file tree

Showing 34 changed files with 510 additions and 215 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -0,0 +1,3 @@
+3.3.2 (2015-09-23)
+------
+This version of Timeline officially replaces the previous one.
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 #TimelineJS3
 ============
 
-TimelineJS v3: A Storytelling Timeline built in JavaScript.  http://timeline3.knightlab.com
+TimelineJS v3: A Storytelling Timeline built in JavaScript.  http://timeline.knightlab.com
 
 ## Overview
 
-TimelineJS 3 is a rewrite of the popular Timeline JS software. It will eventually replace that software, but it is currently in development and testing. Please be clear that this is software which "does" the same thing, but it isn't the same software, so some details will vary. See http://timeline3.knightlab.com for more information.
+TimelineJS 3 is a rewrite of the popular Timeline JS software. Please be clear that this is software which "does" the same thing, but it isn't the same software, so some details will vary. See http://timeline.knightlab.com for more information.
 
 ## Getting Started
 Include CSS file(s) in the head of your page.

diff --git a/compiled/css/fonts/font.bevan-pontanosans.css b/compiled/css/fonts/font.bevan-pontanosans.css
diff --git a/compiled/css/themes/timeline.theme.dark.css b/compiled/css/themes/timeline.theme.dark.css
diff --git a/compiled/css/timeline.css b/compiled/css/timeline.css
diff --git a/compiled/examples/google_spreadsheet.html b/compiled/examples/google_spreadsheet.html
@@ -35,8 +35,11 @@
     <!-- JavaScript-->
     <script src="../js/timeline.js"></script>
     <script>
-      var timeline = new TL.Timeline('timeline', '1cWqQBZCkX9GpzFtxCWHoqFXCHg-ylTVUWlnrdYMzKUI', {
+      //1cWqQBZCkX9GpzFtxCWHoqFXCHg-ylTVUWlnrdYMzKUI
+      //https://docs.google.com/spreadsheets/d/1OQCXIQoeMUbeIE3KdKijQhFvgit37m6Sy6S07gAE6fU/pubhtml
+      var timeline = new TL.Timeline('timeline', '1OQCXIQoeMUbeIE3KdKijQhFvgit37m6Sy6S07gAE6fU', {
       	ga_property_id: "UA-27829802-4",
+      	debug:true,
       	is_embed:true
       });
     </script>

diff --git a/compiled/examples/mark_twain.html b/compiled/examples/mark_twain.html
@@ -10,7 +10,7 @@
     <!-- CSS-->
     <link rel="stylesheet" href="../css/timeline.css?v1">
     <!--FONT-->
-    <link rel="stylesheet" href="../css/fonts/font.default.css?v1">
+    <link rel="stylesheet" href="../css/fonts/font.bevan-potanosans.css?v1">
     <!-- Style-->
     <style>
       html, body {

diff --git a/compiled/examples/marktwain_juked.json b/compiled/examples/marktwain_juked.json
@@ -2,7 +2,7 @@
     "title": {
             "text": {
                 "headline": "Mark Twain JSON",
-                "text":     "Samuel Langhorne Clemens (November 30, 1835 – April 21, 1910),[1] better known by his pen name Mark Twain, was an American author and humorist."
+                "text":     "Samuel Langhorne Clemens (November 30, 1835 – April 21, 1910),[1] better known by his pen name Mark Twain, was an American author and humorist.<span class='tl-note'>This is a title slide</span>"
             },
             "media": {
                 "url": "https://en.wikipedia.org/wiki/Mark_Twain",

diff --git a/compiled/js/library/moment.js b/compiled/js/library/moment.js
diff --git a/compiled/js/timeline-embed-cdn.js b/compiled/js/timeline-embed-cdn.js
@@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-09-18-15-26-18 - 2015-09-18
+    TimelineJS - ver. 3.3.2 - 2015-09-23
     Copyright (c) 2012-2015 Northwestern University
     a project of the Northwestern University Knight Lab, originally created by Zach Wise
     https://github.com/NUKnightLab/TimelineJS3

diff --git a/compiled/js/timeline-embed.js b/compiled/js/timeline-embed.js
@@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-09-18-15-26-18 - 2015-09-18
+    TimelineJS - ver. 3.3.2 - 2015-09-23
     Copyright (c) 2012-2015 Northwestern University
     a project of the Northwestern University Knight Lab, originally created by Zach Wise
     https://github.com/NUKnightLab/TimelineJS3

diff --git a/compiled/js/timeline-min.js b/compiled/js/timeline-min.js