Merge branch 'develop' into main

CHANGELOG.md

@@ -1,6 +1,12 @@
 Change Logs
 ---
 
+### v2.1.3 (November 28, 2020 GMT)
+
+* Fixed the bug that fails to rendering the headline meta when a "endDatetime" of the timeline option is defined to "auto" ([Issue#72](/ka215/jquery.timeline/issues/72)).
+* Modified several styles of headline and footer in Timeline.
+* Changed the branch name representing the repository from "master" to "main".
+
 ### v2.1.2 (November 13, 2020 GMT)
 
 * Fixed a bug where the grid width specified minGridSize did not work properly when the scale is "week" ([Issue#54](/ka215/jquery.timeline/issues/54)).

README.md

@@ -56,8 +56,8 @@ Several quick start options are available:
 - Clone the repository: `git clone https://github.com/ka215/jquery.timeline.git`
 - Load via CDN:
 ```HTML
-<link href="https://cdn.jsdelivr.net/gh/ka215/jquery.timeline@master/dist/jquery.timeline.min.css" rel="stylesheet">
-<script src="https://cdn.jsdelivr.net/gh/ka215/jquery.timeline@master/dist/jquery.timeline.min.js"></script>
+<link href="https://cdn.jsdelivr.net/gh/ka215/jquery.timeline@main/dist/jquery.timeline.min.css" rel="stylesheet">
+<script src="https://cdn.jsdelivr.net/gh/ka215/jquery.timeline@main/dist/jquery.timeline.min.js"></script>
 ```
 
 ## What's included
@@ -178,4 +178,4 @@ Donate URL: <https://ka215.github.io/jquery.timeline/donation.html>
 
 ## Copyright and license
 
-Code and documentation copyright 2011-2020 the [ka2](https://ka2.org/). Code released under the [MIT License](https://raw.githubusercontent.com/ka215/jquery.timeline/master/LICENSE).
+Code and documentation copyright 2011-2020 the [ka2](https://ka2.org/). Code released under the [MIT License](https://raw.githubusercontent.com/ka215/jquery.timeline/main/LICENSE).

src/timeline.esdoc.js

@@ -1,6 +1,6 @@
 /*!
  * Typedef for jQuery Timeline's ESDoc
- * @version: 2.1.1
+ * @version: 2.1.3
  */
 
 /** @type {string} [NAME="Timeline"] */

src/timeline.js

@@ -4,7 +4,7 @@ import "regenerator-runtime/runtime"
 /*!
  * jQuery Timeline
  * ------------------------
- * Version: 2.1.2
+ * Version: 2.1.3
  * Author: Ka2 (https://ka2.org/)
  * Repository: https://github.com/ka215/jquery.timeline
  * Lisenced: MIT
@@ -15,7 +15,7 @@ import "regenerator-runtime/runtime"
  * ----------------------------------------------------------------------------------------------------------------
  */
 const NAME               = "Timeline"
-const VERSION            = "2.1.2"
+const VERSION            = "2.1.3"
 const DATA_KEY           = "jq.timeline"
 const EVENT_KEY          = `.${DATA_KEY}`
 const PREFIX             = "jqtl-"
@@ -940,11 +940,7 @@ class Timeline {
                 if ( Object.hasOwnProperty.call( _format, 'custom' ) ) {
                     _scale = 'custom'
                 }
-                if ( [ 'year', 'month', 'day', 'week' ].includes( _scale ) ) {
-                    _meta = `${this.getLocaleString( _opts.startDatetime, _scale, _locale, _format )}<span class="${ClassName.RANGE_SPAN}"></span>${this.getLocaleString( _opts.endDatetime, _scale, _locale, _format )}`
-                } else {
-                    _meta = `${this.getLocaleString( _begin, _scale, _locale, _format )}<span class="${ClassName.RANGE_SPAN}"></span>${this.getLocaleString( _end, _scale, _locale, _format )}`
-                }
+                _meta = `${this.getLocaleString( _begin, _scale, _locale, _format )}<span class="${ClassName.RANGE_SPAN}"></span>${this.getLocaleString( _end, _scale, _locale, _format )}`
                 _wrapper.append( `<div class="${ClassName.RANGE_META}">${_meta}</div>` )// .jqtl-range-meta
             }
         }

src/timeline.scss

@@ -15,7 +15,7 @@ $marker:     #2C7CFF;
 /*!
  * jQuery Timeline Plugin
  * ------------------------
- * Version: 2.1.2
+ * Version: 2.1.3
  * Coded by: ka2 ( https://ka2.org/ )
  * Repository: https://github.com/ka215/jquery.timeline
  * Lisenced: MIT
@@ -72,29 +72,32 @@ $marker:     #2C7CFF;
  */
 .jqtl-headline {
   width: auto;
-  margin-top: 0.25rem;
-  margin-bottom: 0.25rem;
-  padding-left: 5px;
-  padding-right: 5px;
+  margin-top: 0.25em;
+  margin-bottom: 0.25em;
+  padding-left: 0.25em;
+  padding-right: 0.25em;
 }
 
 .jqtl-headline-wrapper {
   display: flex;
   flex-direction: row;
   flex-wrap: nowrap;
   justify-content: space-between;
-  align-items: stretch;
+  align-items: center;
 }
 
 .jqtl-timeline-title {
+  margin: 0;
   align-self: center;
-  font-size: 26px;
+  font-size: 1.4286em;
+  font-weight: 600;
   color: $text;
 }
 
 .jqtl-range-meta {
+  margin: 0;
   align-self: center;
-  font-size: 86%;
+  font-size: 0.8571em;
   color: $subtext;
 }
 
@@ -585,14 +588,23 @@ $marker:     #2C7CFF;
  * ----------------------------------------------------------------------------
  */
 .jqtl-footer {
-  margin: 15px auto;
-  padding: 0;
-  width: 100%;
-}
+  margin: 0.25em 0;
+  padding: 0 0.25em;
+  width: auto;
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
 
-.jqtl-footer-content {
-  clear: both;
-  text-align: center;
+  .jqtl-range-meta {
+    width: 100%;
+  }
+
+  .jqtl-footer-content {
+    width: 100%;
+    text-align: center;
+  }
 }
 
 /* ----------------------------------------------------------------------------