Browse Source

Merge remote-tracking branch 'upstream/master'

Former-commit-id: 4a599c7a66
Former-commit-id: 0209d0860c
pull/258/head
deneuxa 11 years ago
parent
commit
a0dbb982f9
3 changed files with 4 additions and 7 deletions
  1. 4
      node/src/documents/collections/menu.html.eco
  2. 5
      src/modules/checkbox.js
  3. 2
      src/modules/dropdown.less

4
node/src/documents/collections/menu.html.eco

@ -58,7 +58,7 @@ type : 'UI Collection'
<div class="example"> <div class="example">
<h4 class="ui header">Vertical Menu</h4> <h4 class="ui header">Vertical Menu</h4>
<p>A vertical menu displays elements vertically. This example uses multiple levels of menu depth.</p>
<p>A vertical menu displays elements vertically..</p>
<div class="ui ignore warning message"><i class="icon heart"></i> A vertical menu's width defaults to an arbitrary size. To have it fit your content more precisely use the fluid variation in conjunction with <a href="grid.html">ui grid</a>.</div> <div class="ui ignore warning message"><i class="icon heart"></i> A vertical menu's width defaults to an arbitrary size. To have it fit your content more precisely use the fluid variation in conjunction with <a href="grid.html">ui grid</a>.</div>
<div class="ui vertical menu"> <div class="ui vertical menu">
@ -165,7 +165,7 @@ type : 'UI Collection'
</div> </div>
<div class="example"> <div class="example">
<h4 class="ui header">Tiered Vertical Menu</h4>
<h4 class="ui header">Vertical Menu w/ Sub Menus</h4>
<p>A tiered menu can show the sub-sections available as part of an activated section.</p> <p>A tiered menu can show the sub-sections available as part of an activated section.</p>
<div class="ui vertical menu"> <div class="ui vertical menu">
<div class="item"> <div class="item">

5
src/modules/checkbox.js

@ -104,7 +104,7 @@ $.fn.checkbox = function(parameters) {
}, },
enable: function() { enable: function() {
module.debug('Enabling checkbox');
module.debug('Enabling checkbox', $input);
$input $input
.prop('checked', true) .prop('checked', true)
; ;
@ -218,9 +218,6 @@ $.fn.checkbox = function(parameters) {
if(moduleSelector) { if(moduleSelector) {
title += ' \'' + moduleSelector + '\''; title += ' \'' + moduleSelector + '\'';
} }
if($allModules.size() > 1) {
title += ' ' + '(' + $allModules.size() + ')';
}
if( (console.group !== undefined || console.table !== undefined) && performance.length > 0) { if( (console.group !== undefined || console.table !== undefined) && performance.length > 0) {
console.groupCollapsed(title); console.groupCollapsed(title);
if(console.table) { if(console.table) {

2
src/modules/dropdown.less

@ -172,7 +172,7 @@
/* Opposite on last menu on right */ /* Opposite on last menu on right */
.ui.menu .right.menu .dropdown:last-child .menu, .ui.menu .right.menu .dropdown:last-child .menu,
.ui.button > .ui.dropdown:last-child .menu {
.ui.buttons > .ui.dropdown:last-child .menu {
left: auto; left: auto;
right: 0px; right: 0px;
} }

Loading…
Cancel
Save