ZURB-foundation 2.1.4.1 → 2.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/README.mkdn CHANGED
@@ -18,7 +18,7 @@ In Terminal:
18
18
  * `git clone git://github.com/zurb/foundation-sass.git`
19
19
  * `cd foundation-sass`
20
20
  * `sudo gem build ZURB-foundation.gemspec`
21
- * `sudo gem install ZURB-foundation-2.1.4.1.gem`
21
+ * `sudo gem install ZURB-foundation-2.1.5.gem`
22
22
 
23
23
  To create your first project
24
24
  ----------------------------
@@ -68,6 +68,12 @@ WordPress
68
68
 
69
69
  * [NuGet Package for ASP.Net MVC](http://nuget.org/List/Packages/Zurb_Foundation_MPC3) by Edward Charbeneau, @EdCharbeneau
70
70
 
71
+ Other Implementations
72
+
73
+ * [Mobile First](https://github.com/admfrhd/mobile-first-foundation) by Adam Fairhead
74
+ * [Less Version](https://github.com/justinmarsan/FoundationLess) by Justin Marsan
75
+ * [Less with Color Scheme](https://github.com/matalin/FoundationLess) by Matalin Hatchard
76
+
71
77
  Editors
72
78
 
73
79
  * [Textmate/Sublime Text2 Bundle](https://github.com/liamr/Zurb-Foundation-Textmate-Bundle) by Liam R, @liamr
@@ -3,7 +3,7 @@ Compass::Frameworks.register("ZURB-foundation", :path => File.join(File.dirname(
3
3
 
4
4
  module ZURBfoundation
5
5
 
6
- VERSION = "2.1.4.1"
7
- DATE = "2012-01-23"
6
+ VERSION = "2.1.5"
7
+ DATE = "2012-01-26"
8
8
 
9
9
  end
@@ -8,6 +8,7 @@
8
8
  cursor: pointer
9
9
  display: inline-block
10
10
  font-weight: bold
11
+ font-family: $helvetica-font-stack
11
12
  line-height: 1
12
13
  padding: 9px 34px 11px
13
14
  position: relative
@@ -31,6 +31,7 @@ input.input-text, textarea
31
31
  padding: 4px 5px !important
32
32
  &:focus
33
33
  outline: none !important
34
+ background: #f9f9f9
34
35
 
35
36
  // Text input and textarea, disabled
36
37
  input.input-text[disabled], textarea[disabled]
@@ -114,7 +115,7 @@ form.nice
114
115
  fieldset
115
116
  +border-radius(3px)
116
117
  .form-field input[disabled], input.input-text[disabled], textarea[disabled]
117
- background: #ccc
118
+ background: #ddd
118
119
  small.error
119
120
  padding: 6px 4px
120
121
  border: solid 0 #c00000
@@ -133,6 +133,10 @@ table
133
133
  border-right: none
134
134
  tbody
135
135
  tr
136
+ &.alt
137
+ background: #f9f9f9
138
+ &:nth-child(even)
139
+ background: #f9f9f9
136
140
  td
137
141
  +font-size(12)
138
142
  line-height: 18px
@@ -18,79 +18,78 @@
18
18
  &:first-child
19
19
  margin-left: 0
20
20
 
21
- .one.columns
22
- width: 4.3%
23
- .two.columns
24
- width: 13%
25
- .three.columns
26
- width: 21.7%
27
- .four.columns
28
- width: 30.37%
29
- .five.columns
30
- width: 39.1%
31
- .six.columns
32
- width: 47.8%
33
- .seven.columns
34
- width: 56.5%
35
- .eight.columns
36
- width: 65.2%
37
- .nine.columns
38
- width: 73.9%
39
- .ten.columns
40
- width: 82.6%
41
- .eleven.columns
42
- width: 91.3%
43
- .twelve.columns
44
- width: 100%
45
-
46
- .centered
47
- float: none
48
- margin: 0 auto
49
-
50
- .offset-by-one
51
- margin-left: 13.1%
52
- &:first-child
53
- margin-left: 8.7%
54
- .offset-by-two
55
- margin-left: 21.8%
56
- &:first-child
57
- margin-left: 17.4%
58
- .offset-by-three
59
- margin-left: 30.5%
60
- &:first-child
61
- margin-left: 26.1%
62
- .offset-by-four
63
- margin-left: 39.2%
64
- &:first-child
65
- margin-left: 34.8%
66
- .offset-by-five
67
- margin-left: 47.9%
68
- &:first-child
69
- margin-left: 43.5%
70
- .offset-by-six
71
- margin-left: 56.6%
72
- &:first-child
73
- margin-left: 52.2%
74
- .offset-by-seven
75
- margin-left: 65.3%
76
- &:first-child
77
- margin-left: 60.9%
78
- .offset-by-eight
79
- margin-left: 74.0%
80
- &:first-child
81
- margin-left: 69.6%
82
- .offset-by-nine
83
- margin-left: 82.7%
84
- &:first-child
85
- margin-left: 78.3%
86
- .offset-by-ten
87
- margin-left: 91.4%
88
- &:first-child
89
- margin-left: 87.0%
90
- .offset-by-eleven
91
- &:first-child
92
- margin-left: 95.7%
21
+ .row
22
+ .one.columns
23
+ width: 4.3%
24
+ .two.columns
25
+ width: 13%
26
+ .three.columns
27
+ width: 21.68%
28
+ .four.columns
29
+ width: 30.37%
30
+ .five.columns
31
+ width: 39.1%
32
+ .six.columns
33
+ width: 47.8%
34
+ .seven.columns
35
+ width: 56.5%
36
+ .eight.columns
37
+ width: 65.2%
38
+ .nine.columns
39
+ width: 73.9%
40
+ .ten.columns
41
+ width: 82.6%
42
+ .eleven.columns
43
+ width: 91.3%
44
+ .twelve.columns
45
+ width: 100%
93
46
 
47
+ .offset-by-one
48
+ margin-left: 13.1%
49
+ &:first-child
50
+ margin-left: 8.7%
51
+ .offset-by-two
52
+ margin-left: 21.8%
53
+ &:first-child
54
+ margin-left: 17.4%
55
+ .offset-by-three
56
+ margin-left: 30.5%
57
+ &:first-child
58
+ margin-left: 26.1%
59
+ .offset-by-four
60
+ margin-left: 39.2%
61
+ &:first-child
62
+ margin-left: 34.8%
63
+ .offset-by-five
64
+ margin-left: 47.9%
65
+ &:first-child
66
+ margin-left: 43.5%
67
+ .offset-by-six
68
+ margin-left: 56.6%
69
+ &:first-child
70
+ margin-left: 52.2%
71
+ .offset-by-seven
72
+ margin-left: 65.3%
73
+ &:first-child
74
+ margin-left: 60.9%
75
+ .offset-by-eight
76
+ margin-left: 74.0%
77
+ &:first-child
78
+ margin-left: 69.6%
79
+ .offset-by-nine
80
+ margin-left: 82.7%
81
+ &:first-child
82
+ margin-left: 78.3%
83
+ .offset-by-ten
84
+ margin-left: 91.4%
85
+ &:first-child
86
+ margin-left: 87.0%
87
+ .offset-by-eleven
88
+ &:first-child
89
+ margin-left: 95.7%
90
+ .centered
91
+ float: none
92
+ margin: 0 auto
94
93
  // Source Ordering
95
94
  .push-two
96
95
  left: 17.4%
@@ -175,9 +174,9 @@ img
175
174
  &:nth-child(3n+1)
176
175
  clear: left
177
176
  &.four-up
178
- margin-left: -4%
177
+ margin-left: -2%
179
178
  & > li
180
- margin-left: 4%
179
+ margin-left: 2%
181
180
  width: 23%
182
181
  @if $support-block-grid-nth-child
183
182
  &:nth-child(4n+1)
@@ -57,7 +57,10 @@
57
57
  margin-right: 0
58
58
  .offset-by-one, .offset-by-two, .offset-by-three, .offset-by-four, .offset-by-five, .offset-by-six, .offset-by-seven, .offset-by-eight, .offset-by-nine, .offset-by-ten, .offset-by-eleven, .centered
59
59
  margin-left: 0% !important
60
-
60
+ .push-two, .push-three, .push-four, .push-five, .push-six, .push-seven, .push-eight, .push-nine, .push-ten
61
+ left: none
62
+ .pull-two, .pull-three, .pull-four, .pull-five, .pull-six, .pull-seven, .pull-eight, .pull-nine, .pull-ten
63
+ right: none
61
64
  // Mobile 4-column Grid
62
65
  //----------------------------------------------------------------------------------------------------
63
66
  .row
@@ -77,7 +80,20 @@
77
80
  width: 73.9% !important
78
81
  .phone-four.columns
79
82
  width: 100% !important
83
+
84
+ .columns.push-one-phone
85
+ left: 26.08%
86
+ .columns.push-two-phone
87
+ left: 52.2%
88
+ .columns.push-three-phone
89
+ left: 78.3%
80
90
 
91
+ .columns.pull-one-phone
92
+ right: 26.08%
93
+ .columns.pull-two-phone
94
+ right: 52.2%
95
+ .columns.pull-three-phone
96
+ right: 78.3%
81
97
  // Block Grid
82
98
  //----------------------------------------------------------------------------------------------------
83
99
  @media only screen and (max-width: 767px)
@@ -276,31 +292,45 @@ table
276
292
  & > li
277
293
  float: none
278
294
  display: block
279
- & > a
295
+ border-right: none
296
+ & > a.main
280
297
  text-align: left
281
298
  border-top: 1px solid #ddd
282
299
  border-right: none
283
300
  &.has-flyout
284
- & > a
301
+ & > a.main
285
302
  &:after
303
+ display: none
304
+ a.flyout-toggle
305
+ position: absolute
306
+ right: 0
307
+ top: 0
308
+ padding: 22px
309
+ z-index: 2
310
+ border-left: 1px dashed #eee
311
+ display: block
312
+ span
286
313
  content: ""
287
314
  width: 0
288
315
  height: 0
289
- border-left: 4px solid transparent
290
- border-right: 4px solid transparent
291
- border-top: 4px solid #2a85e8
316
+ border: 4px solid
317
+ border-color: #2a85e8 transparent transparent transparent
292
318
  display: block
319
+ &:hover
320
+ span
321
+ border-top-color: #141414
293
322
  &:first-child
294
- & > a
323
+ & > a.main
295
324
  border-top: none
296
325
  &:hover
297
- & > a
326
+ & > a.main
298
327
  font-weight: bold
299
328
  ul
300
329
  position: relative
301
330
  .flyout
302
331
  position: relative
303
332
  width: auto
333
+ top: auto
304
334
  margin-right: -2px
305
335
  border-width: 1px 1px 0px 1px
306
336
  &.right
@@ -311,6 +341,8 @@ table
311
341
  width: auto
312
342
  p.last-child
313
343
  margin-bottom: 18px
344
+ .nav-bar>li:hover .flyout
345
+ display: none
314
346
 
315
347
  // Video
316
348
  //----------------------------------------------------------------------------------------------------
@@ -1,4 +1,4 @@
1
- // CSS for jQuery Orbit Plugin 1.2.3 - http://www.zurb.com/playground
1
+ // CSS for jQuery Orbit Plugin 1.4.0 - http://www.zurb.com/playground
2
2
  // Copyright 2010, ZURB - Free to use under the MIT license - http://www.opensource.org/licenses/mit-license.php
3
3
  //
4
4
  // Configure the slider ID by setting $orbit-slider-id
@@ -33,21 +33,16 @@ div.orbit
33
33
  overflow: hidden
34
34
  &.with-bullets
35
35
  margin-bottom: 40px
36
- & > img
36
+ .orbit-slide
37
+ max-width: 100%
37
38
  position: absolute
38
39
  top: 0
39
40
  left: 0
40
- & > a
41
+ a.orbit-slide
41
42
  border: none
42
- position: absolute
43
- top: 0
44
- left: 0
45
43
  line-height: 0
46
44
  display: none
47
- &>div
48
- position: absolute
49
- top: 0
50
- left: 0
45
+ div.orbit-slide
51
46
  width: 100%
52
47
  height: 100%
53
48
 
@@ -56,55 +51,55 @@ div.orbit
56
51
  //
57
52
  // If your slider only uses content or anchors, you're going to want to put the width and height
58
53
  // declarations on the .orbit > div and div.orbit > a tags in addition to just the .orbit-wrapper
59
-
60
- div.timer
61
- width: 40px
62
- height: 40px
63
- overflow: hidden
64
- position: absolute
65
- top: 10px
66
- right: 10px
67
- +opacity(0.6)
68
- cursor: pointer
69
- z-index: 31
70
- span.rotator
71
- display: block
72
- width: 40px
73
- height: 40px
74
- position: absolute
75
- top: 0
76
- left: -20px
77
- background: image-url('orbit/rotator-black.png') no-repeat
78
- z-index: 3
79
- &.move
80
- left: 0
81
- span.mask
82
- display: block
83
- width: 20px
84
- height: 40px
85
- position: absolute
86
- top: 0
87
- right: 0
88
- z-index: 2
89
- overflow: hidden
90
- &.move
54
+ div.orbit-wrapper
55
+ div.timer
56
+ width: 40px
57
+ height: 40px
58
+ overflow: hidden
59
+ position: absolute
60
+ top: 10px
61
+ right: 10px
62
+ +opacity(0.6)
63
+ cursor: pointer
64
+ z-index: 31
65
+ span.rotator
66
+ display: block
91
67
  width: 40px
68
+ height: 40px
69
+ position: absolute
70
+ top: 0
71
+ left: -20px
72
+ background: image-url('orbit/rotator-black.png') no-repeat
73
+ z-index: 3
74
+ &.move
75
+ left: 0
76
+ span.mask
77
+ display: block
78
+ width: 20px
79
+ height: 40px
80
+ position: absolute
81
+ top: 0
82
+ right: 0
83
+ z-index: 2
84
+ overflow: hidden
85
+ &.move
86
+ width: 40px
87
+ left: 0
88
+ background: image-url('orbit/timer-black.png') repeat 0 0
89
+ span.pause
90
+ display: block
91
+ width: 40px
92
+ height: 40px
93
+ position: absolute
94
+ top: 0
92
95
  left: 0
93
- background: image-url('orbit/timer-black.png') repeat 0 0
94
- span.pause
95
- display: block
96
- width: 40px
97
- height: 40px
98
- position: absolute
99
- top: 0
100
- left: 0
101
- background: image-url('orbit/pause-black.png') no-repeat
102
- z-index: 4
103
- +opacity(0)
104
- &.active
105
- background: image-url('orbit/pause-black.png') no-repeat 0 -40
106
- div.timer:hover span.pause, span.pause.active
107
- +opacity(1)
96
+ background: image-url('orbit/pause-black.png') no-repeat
97
+ z-index: 4
98
+ +opacity(0)
99
+ &.active
100
+ background: image-url('orbit/pause-black.png') no-repeat 0 -40
101
+ div.timer:hover span.pause, span.pause.active
102
+ +opacity(1)
108
103
 
109
104
  // Orbit captions
110
105
  //----------------------------------------------------------------------------------------------------
@@ -128,28 +123,29 @@ div.timer:hover span.pause, span.pause.active
128
123
  // Directional Nav
129
124
  //----------------------------------------------------------------------------------------------------
130
125
 
131
- div.slider-nav
132
- display: block
133
- span
134
- width: 78px
135
- height: 100px
136
- text-indent: -99999px
137
- position: absolute
138
- z-index: 30
139
- top: 50%
140
- margin-top: -50px
141
- cursor: pointer
142
- &.right
143
- background: image-url('orbit/right-arrow.png')
144
- right: 0
145
- &.left
146
- background: image-url('orbit/left-arrow.png')
147
- left: 0
126
+ div.orbit-wrapper
127
+ div.slider-nav
128
+ display: block
129
+ span
130
+ width: 78px
131
+ height: 100px
132
+ text-indent: -99999px
133
+ position: absolute
134
+ z-index: 30
135
+ top: 50%
136
+ margin-top: -50px
137
+ cursor: pointer
138
+ &.right
139
+ background: image-url('orbit/right-arrow.png')
140
+ right: 0
141
+ &.left
142
+ background: image-url('orbit/left-arrow.png')
143
+ left: 0
148
144
 
149
145
  // Bullet Nav
150
146
  //----------------------------------------------------------------------------------------------------
151
147
 
152
- .orbit-bullets
148
+ ul.orbit-bullets
153
149
  position: absolute
154
150
  z-index: 30
155
151
  list-style: none
@@ -65,16 +65,16 @@
65
65
  // Reveal mobile
66
66
  //----------------------------------------------------------------------------------------------------
67
67
 
68
- @media only screen and (device-width: 768px), (device-width: 800)
68
+ @media handheld, only screen and (max-width: 1023px)
69
69
  .reveal-modal-bg
70
70
  position: absolute
71
71
  .reveal-modal
72
72
  &.small, &.medium, &.large, &.xlarge
73
73
  width: 60%
74
- top: 30%
74
+ top: 60px
75
75
  left: 15%
76
76
  margin-left: 0
77
- padding: 5%
77
+ padding: 20px
78
78
  height: auto
79
79
  @media only screen and (max-width: 767px)
80
80
  .reveal-modal-bg
@@ -82,8 +82,8 @@
82
82
  .reveal-modal
83
83
  &.small, &.medium, &.large, &.xlarge
84
84
  width: 80%
85
- top: 15%
85
+ top: 15px
86
86
  left: 5%
87
87
  margin-left: 0
88
- padding: 5%
88
+ padding: 20px
89
89
  height: auto
@@ -101,7 +101,7 @@ abbr
101
101
  // Credit: Paul Irish & HTML5 Boilerplate (http://html5boilerplate.com/)
102
102
 
103
103
  .print-only
104
- display: block !important
104
+ display: none !important
105
105
 
106
106
  @media print
107
107
  *
@@ -7,6 +7,7 @@
7
7
  // Lists
8
8
  // Panels
9
9
  // Nav
10
+ // Tooltips
10
11
  // Video
11
12
  // Microformats
12
13
 
@@ -202,7 +203,13 @@ dl.tabs.vertical dd a
202
203
  margin-left: 0
203
204
  dl.tabs.vertical
204
205
  height: auto
205
- dt,
206
+ dt, dd, dt
207
+ float: none
208
+ height: auto
209
+ dl.nice.tabs.vertical
210
+ dd
211
+ float: none
212
+ height: auto
206
213
 
207
214
  ul.tabs-content
208
215
  margin: 0
@@ -302,7 +309,7 @@ div.panel
302
309
  line-height: 45px
303
310
  .flyout
304
311
  display: none
305
- &>a
312
+ &>a.main
306
313
  position: relative
307
314
  +font-size(15)
308
315
  padding: 0 20px
@@ -318,13 +325,13 @@ div.panel
318
325
  &:hover
319
326
  .flyout
320
327
  display: block
321
- &>a
328
+ &>a.main
322
329
  color: #141414
323
330
  z-index: 2
324
331
  &:after
325
332
  border-top-color: #141414
326
333
  &.has-flyout
327
- &>a
334
+ &>a.main
328
335
  padding-right: 36px
329
336
  &:after
330
337
  content: ""
@@ -337,6 +344,8 @@ div.panel
337
344
  position: absolute
338
345
  right: 18px
339
346
  bottom: 20px
347
+ &>a.flyout-toggle
348
+ display: none
340
349
 
341
350
  .flyout
342
351
  background: #fff
@@ -358,6 +367,97 @@ div.panel
358
367
  p:last-child
359
368
  margin-bottom: 0
360
369
 
370
+
371
+ // Sub Navs
372
+ //---------------------------------------------------------------------------------------------------
373
+ // http://www.zurb.com/article/292/how-to-create-simple-and-effective-sub-na
374
+ dl.sub-nav
375
+ display: block
376
+ width: auto
377
+ overflow: hidden
378
+ margin: -4px 0 18px -9px
379
+ padding-top: 4px
380
+ dt, dd
381
+ float: left
382
+ display: inline
383
+ margin-left: 9px
384
+ margin-bottom: 4px
385
+ dt
386
+ color: #999
387
+ font-weight: normal
388
+ dd
389
+ a
390
+ text-decoration: none
391
+ +border-radius(12px)
392
+ &.active
393
+ a
394
+ background: $blue
395
+ color: $white
396
+ padding: 3px 9px
397
+
398
+
399
+ // Tooltips
400
+ //----------------------------------------------------------------------------------------------------
401
+
402
+ .has-tip
403
+ border-bottom: dotted 1px #ccc
404
+ cursor: help
405
+ font-weight: bold
406
+ color: #333
407
+ &:hover
408
+ border-bottom: dotted 1px #0593dc
409
+ color: #0192dd
410
+ &.opened
411
+ color: #0192DD !important
412
+ border-bottom: dotted 1px #0593DC !important
413
+ .tooltip
414
+ display: block
415
+ background: rgb(0,0,0)
416
+ background: rgba(0,0,0,0.85)
417
+ position: absolute
418
+ color: #fff
419
+ font-weight: bold
420
+ +font-size(12)
421
+ width: auto
422
+ padding: 5px 9px 7px 8px
423
+ z-index: 999
424
+ &>.nub
425
+ display: block
426
+ width: 0
427
+ height: 0
428
+ border: solid 6px
429
+ border-color: transparent transparent rgb(0,0,0) transparent
430
+ border-color: transparent transparent rgba(0,0,0,0.85) transparent
431
+ position: absolute
432
+ top: -12px
433
+ left: 10px
434
+ &.top>.nub
435
+ border-color: rgb(0,0,0) transparent transparent transparent
436
+ border-color: rgba(0,0,0,0.85) transparent transparent transparent
437
+ top: auto
438
+ bottom: -12px
439
+ &.left, .right, .left, .right
440
+ float: none !important
441
+ &.left>.nub
442
+ border-color: transparent transparent transparent rgb(0,0,0)
443
+ border-color: transparent transparent transparent rgba(0,0,0,0.85)
444
+ right: -12px
445
+ left: auto
446
+ &.right>.nub
447
+ border-color: transparent rgb(0,0,0) transparent transparent
448
+ border-color: transparent rgba(0,0,0,0.85) transparent transparent
449
+ right: auto
450
+ left: -12px
451
+ &.radius
452
+ +border-radius(6px)
453
+ .tap-to-close
454
+ display: block
455
+ font-size: 10px
456
+ font-size: 1.0rem
457
+ color: #888
458
+ font-weight: normal
459
+
460
+
361
461
  // Video
362
462
  //----------------------------------------------------------------------------------------------------
363
463
  // Mad props to http://www.alistapart.com/articles/creating-intrinsic-ratios-for-video/
@@ -5,6 +5,7 @@ $blue: #00a6fc
5
5
  $white: #fff
6
6
  $black: #000
7
7
  $red: #e91c21
8
+ $green: #56f812
8
9
  $orange: #cc4714
9
10
  $yellow: #ff0
10
11
  $black: #141414
@@ -35,7 +35,7 @@
35
35
  <div class="row">
36
36
  <div class="twelve columns">
37
37
  <h2>Welcome to Foundation</h2>
38
- <p>This is version 2.1.4 released on January 07, 2011</p>
38
+ <p>This is version 2.1.5 released on January 26, 2012</p>
39
39
 
40
40
  <hr />
41
41
  </div>
@@ -132,10 +132,11 @@
132
132
  <script src="javascripts/jquery.min.js"></script>
133
133
  <script src="javascripts/modernizr.foundation.js"></script>
134
134
  <script src="javascripts/jquery.reveal.js"></script>
135
- <script src="javascripts/jquery.orbit-1.3.0.js"></script>
135
+ <script src="javascripts/jquery.orbit-1.4.0.js"></script>
136
136
  <script src="javascripts/forms.jquery.js"></script>
137
137
  <script src="javascripts/jquery.customforms.js"></script>
138
138
  <script src="javascripts/jquery.placeholder.min.js"></script>
139
+ <script src="javascripts/jquery.tooltips.js"></script>
139
140
  <script src="javascripts/app.js"></script>
140
141
 
141
142
  </body>
@@ -56,36 +56,19 @@ $(document).ready(function () {
56
56
 
57
57
  /* DROPDOWN NAV ------------- */
58
58
 
59
- var currentFoundationDropdown = null;
60
- $('.nav-bar li a').each(function() {
61
- $(this).data('clicks', 0);
62
- });
63
- $('.nav-bar li a').on('click', function(e) {
59
+ var lockNavBar = false;
60
+ $('.nav-bar a.flyout-toggle').live('click', function(e) {
64
61
  e.preventDefault();
65
- if (currentFoundationDropdown !== $(this).index() || currentFoundationDropdown === null) {
66
- $(this).data('clicks', 0);
67
- currentFoundationDropdown = $(this).index();
68
- }
69
- $(this).data('clicks', ($(this).data('clicks') + 1));
70
- var f = $(this).siblings('.flyout');
71
- if (!f.is(':visible') && $(this).parent('.has-flyout').length > 1) {
72
- $('.nav-bar li .flyout').hide();
73
- f.show();
74
- } else if (($(this).data('clicks') > 1) || ($(this).parent('.has-flyout').length < 1)) {
75
- window.location = $(this).attr('href');
62
+ var flyout = $(this).siblings('.flyout');
63
+ if (lockNavBar === false) {
64
+ $('.nav-bar .flyout').not(flyout).slideUp(500);
65
+ flyout.slideToggle(500, function(){
66
+ lockNavBar = false;
67
+ });
76
68
  }
69
+ lockNavBar = true;
77
70
  });
78
- $('.nav-bar').on('click', function(e) {
79
- e.stopPropagation();
80
- if ($(e.target).parents().is('.flyout') || $(e.target).is('.flyout')) {
81
- e.preventDefault();
82
- }
83
- });
84
- // $('body').bind('touchend', function(e) {
85
- // if (!$(e.target).parents().is('.nav-bar') || !$(e.target).is('.nav-bar')) {
86
- // $('.nav-bar li .flyout').is(':visible').hide();
87
- // }
88
- // });
71
+
89
72
 
90
73
  /* DISABLED BUTTONS ------------- */
91
74
  /* Gives elements with a class of 'disabled' a return: false; */
@@ -1,5 +1,5 @@
1
1
  /*
2
- * jQuery Orbit Plugin 1.3.0
2
+ * jQuery Orbit Plugin 1.4.0
3
3
  * www.ZURB.com/playground
4
4
  * Copyright 2010, ZURB
5
5
  * Free to use under the MIT license.
@@ -9,6 +9,13 @@
9
9
 
10
10
  (function($) {
11
11
 
12
+ $.fn.findFirstImage = function () {
13
+ return this.first()
14
+ .find('img')
15
+ .andSelf().filter('img')
16
+ .first();
17
+ };
18
+
12
19
  var ORBIT = {
13
20
 
14
21
  defaults: {
@@ -106,6 +113,8 @@
106
113
  .addClass('orbit')
107
114
  .css({width: '1px', height: '1px'});
108
115
 
116
+ this.$slides.addClass('orbit-slide');
117
+
109
118
  this.setDimentionsFromLargestSlide();
110
119
  this.updateOptionsIfOnlyOneSlide();
111
120
  this.setupFirstSlide();
@@ -142,7 +151,8 @@
142
151
  self.$element.add(self.$wrapper).height(this.$slides.first().height());
143
152
  self.orbitWidth = this.$slides.first().width();
144
153
  self.orbitHeight = this.$slides.first().height();
145
- $fluidPlaceholder = this.$slides.first().clone();
154
+ $fluidPlaceholder = this.$slides.first().findFirstImage().clone();
155
+
146
156
 
147
157
  this.$slides.each(function () {
148
158
  var slide = $(this),
@@ -156,7 +166,7 @@
156
166
  if (slideHeight > self.$element.height()) {
157
167
  self.$element.add(self.$wrapper).height(slideHeight);
158
168
  self.orbitHeight = self.$element.height();
159
- $fluidPlaceholder = $(this).clone();
169
+ $fluidPlaceholder = $(this).findFirstImage().clone();
160
170
  }
161
171
  self.numberSlides += 1;
162
172
  });
@@ -215,7 +225,7 @@
215
225
 
216
226
  if (this.$timer.is(':hidden')) {
217
227
  this.clock = setInterval(function () {
218
- this.$element.trigger('orbit.next');
228
+ self.$element.trigger('orbit.next');
219
229
  }, this.options.advanceSpeed);
220
230
  } else {
221
231
  this.timerRunning = true;
@@ -0,0 +1,101 @@
1
+ $(document).ready(function () {
2
+ /* TOOLTIPS ---------- */
3
+ /* Positiong and options for adding tooltips */
4
+
5
+ function foundationTooltipsInit() {
6
+ var targets = $('.has-tip'),
7
+ tipTemplate = function(target, content) {
8
+ return '<span data-id="' + target + '" class="tooltip">' + content + '<span class="nub"></span></span>';
9
+ };
10
+ targets.each(function(){
11
+ var target = $(this),
12
+ content = target.attr('title'),
13
+ classes = target.attr('class'),
14
+ id = target.attr('id'),
15
+ tip = $(tipTemplate(id, content));
16
+ tip.addClass(classes).removeClass('has-tip').appendTo('body');
17
+ reposition(target, tip, classes);
18
+ tip.hide();
19
+ if (Modernizr.touch) {
20
+ tip.append('<span class="tap-to-close">tap to close </span>');
21
+ }
22
+ });
23
+ $(window).resize(function() {
24
+ var tips = $('.tooltip');
25
+ tips.each(function() {
26
+ var target = $('#' + $(this).data('id')),
27
+ tip = $(this),
28
+ classes = tip.attr('class');
29
+ reposition(target, tip, classes);
30
+ });
31
+
32
+ });
33
+
34
+ function reposition(target, tip, classes) {
35
+ var width = target.data('width'),
36
+ nub = tip.children('.nub'),
37
+ nubHeight = nub.outerHeight(),
38
+ nubWidth = nub.outerWidth();
39
+ tip.css({
40
+ 'top' : (target.offset().top + target.outerHeight() + 10),
41
+ 'left' : target.offset().left,
42
+ 'width' : width
43
+ });
44
+ function nubPos(nub, top, right, bottom, left) {
45
+ nub.css({
46
+ 'top' : top,
47
+ 'bottom' : bottom,
48
+ 'left' : left,
49
+ 'right' : right
50
+ });
51
+ }
52
+ nubPos(nub, -nubHeight, 'auto', 'auto', 10);
53
+ if ($(window).width() < 767) {
54
+ var row = target.parents('.row');
55
+ tip.width(row.outerWidth() - 20).css('left', row.offset().left);
56
+ nubPos(nub, -nubHeight, 'auto', 'auto', target.offset().left);
57
+ } else {
58
+ if (classes.indexOf('top') > -1) {
59
+ tip.css('top', target.offset().top - tip.outerHeight());
60
+ nubPos(nub, 'auto', 'auto', -nubHeight, nubWidth);
61
+ }
62
+ if (classes.indexOf('left') > -1) {
63
+ tip.css({
64
+ 'top' : target.offset().top - (target.outerHeight() / 2),
65
+ 'left' : target.offset().left - tip.outerWidth() - 10
66
+ }).children('.nub').css('top', (tip.outerHeight() / 2) - (nub.outerHeight() / 2));
67
+ nubPos(nub, ((tip.outerHeight() / 2) - (nub.outerHeight / 2)), -nubHeight, 'auto', 'auto');
68
+ } else if (classes.indexOf('right') > -1){
69
+ tip.css({
70
+ 'top' : target.offset().top - (target.outerHeight() / 2),
71
+ 'left' : target.offset().left + target.outerWidth() + 10
72
+ }).children('.nub').css('top', (tip.outerHeight() / 2) - (nub.outerHeight() / 2));
73
+ nubPos(nub, ((tip.outerHeight() / 2) - (nub.outerHeight / 2)), 'auto', 'auto', -nubHeight);
74
+ }
75
+ }
76
+ }
77
+ if (Modernizr.touch) {
78
+ $('.tooltip').live('click', function(e) {
79
+ e.preventDefault();
80
+ $(this).hide();
81
+ });
82
+ targets.live('click', function(){
83
+ targets.hover(function() {
84
+ $('span[data-id=' + $(this).attr('id') + ']').show();
85
+ targets.attr('title', "");
86
+ }, function() {
87
+ $('span[data-id=' + $(this).attr('id') + ']').hide();
88
+ });
89
+ });
90
+
91
+ } else {
92
+ targets.hover(function() {
93
+ $('span[data-id=' + $(this).attr('id') + ']').show();
94
+ targets.attr('title', "");
95
+ }, function() {
96
+ $('span[data-id=' + $(this).attr('id') + ']').hide();
97
+ });
98
+ }
99
+ }
100
+ foundationTooltipsInit();
101
+ });
@@ -4,13 +4,14 @@ description 'ZURB-foundation Compass Gem'
4
4
  stylesheet 'sass/app.sass', :to => 'app.sass', :media => "screen, projector, print"
5
5
  stylesheet 'sass/ie.sass', :to => 'ie.sass', :condition => "IE lt 9"
6
6
 
7
- # Javascrips
7
+ # Javascripts
8
8
  javascript 'javascripts/jquery.min.js', :to => 'jquery.min.js'
9
9
  javascript 'javascripts/modernizr.foundation.js', :to => 'modernizr.foundation.js'
10
10
  javascript 'javascripts/forms.jquery.js', :to => 'forms.jquery.js'
11
11
  javascript 'javascripts/jquery.customforms.js', :to => 'jquery.customforms.js'
12
12
  javascript 'javascripts/jquery.reveal.js', :to => 'jquery.reveal.js'
13
- javascript 'javascripts/jquery.orbit-1.3.0.js', :to => 'jquery.orbit-1.3.0.js'
13
+ javascript 'javascripts/jquery.orbit-1.4.0.js', :to => 'jquery.orbit-1.4.0.js'
14
+ javascript 'javascripts/jquery.tooltips.js', :to => 'jquery.tooltips.min.js'
14
15
  javascript 'javascripts/jquery.placeholder.min.js', :to => 'jquery.placeholder.min.js'
15
16
  javascript 'javascripts/app.js', :to => 'app.js'
16
17
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ZURB-foundation
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.4.1
4
+ version: 2.1.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-01-23 00:00:00.000000000Z
12
+ date: 2012-01-26 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: compass
16
- requirement: &70116249143380 !ruby/object:Gem::Requirement
16
+ requirement: &70108112873900 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
21
21
  version: 0.11.5
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70116249143380
24
+ version_requirements: *70108112873900
25
25
  description: ZURB Foundation ported over to work with the power of Compass.
26
26
  email: foundation@zurb.com
27
27
  executables: []
@@ -65,9 +65,10 @@ files:
65
65
  - templates/project/javascripts/forms.jquery.js
66
66
  - templates/project/javascripts/jquery.customforms.js
67
67
  - templates/project/javascripts/jquery.min.js
68
- - templates/project/javascripts/jquery.orbit-1.3.0.js
68
+ - templates/project/javascripts/jquery.orbit-1.4.0.js
69
69
  - templates/project/javascripts/jquery.placeholder.min.js
70
70
  - templates/project/javascripts/jquery.reveal.js
71
+ - templates/project/javascripts/jquery.tooltips.js
71
72
  - templates/project/javascripts/modernizr.foundation.js
72
73
  - templates/project/manifest.rb
73
74
  - templates/project/MIT-LICENSE.txt