Skip to content

Commit 2db2187

Browse files
author
bozdoz
committed
Merge branch 'master' into events-and-instances
Conflicts: intro.js
2 parents d4dfe57 + e965a0d commit 2db2187

File tree

6 files changed

+282
-61
lines changed

6 files changed

+282
-61
lines changed

‎.github/ISSUE_TEMPLATE.md

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
## Description
2-
Describe the issue or the enhancement you want to see in the Intro.js
2+
Describe one (and only one) issue or enhancement you want to see in Intro.js (before writing any code).
33

4-
## Environment
5-
All the maximum information about your environment.
6-
For example Intro.js version, Operating System, Node.js version, which branch, etc.
4+
## Expected Behavior
5+
What did you expect to happen?
76

8-
## Actual result
9-
What happened.
7+
## Actual Behavior
8+
What actually happened?
109

11-
## Expected behavior
12-
What should happen?
10+
## Errors and Screenshots (optional)
11+
Give us any additional information if you have.
1312

14-
## Steps to reproduce
15-
How did you get?
13+
## Example (recommended)
14+
How can someone else see/test this issue? List the steps or write some code; or create a jsfiddle or codepen.
1615

17-
## Logs, error output, screenshots?
18-
Give us any additional information if you have.
16+
## Environment (optional)
17+
List browser information, Intro.js version, Operating System, JavaScript libraries (jQuery, Angular, React), etc.

‎example/groups/index.html

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<title>Groups</title>
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7+
<meta name="description" content="Intro.js - Better introductions for websites and features with a step-by-step guide for your projects.">
8+
<meta name="author" content="Afshin Mehrabani (@afshinmeh) in usabli.ca group">
9+
10+
<!-- styles -->
11+
<link href="../assets/css/bootstrap.min.css" rel="stylesheet">
12+
<link href="../assets/css/demo.css" rel="stylesheet">
13+
14+
<!-- Add IntroJs styles -->
15+
<link href="../../introjs.css" rel="stylesheet">
16+
17+
<link href="../assets/css/bootstrap-responsive.min.css" rel="stylesheet">
18+
</head>
19+
20+
<body>
21+
22+
<div class="container-narrow">
23+
24+
<div class="masthead">
25+
<ul class="nav nav-pills pull-right" data-step="5" data-intro="Get it, use it.">
26+
<li><a href="https://github.com/usablica/intro.js/tags"><i class='icon-black icon-download-alt'></i> Download</a></li>
27+
<li><a href="https://github.com/usablica/intro.js">Github</a></li>
28+
<li><a href="https://twitter.com/usablica">@usablica</a></li>
29+
</ul>
30+
<h3 class="muted">Intro.js</h3>
31+
</div>
32+
33+
<hr>
34+
35+
<div class="jumbotron">
36+
<h1>Groups</h1>
37+
<p class="lead">An example of grouping, with <code>data-intro-group</code> attributes.</p>
38+
<a class="btn btn-large btn-success" href="javascript:void(0);" onclick="javascript:introJs().start('odd');">Show me odds</a>
39+
<a class="btn btn-large btn-info" href="javascript:void(0);" onclick="javascript:introJs().start('even');">Show me evens</a>
40+
</div>
41+
42+
<hr>
43+
44+
<div class="row-fluid marketing">
45+
<div class="span6">
46+
<div data-step="1" data-intro-group="odd" data-intro="Here we go">
47+
<h4>Section One</h4>
48+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis augue a neque cursus ac blandit orci faucibus. Phasellus nec metus purus.</p>
49+
</div>
50+
<div data-step="1" data-intro-group="even" data-intro="Here we go">
51+
<h4>Section Two</h4>
52+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis augue a neque cursus ac blandit orci faucibus. Phasellus nec metus purus.</p>
53+
</div>
54+
<div data-step="2" data-intro-group="odd" data-intro="Through the list">
55+
<h4>Section Three</h4>
56+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis augue a neque cursus ac blandit orci faucibus. Phasellus nec metus purus.</p>
57+
</div>
58+
</div>
59+
60+
<div class="span6">
61+
<div data-step="2" data-intro-group="even" data-intro="Through the list">
62+
<h4>Section Four</h4>
63+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis augue a neque cursus ac blandit orci faucibus. Phasellus nec metus purus.</p>
64+
</div>
65+
<div data-step="3" data-intro-group="odd" data-intro="On and on...">
66+
<h4>Section Five</h4>
67+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis augue a neque cursus ac blandit orci faucibus. Phasellus nec metus purus.</p>
68+
</div>
69+
<div data-step="3" data-intro-group="even" data-intro="On and on...">
70+
<h4>Section Six</h4>
71+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis augue a neque cursus ac blandit orci faucibus. Phasellus nec metus purus.</p>
72+
</div>
73+
</div>
74+
</div>
75+
76+
<hr>
77+
</div>
78+
<script type="text/javascript" src="../../intro.js"></script>
79+
</body>
80+
</html>

