Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
cf8ac230fb
@ -70,6 +70,11 @@ Datetime "syntax"
|
|||||||
- `~2005` - event that happen around the time in that year
|
- `~2005` - event that happen around the time in that year
|
||||||
- `2005-~` - event that happen from that year and beyond (now).
|
- `2005-~` - event that happen from that year and beyond (now).
|
||||||
|
|
||||||
|
Other people's Lives
|
||||||
|
--------------------
|
||||||
|
|
||||||
|
Here's [a compilation of Lives from the people who has forked Life](https://github.com/cheeaun/life/wiki/Lives).
|
||||||
|
|
||||||
License
|
License
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<title>Life</title>
|
<title>Life</title>
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<meta name="format-detection" content="telephone=no">
|
||||||
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,300">
|
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,300">
|
||||||
<style>
|
<style>
|
||||||
*{
|
*{
|
||||||
@ -72,7 +73,6 @@ h1{
|
|||||||
color: rgba(255,255,255,.5);
|
color: rgba(255,255,255,.5);
|
||||||
}
|
}
|
||||||
#life .event .time{
|
#life .event .time{
|
||||||
vertical-align: middle;
|
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
height: 0;
|
height: 0;
|
||||||
@ -223,7 +223,7 @@ h1{
|
|||||||
width = daysDiff*dayLength;
|
width = daysDiff*dayLength;
|
||||||
} else {
|
} else {
|
||||||
if (startDate){
|
if (startDate){
|
||||||
width = dayLength
|
width = dayLength;
|
||||||
} else if (startMonth){
|
} else if (startMonth){
|
||||||
width = monthLength;
|
width = monthLength;
|
||||||
} else {
|
} else {
|
||||||
@ -242,7 +242,7 @@ h1{
|
|||||||
var nowYear = new Date().getFullYear();
|
var nowYear = new Date().getFullYear();
|
||||||
var dayLength = life.yearLength/12/30;
|
var dayLength = life.yearLength/12/30;
|
||||||
|
|
||||||
html = '';
|
var html = '';
|
||||||
var days = 0;
|
var days = 0;
|
||||||
|
|
||||||
for (var y=firstYear, age = 0; y<=nowYear+1; y++, age++){
|
for (var y=firstYear, age = 0; y<=nowYear+1; y++, age++){
|
||||||
|
Loading…
Reference in New Issue
Block a user