Skip to content

Commit cf4f291

Browse files
committed
Merge branch 'next' of github.com:Semantic-Org/Semantic-UI-Docs
2 parents 3e0620b + d2de901 commit cf4f291

File tree

3 files changed

+27
-47
lines changed

3 files changed

+27
-47
lines changed

docpad.coffee

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ docpadConfig = {
2929
# Here are some old site urls that you would like to redirect from
3030
oldUrls: [],
3131

32-
version: "2.4.0",
32+
version: "2.4.1",
3333

3434
branch: "master",
3535

server/documents/hotfix.html

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,19 @@
77
type : 'Library'
88
---
99

10-
<div class="ui menu">
11-
<div class="right menu">
12-
<div class="item">
13-
<div class="ui floating icon labeled button dropdown">
14-
<i class="filter icon"></i>
15-
<span class="text">Dropdown</span>
16-
<div class="menu">
17-
<div class="header">
18-
<i class="filter icon"></i> Dropdown
19-
</div>
20-
<div class="item">
21-
Loooooooooooooong item 1
22-
</div>
23-
<div class="item">
24-
Item 2
25-
</div>
26-
<div class="item">
27-
Item 3
28-
</div>
29-
</div>
30-
</div>
31-
</div>
32-
</div>
33-
10+
<div class="ui container">
11+
<div class="ui fluid selection dropdown">
12+
<input name="template" type="hidden">
13+
<i class="dropdown icon"></i>
14+
<div class="default text">Template</div>
15+
<div class="menu">
16+
<div class="item" >Item1</div>
17+
<div class="item" >Item2</div>
18+
</div>
3419
</div>
3520
<script>
3621
$(document).ready(function() {
37-
$('.ui.dropdown')
38-
.dropdown({
39-
allowCategorySelection: true
40-
});
22+
$('.ui.dropdown').dropdown({transition: 'drop', on: 'hover', clearable: true,});
4123
});
4224
</script>
4325

server/files/javascript/docs.js

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -462,25 +462,23 @@ semantic.ready = function() {
462462
.html($sticky)
463463
.prependTo($container)
464464
;
465-
requestAnimationFrame(function() {
466-
$sticky.sticky({
467-
silent: true,
468-
context: $container,
469-
container: $('html'),
470-
offset: 30
471-
});
472-
$followMenu
473-
.accordion({
474-
exclusive: false,
475-
animateChildren: false,
476-
onChange: function() {
477-
$('.ui.sticky').sticky('refresh');
478-
}
479-
})
480-
.find('.menu a[href], .title[href]')
481-
.on('click', handler.scrollTo)
482-
;
465+
$sticky.sticky({
466+
silent: true,
467+
context: $container,
468+
container: $('html'),
469+
offset: 30
483470
});
471+
$followMenu
472+
.accordion({
473+
exclusive: false,
474+
animateChildren: false,
475+
onChange: function() {
476+
$('.ui.sticky').sticky('refresh');
477+
}
478+
})
479+
.find('.menu a[href], .title[href]')
480+
.on('click', handler.scrollTo)
481+
;
484482
},
485483

486484
scrollTo: function(event) {

0 commit comments

Comments
 (0)