source: orbit/iOS/Orbit/tutorial/index.html @ 835f156

ServoTab_Interfacepyramid
Last change on this file since 835f156 was 835f156, checked in by Steve Castellotti <sc@…>, 7 years ago

Merge branch 'master' of ssh://puzzlebox.info/repo/orbit

Conflicts:

iOS/Orbit/tutorial/index.html
iOS/Orbit/tutorial/step10.html

  • Property mode set to 100644
File size: 1.7 KB
Line 
1<!DOCTYPE html>
2<html>
3<head>
4   <meta name="viewport" content="width=device-width">
5   <link rel="stylesheet" type="text/css" href="style.css">
6   <title>Orbit Tutorial</title>
7</head>
8<body style="background-color: white;">
9   
10   <center>
11     
12<<<<<<< HEAD
13      <img src="puzzlebox_logo.pdf" width="240">
14         
15      Welcome to Puzzlebox Orbit
16     
17      <p><img src="status_0@2x.png" height="160"><p>
18         
19      <p>Press the arrow button to begin the tutorial</p>
20
21      <!--<a class="next button" onclick="parent.changePage('contents.html');">Next &raquo;</a>-->
22         
23      <a class="next button" onclick="parent.changePage('contents.html');">&nbsp;&nbsp; &rarr; &nbsp;&nbsp;</a>
24
25   </center>
26=======
27   <img src="puzzlebox_logo.pdf" width="240">
28     
29   Welcome to Puzzlebox Orbit
30   
31   <p><img src="status_0@2x.png" height="160"><p>
32     
33   <p>Please press "Next" to begin the tutorial</p>
34     
35   <a class='next button' onclick="parent.changePage('step01.html');">Next &raquo;</a>
36           
37   </center>
38   
39   <!--
40    <table class='table'>
41    <tbody>
42    <tr>
43    <td>
44    <center>
45    <img src="puzzlebox_logo.pdf" width="240">
46    </center>
47    </td>
48    </tr>
49   
50    <tr>
51    <td>
52    <center>
53    Welcome to Puzzlebox Orbit
54    </center>
55    </td>
56    </tr>
57   
58    <tr>
59    <td>
60    <center>
61    <p><img src="status_0@2x.png" height="160"></p>
62    </center>
63    </td>
64    </tr>
65   
66    <tr>
67    <td>
68    <center>
69    Please press "Next" to begin the tutorial
70    </center>
71    </td>
72    </tr>
73   
74    </td>
75    <tr>
76    <td>
77    <a class='next button' href="step01.html">Next &raquo;</a>
78    </td>
79    </tr>
80    </tbody>
81    </table>
82    -->
83>>>>>>> 066b06095b4ed65dac09640759c874d385be55ba
84
85</body>
86</html>
Note: See TracBrowser for help on using the repository browser.