‎example/hello-world/withScroll.html

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<title>Basic usage</title>
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7+
<meta name="description" content="Intro.js - Better introductions for websites and features with a step-by-step guide for your projects.">
8+
<meta name="author" content="Afshin Mehrabani (@afshinmeh) in usabli.ca group">
9+
10+
<!-- styles -->
11+
<link href="../assets/css/bootstrap.min.css" rel="stylesheet">
12+
<link href="../assets/css/demo.css" rel="stylesheet">
13+
14+
<!-- Add IntroJs styles -->
15+
<link href="../../introjs.css" rel="stylesheet">
16+
17+
<link href="../assets/css/bootstrap-responsive.min.css" rel="stylesheet">
18+
19+
<style>
20+
.marketing {
21+
height: 300px;
22+
height: 40vh;
23+
margin-top: 500px;
24+
margin-top: 40vh;
25+
overflow: auto;
26+
}
27+
</style>
28+
</head>
29+
30+
<body>
31+
32+
<div class="container-narrow">
33+
34+
<div class="masthead">
35+
<ul class="nav nav-pills pull-right">
36+
<li><a href="https://github.com/usablica/intro.js/tags"><i class='icon-black icon-download-alt'></i> Download</a></li>
37+
<li><a href="https://github.com/usablica/intro.js">Github</a></li>
38+
<li><a href="https://twitter.com/usablica">@usablica</a></li>
39+
</ul>
40+
<h3 class="muted">Intro.js</h3>
41+
</div>
42+
43+
<hr>
44+
45+
<div class="jumbotron">
46+
<h1 data-step="3" data-intro="This is a tooltip!">Works with a Scrollable Element</h1>
47+
<p class="lead">This is the basic usage of IntroJs, with <code>data-step</code> and <code>data-intro</code> attributes.</p>
48+
<a class="btn btn-large btn-success" href="javascript:void(0);" onclick="javascript:introJs().start();">Show me how</a>
49+
</div>
50+
51+
<hr>
52+
53+
<div class="row-fluid marketing">
54+
<h4 data-step="2" data-intro="Another step.">Section One</h4>
55+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis augue a neque cursus ac blandit orci faucibus. Phasellus nec metus purus.</p>
56+
57+
<h4>Section Two</h4>
58+
<div>
59+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis augue a neque cursus ac blandit orci faucibus. Phasellus nec metus purus.</p>
60+
<h5>testing</h5>
61+
</div>
62+
63+
<h4>Section Three</h4>
64+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis augue a neque cursus ac blandit orci faucibus. Phasellus nec metus purus.</p>
65+
66+
<h4>Section Four</h4>
67+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis augue a neque cursus ac blandit orci faucibus. Phasellus nec metus purus.</p>
68+
69+
<h4>Section Five</h4>
70+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis augue a neque cursus ac blandit orci faucibus. Phasellus nec metus purus.</p>
71+
72+
<h4 data-step="1" data-intro="A scrolling step.">Section Six</h4>
73+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis augue a neque cursus ac blandit orci faucibus. Phasellus nec metus purus.</p>
74+
75+
<h4>Section Seven</h4>
76+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis augue a neque cursus ac blandit orci faucibus. Phasellus nec metus purus.</p>
77+
78+
<h4>Section Eight</h4>
79+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis augue a neque cursus ac blandit orci faucibus. Phasellus nec metus purus.</p>
80+
81+
<h4>Section Nine</h4>
82+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis augue a neque cursus ac blandit orci
83+
faucibus. Phasellus nec metus purus.</p>
84+
85+
<h4>Section Ten</h4>
86+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis augue a neque cursus ac blandit orci faucibus. Phasellus nec metus purus.</p>
87+
88+
<h4>Section Eleven</h4>
89+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis augue a neque cursus ac blandit orci faucibus. Phasellus nec metus purus.</p>
90+
91+
<h4>Section Twelve</h4>
92+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis augue a neque cursus ac blandit orci faucibus. Phasellus nec metus purus.</p>
93+
</div>
94+
95+
<hr>
96+
</div>
97+
<script type="text/javascript" src="../../intro.js"></script>
98+
</body>
99+
</html>

‎example/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ <h3 class="muted">Examples</h3>
2525
<li><a href="hello-world/withoutBullets.html" title='Basic usage with buttons'>Basic usage with buttons</a></li>
2626
<li><a href="hello-world/withoutButtons.html" title='Basic usage with bullets'>Basic usage with bullets</a></li>
2727
<li><a href="hello-world/withProgress.html" title='Basic usage with progress-bar'>Basic usage with progress-bar</a></li>
28+
<li><a href="hello-world/withScroll.html" title='Basic usage with a scrolling element'>Basic usage with a scrolling element</a></li>
2829
<li><a href="programmatic/index.html" title='Programmatic defining using JSON'>Programmatic defining using JSON</a></li>
2930
<li><a href="multi-page/index.html" title='Multi-Page introduction'>Multi-Page introduction</a></li>
3031
<li><a href="auto-position/index.html" title='Auto-positioning'>Auto-positioning</a></li>

0 commit comments

Comments
 (0)