Skip to content

Commit c11cd13

Browse files
magonimagoni
committed
Merge branch 'develop'
2 parents 6e05f40 + f9f6a16 commit c11cd13

File tree

110 files changed

+3281
-2099
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+3281
-2099
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ env:
88
install:
99
- npm install -g gulp
1010
- npm install
11-
- phantomjs --version
12-
13-
before_script: gulp develop:build
1411

1512
script: gulp develop:test
1613

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Diva.js
22

3-
Copyright (C) 2011-2015 by Wendy Liu, Evan Magoni, Andrew Horwitz, Andrew Hankinson, Laurent Pugin
3+
Copyright (C) 2011-2016 by Wendy Liu, Evan Magoni, Andrew Horwitz, Andrew Hankinson, Laurent Pugin
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎build/LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Diva.js
22

3-
Copyright (C) 2011-2015 by Wendy Liu, Evan Magoni, Andrew Horwitz, Andrew Hankinson, Laurent Pugin
3+
Copyright (C) 2011-2016 by Wendy Liu, Evan Magoni, Andrew Horwitz, Andrew Hankinson, Laurent Pugin
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎build/css/diva.css‎

Lines changed: 137 additions & 155 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/css/diva.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/css/diva.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/css/diva.min.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/demo/autoscroll.html‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,17 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5+
<meta name="viewport" content="width=device-width, initial-scale=1">
56
<title>Diva.js Demo Page</title>
67
<link rel="stylesheet" href="/css/diva.min.css" />
8+
<link rel="stylesheet" href="demo.css" />
79
<!--[if IE]>
810
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
911
<![endif]-->
1012
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
1113
<script src="/js/diva.js" type="text/javascript"></script>
1214
<script src="/js/plugins/autoscroll.js" type="text/javascript"></script>
1315
<script src="/js/utils.js" type="text/javascript"></script>
14-
<style>
15-
body, html{
16-
height:90%;
17-
}
18-
#diva-wrapper{
19-
height:100%;
20-
}
21-
.diva-outer{
22-
height:100%;
23-
}
24-
</style>
2516
<script type="text/javascript">
2617
$(document).ready(function() {
2718
$('#diva-wrapper').diva({

‎build/demo/demo.css‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
body {
2+
font-family: 'Helvetica Neue', 'Helvetica', Arial, Verdana, sans-serif;
3+
-webkit-font-smoothing: antialiased;
4+
}
5+
6+
body, html {
7+
height:90%;
8+
}
9+
10+
#diva-wrapper, .diva-outer {
11+
height: 100%;
12+
}

‎build/demo/highlight.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5+
<meta name="viewport" content="width=device-width, initial-scale=1">
56
<title>Diva.js Demo Page</title>
67
<link rel="stylesheet" href="/css/diva.min.css" />
8+
<link rel="stylesheet" href="demo.css" />
79
<!--[if IE]>
810
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
911
<![endif]-->

0 commit comments

Comments
 (0)