-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathindex.html.orig
218 lines (189 loc) · 9.97 KB
/
index.html.orig
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<<<<<<< HEAD:index.html
<title>pawkyCarousel Demo</title>
=======
<title>Carousel DEMO</title>
>>>>>>> 3ede8be... carousel init:index.html
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script src="jquery1.4.1.min.js" type="text/javascript"></script>
<script src="gcarousel.js" type="text/javascript"></script>
<link href="gcarousel.css" media="screen" rel="stylesheet" type="text/css" />
<style>
body{background:#e7e0d0; margin:auto; padding:10px 0 10px 0; text-align:center; color:black; font-size:12px;}
.box{width:850px; height:auto; margin: 1px auto 0 auto; padding:20px 0 20px 0px; background:#999; }
.box p{text-align:left; margin: 0 0 5px 20px;}
.item{ height:190px; background:#888; text-align:center; overflow:hidden;}
.basic_item{position:relative; height:190px; width:400px; overflow:hidden; background:#888; float:left; }
<<<<<<< HEAD:index.html
=======
.item.dark, .basic_item.dark{background:#7e7e7e;}
>>>>>>> 3ede8be... carousel init:index.html
.info{width:90%; height:auto; text-align:left; padding:10px 5px 10px 0px; margin: 10px auto 10px auto; border-bottom: 1px dotted #555; border-top: 1px dotted #555;}
.html_code{background:#959595; padding:10px 20px; margin:5px 0 10px 0; color:black; font-size:11px; color:#444;}
.header{background:none;}
.about{font-size: 11px;}
</style>
</head>
<body>
<div class="box header">
<<<<<<< HEAD:index.html
<h1 style="text-align:left;"> pawkyCarousel <small> - jQuery carosuel</small></h1>
</div>
<div class="box about">
<p><strong>Authors: </strong>Daniel Sokołowski, <a href='http://wojciech.oxos.pl'>Wojciech Kruszewski</a></p>
<p><strong>Repository: </strong>http://github.com/wojciech/carousel</p>
<p>jQuery Carousele Plugin</p>
<p>Work sponsored by <a href='http://pawky.com'><big><strong>Pawky.com</strong></big> - a short film society</a></p>
<p>Credits: First version was based on: <a href='http://www.agilecarousel.com'>Agile Carousel</a> (now there's hardly no original code left)</p>
=======
<h1 style="text-align:left;"> GCarousel <small> - jQuery carosuel</small></h1>
</div>
<div class="box about">
<p><strong>Author: </strong>OXOS</p>
<p><strong>Version: </strong>1.0</p>
<p><strong>Download: </strong>http://oxos.pl/</p>
<p><strong>Repository: </strong>http://github.com/gcarsousel</p>
<p>gCarousel is a jQuery plugin for controlling a list of items in horizontal order. The items, which can be static HTML content, can be scrolled back and forth with animation</p>
>>>>>>> 3ede8be... carousel init:index.html
</div>
<div class="box">
<h2> Auto adjust carousel </h2>
<div class="info">
<<<<<<< HEAD:index.html
HTML:
<div class="html_code">
<div id="auto_adjust_carousel"><br/>
<div class="item"> <img src="images/1.jpg" height="100%" /> </div><br />
<div class="item"> <img src="images/2.jpg" height="100%" /> </div><br />
<div class="item"> <img src="images/3.jpg" height="100%" /> </div><br />
<div class="item"> <img src="images/4.jpg" height="100%" /> </div><br />
<div class="item"> <img src="images/5.jpg" height="100%" /> </div><br />
<div class="item"> <img src="images/6.jpg" height="100%" /> </div><br />
<div class="item"> <img src="images/7.jpg" height="100%" /> </div><br />
<div class="item"> <img src="images/8.jpg" height="100%" /> </div><br />
<div class="item"> <img src="images/9.jpg" height="100%" /> </div><br />
</div></br>
</div>
JS:
=======
HTML before:
<div class="html_code">
<div id="auto_adjust_carousel"><br/>
your content</br>
</div></br>
</div>
Used javascript code:
>>>>>>> 3ede8be... carousel init:index.html
<div class="html_code">
$('#auto_adjust_carousel').agile_carousel({<br/>
number_slides_visible: "4",<br/>
scroll: 3,<br/>
<<<<<<< HEAD:index.html
=======
transition_duration: 800,<br/>
>>>>>>> 3ede8be... carousel init:index.html
auto_adjust: true<br/>
});
</div>
</div>
<div id="auto_adjust_carousel">
<<<<<<< HEAD:index.html
<div class="item"> <img src="images/1.jpg" height="100%" /> </div>
<div class="item"> <img src="images/2.jpg" height="100%" /> </div>
<div class="item"> <img src="images/3.jpg" height="100%" /> </div>
<div class="item"> <img src="images/4.jpg" height="100%" /> </div>
<div class="item"> <img src="images/5.jpg" height="100%" /> </div>
<div class="item"> <img src="images/6.jpg" height="100%" /> </div>
<div class="item"> <img src="images/7.jpg" height="100%" /> </div>
<div class="item"> <img src="images/8.jpg" height="100%" /> </div>
<div class="item"> <img src="images/9.jpg" height="100%" /> </div>
=======
<div class="item dark"> <img src="images/1.jpg" height="100%" /> </div>
<div class="item"> <img src="images/2.jpg" height="100%" /> </div>
<div class="item dark"> <img src="images/3.jpg" height="100%" /> </div>
<div class="item"> <img src="images/4.jpg" height="100%" /> </div>
<div class="item dark"> <img src="images/5.jpg" height="100%" /> </div>
<div class="item"> <img src="images/6.jpg" height="100%" /> </div>
<div class="item dark"> <img src="images/7.jpg" height="100%" /> </div>
<div class="item"> <img src="images/8.jpg" height="100%" /> </div>
<div class="item dark"> <img src="images/9.jpg" height="100%" /> </div>
>>>>>>> 3ede8be... carousel init:index.html
</div>
</div>
<script type="text/javascript">
$('#auto_adjust_carousel').agile_carousel({
number_slides_visible: "4",
scroll: 3,
<<<<<<< HEAD:index.html
=======
transition_duration: 800,
>>>>>>> 3ede8be... carousel init:index.html
auto_adjust: true
});
</script>
<div class="box">
<h2> Basic carousel </h2>
<div class="info">
<<<<<<< HEAD:index.html
HTML:
=======
HTML before:
>>>>>>> 3ede8be... carousel init:index.html
<div class="html_code">
<div id="basic_carousel"><br/>
your content</br>
</div></br>
</div>
<<<<<<< HEAD:index.html
JS:
<div class="html_code">
$('#basic_carousel').agile_carousel({ <br/>
transition_duration: 200,<br/>
=======
Used javascript code:
<div class="html_code">
$('#basic_carousel').agile_carousel({ <br/>
transition_duration: 400,<br/>
>>>>>>> 3ede8be... carousel init:index.html
shift: 200<br/>
});
</div>
</div>
<div id="basic_carousel">
<<<<<<< HEAD:index.html
<div class="basic_item"> <img src="images/1.jpg" width="100%" /> </div>
<div class="basic_item" style="width:150px;"> <img src="images/2.jpg" height="100%" /> </div>
<div class="basic_item"> <img src="images/3.jpg" width="100%" /> </div>
<div class="basic_item" style="width:170px;"> <img src="images/4.jpg" height="100%" /> </div>
<div class="basic_item"> <img src="images/5.jpg" width="100%" /> </div>
<div class="basic_item" style="width:500px;"> <img src="images/6.jpg" width="100%" /> </div>
<div class="basic_item"> <img src="images/7.jpg" width="100%" /> </div>
<div class="basic_item"> <img src="images/8.jpg" width="100%" /> </div>
<div class="basic_item"> <img src="images/9.jpg" width="100%" /> </div>
=======
<div class="basic_item dark"> <img src="images/1.jpg" width="100%" /> </div>
<div class="basic_item" style="width:150px;"> <img src="images/2.jpg" height="100%" /> </div>
<div class="basic_item dark"> <img src="images/3.jpg" width="100%" /> </div>
<div class="basic_item" style="width:170px;"> <img src="images/4.jpg" height="100%" /> </div>
<div class="basic_item dark"> <img src="images/5.jpg" width="100%" /> </div>
<div class="basic_item" style="width:500px;"> <img src="images/6.jpg" width="100%" /> </div>
<div class="basic_item dark"> <img src="images/7.jpg" width="100%" /> </div>
<div class="basic_item"> <img src="images/8.jpg" width="100%" /> </div>
<div class="basic_item dark"> <img src="images/9.jpg" width="100%" /> </div>
>>>>>>> 3ede8be... carousel init:index.html
</div>
</div>
<script type="text/javascript">
$('#basic_carousel').agile_carousel({
<<<<<<< HEAD:index.html
transition_duration: 200,
=======
transition_duration: 400,
>>>>>>> 3ede8be... carousel init:index.html
shift: 200
});
</script>
</body>
</html>