Fixed collapse internal divs in accordion

walkeren · Dec 9, 2012 · c69da52 · c69da52
1 parent 613f079
commit c69da52
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.15.8.9
+
+Fixed collapse internal div's in accordion
+
 ## 0.15.8.8
 
 Disable IE10 native clear and reveal buttons in input[text, password]

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ x.x.x.x
 
 # Current Version
 
-## 0.15.8.8
+## 0.15.8.9
 
 See details of definition on [metroui.org.ua](http://metroui.org.ua)
 

diff --git a/javascript/accordion.js b/javascript/accordion.js
@@ -6,14 +6,14 @@
         var $this = $(this)
             , $li = $this.children("li")
             , $triggers = $li.children("a")
-            , $frames = $this.find("li div")
+            , $frames = $li.children("div")
             ;
 
         var initTriggers = function(triggers){
             triggers.on('click', function(e){
                 e.preventDefault();
                 var $a = $(this)
-                  , target = $($a.parent('li').children("div"));
+                  , target = $a.parent('li').children("div");
 
                 if ( $a.parent('li').hasClass('active') ) {
                     target.slideUp();

diff --git a/less/forms.less b/less/forms.less
@@ -345,7 +345,6 @@
                 font-size: 12pt;
                 position: absolute;
                 #font > .normal;
-                display: inline-block;
             }
 
 
@@ -356,7 +355,6 @@
             &:active {
                 background-color: #000;
 
-
                 &:before {
                     color: #fff;
                 }

diff --git a/public/accordion.php b/public/accordion.php
@@ -18,13 +18,19 @@
                         <div>
                             <h3>frame 1</h3>
                             Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur porta condimentum sem sed commodo.
+                            <p>
+                                subcontent 1
+                            </p>
                         </div>
                     </li>
                     <li class="active">
                         <a href="#">frame 2</a>
                         <div>
                             <h3>frame 2</h3>
                             Curabitur porta condimentum sem sed commodo. Praesent vestibulum, libero eget lacinia pretium, metus augue dapibus odio, nec placerat mauris justo non ante.
+                            <div>
+                                subcontent 2
+                            </div>
                         </div>
                     </li>
                     <li>

diff --git a/public/css/modern.css b/public/css/modern.css
@@ -5169,6 +5169,8 @@ table.bordered tbody tr:last-child td {
   letter-spacing: 0.02em;
   line-height: 20px;
   display: inline-block;
+  height: 100%;
+  width: 100%;
 }
 .input-control.text .helper:hover,
 .input-control.password .helper:hover {

diff --git a/public/js/modern/accordion.js b/public/js/modern/accordion.js
@@ -6,14 +6,14 @@
         var $this = $(this)
             , $li = $this.children("li")
             , $triggers = $li.children("a")
-            , $frames = $this.find("li div")
+            , $frames = $li.children("div")
             ;
 
         var initTriggers = function(triggers){
             triggers.on('click', function(e){
                 e.preventDefault();
                 var $a = $(this)
-                  , target = $($a.parent('li').children("div"));
+                  , target = $a.parent('li').children("div");
 
                 if ( $a.parent('li').hasClass('active') ) {
                     target.slideUp();

diff --git a/public/version.phtml b/public/version.phtml
@@ -1,3 +1,3 @@
 <?php
 
-return "0.15.8.8";
+return "0.15.8.9";
diff --git a/public/windows8start.php b/public/windows8start.php
@@ -45,10 +45,11 @@ function Resize(){
         function AddMouseWheel(){
             $("body").mousewheel(function(event, delta){
                 var scroll_value = delta * 50;
-                if (!jQuery.browser.chrome) {
-                    document.documentElement.scrollLeft -= scroll_value;
-                } else {
+                if (jQuery.browser.webkit) {
                     this.scrollLeft -= scroll_value;
+
+                } else {
+                    document.documentElement.scrollLeft -= scroll_value;
                 }
                 return false;
             });