diff --git a/server/documents/hotfix.html.eco b/server/documents/hotfix.html.eco index f39f83724..1f6db5fbe 100755 --- a/server/documents/hotfix.html.eco +++ b/server/documents/hotfix.html.eco @@ -6,66 +6,338 @@ title : 'Test Page' type : 'Library' --- <%- @partial('header') %> - -
-without form : -
- -
- - -
-
-

-with ui form and with input icon: +
+
+
+ + +
+
+
+ -
-
- -
- - +

+ Issue #803 +
http://jsfiddle.net/eiriarte/X4PPF/
+

+ +
+ +

+ List inside accordion +
.content inherits padding from accordion content
+

+
+
Title 1
+
+
+
+ +
+
Header 1
+
Description 1
+
+
+
+ +
+
Header 2
+
Description 2
+
+
+
+ +
+
Header 3
+
Description 3
+
+
+
+
Title 2
+
Content 2
+
+

+ List icon inside divided list +
+ .list inherits negative margin from submenus in divided list +
+ Excludes list icon +
+
+

+
+
+
+ +
+
Header 1
+
Description 1
+
+
+
+ +
+
Header 2
+
Description 2
+
+
+
+ +
+
Header 3
+
Description 3
+
+
+
+
+ +
+ + +

+ Issue #791 +
http://jsfiddle.net/mL3c5/1/
+

+
+
+
+ + + Size + +
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+
+ + + Colors + +
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+
+ + +
-
- -
-
-with ui form and without input icon -
-
- - +

+ Semantic-UI example +
http://semantic-ui.com/modules/accordion.html
+

+
+

Nested

+
+
+ + Level 1 +
+
+

Welcome to level 1 where sub content formatted as its own accordion.

+
+
+ + Level 1A +
+
+

Level 1A Contents

+
+
+ + Level 1A-A +
+
+ Level 1A-A Contents +
+
+ + Level 1A-B +
+
+ Level 1A-B Contents +
+
+
+
+ + Level 1B +
+
+ Level 1B Contents +
+
+ + Level 1C +
+
+ Level 1C Contents +
+
+
+
+ + Level 2 +
+
+

Welcome to level 2 where content is formatted without nested accordions

+
+ + Level 2A +
+
+

Level 2A Contents

+
+ + Level 2A-A +
+
+ Level 2A-A Contents +
+
+ + Level 2A-B +
+
+ Level 2A-B Contents +
+
+
+ + Level 2B +
+
+ Level 2B Contents +
+
+ + Level 2C +
+
+ Level 2C Contents
- +
+
+
+

Form

+
+
+
+
+ + +
+
+ + +
+
+
+
+ + Optional Details +
+
+ + +
+
+
Sign Up
+
+
+ + +
+ + -
\ No newline at end of file diff --git a/src/modules/accordion.js b/src/modules/accordion.js index 69ff0d553..90dde103c 100755 --- a/src/modules/accordion.js +++ b/src/modules/accordion.js @@ -129,7 +129,8 @@ $.fn.accordion = function(parameters) { var $activeTitle = $title.eq(index), $activeContent = $activeTitle.next($content), - $previousTitle = $activeTitle.siblings(selector.title).filter('.' + className.active), + $others = module.is.menu() ? $activeTitle.parent().siblings(selector.item).find(selector.title) : $activeTitle.siblings(selector.title); + $previousTitle = $others.filter('.' + className.active), $previousContent = $previousTitle.next($title), contentIsOpen = ($previousTitle.size() > 0) ; @@ -205,7 +206,11 @@ $.fn.accordion = function(parameters) { }) ; }, - + is: { + menu: function () { + return $module.hasClass(className.menu); + } + }, setting: function(name, value) { if( $.isPlainObject(name) ) { $.extend(true, settings, name); @@ -405,12 +410,15 @@ $.fn.accordion.settings = { }, className : { - active : 'active' + active : 'active', + menu : 'menu', }, selector : { title : '.title', - content : '.content' + content : '.content', + menu : '.menu', + item : '.item', } diff --git a/src/modules/accordion.less b/src/modules/accordion.less index 63f353b35..593f54d89 100755 --- a/src/modules/accordion.less +++ b/src/modules/accordion.less @@ -62,7 +62,8 @@ /* Content */ -.ui.accordion .content, +.ui.accordion > .content, +.ui.accordion .content > .content, .ui.accordion .accordion .content { display: none; margin: 0em; @@ -122,6 +123,10 @@ padding: 0em; } +.ui.accordion.menu .content{ + display: none; +} + /******************************* Types diff --git a/src/views/list.less b/src/views/list.less index ea4efff64..941b69c30 100755 --- a/src/views/list.less +++ b/src/views/list.less @@ -421,7 +421,7 @@ ol.ui.horizontal.list li:before, } /* Sub Menu */ -.ui.divided.list:not(.horizontal) .list { +.ui.divided.list:not(.horizontal) .list:not(.icon) { margin-left: -0.5em; margin-right: -0.5em; }