Merge branch 'master' of github.com:jlukic/Semantic-UI into hotfix

build/less/collections/form.less

@@ -65,6 +65,7 @@
 
 .ui.form textarea,
 .ui.form input[type="text"],
+.ui.form input[type="email"],
 .ui.form input[type="date"],
 .ui.form input[type="password"],
 .ui.form .ui.input {
@@ -73,6 +74,7 @@
 
 .ui.form textarea,
 .ui.form input[type="text"],
+.ui.form input[type="email"],
 .ui.form input[type="date"],
 .ui.form input[type="password"] {
 
@@ -201,6 +203,8 @@
 ---------------------*/
 
 .ui.form input[type="text"]:focus,
+.ui.form input[type="date"]:focus,
+.ui.form input[type="email"]:focus,
 .ui.form input[type="password"]:focus,
 .ui.form textarea:focus {
   color: rgba(0, 0, 0, 0.85);
@@ -240,10 +244,12 @@
 }
 .ui.form .fields.error .field textarea,
 .ui.form .fields.error .field input[type="text"],
+.ui.form .fields.error .field input[type="email"],
 .ui.form .fields.error .field input[type="date"],
 .ui.form .fields.error .field input[type="password"],
 .ui.form .field.error textarea,
 .ui.form .field.error input[type="text"],
+.ui.form .field.error input[type="email"],
 .ui.form .field.error input[type="date"],
 .ui.form .field.error input[type="password"] {
   background-color: #FFFAFA;
@@ -263,6 +269,8 @@
 }
 .ui.form .field.error textarea:focus,
 .ui.form .field.error input[type="text"]:focus,
+.ui.form .field.error input[type="email"]:focus,
+.ui.form .field.error input[type="date"]:focus,
 .ui.form .field.error input[type="password"]:focus {
   border-color: rgba(255, 80, 80, 1);
   color: rgba(255, 80, 80, 1);
@@ -395,7 +403,10 @@
   color: #FFFFFF;
 }
 .ui.inverted.form .field.error textarea,
-.ui.inverted.form .field.error input[type="text"] {
+.ui.inverted.form .field.error input[type="text"],
+.ui.inverted.form .field.error input[type="date"],
+.ui.inverted.form .field.error input[type="email"],
+.ui.inverted.form .field.error input[type="password"]{
   background-color: #FFCCCC;
 }
 
@@ -527,6 +538,8 @@
 }
 .ui.small.form textarea,
 .ui.small.form input[type="text"],
+.ui.small.form input[type="email"],
+.ui.small.form input[type="date"],
 .ui.small.form input[type="password"],
 .ui.small.form label {
   font-size: 1em;

build/less/elements/basic.icon.less

@@ -458,6 +458,11 @@ i.basic.icon {
   font-size: 1em;
 }
 i.large.basic.icon {
+  font-size: 1.5em;
+  margin-right: 0.2em;
+  vertical-align: middle;
+}
+i.big.basic.icon {
   font-size: 2em;
   margin-right: 0.5em;
   vertical-align: middle;

build/less/elements/icon.less

@@ -755,6 +755,10 @@ i.icon {
   font-size: 1em;
 }
 i.large.icon {
+  font-size: 1.5em;
+  vertical-align: middle;
+}
+i.big.icon {
   font-size: 2em;
   vertical-align: middle;
 }

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

@@ -58,7 +58,7 @@ type        : 'UI Collection'
 
   <div class="example">
     <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 vertical menu">
@@ -165,7 +165,7 @@ type        : 'UI Collection'
   </div>
 
   <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>
     <div class="ui vertical menu">
       <div class="item">

src/collections/form.less

@@ -65,6 +65,7 @@
 
 .ui.form textarea,
 .ui.form input[type="text"],
+.ui.form input[type="email"],
 .ui.form input[type="date"],
 .ui.form input[type="password"],
 .ui.form .ui.input {
@@ -73,6 +74,7 @@
 
 .ui.form textarea,
 .ui.form input[type="text"],
+.ui.form input[type="email"],
 .ui.form input[type="date"],
 .ui.form input[type="password"] {
 
@@ -201,6 +203,8 @@
 ---------------------*/
 
 .ui.form input[type="text"]:focus,
+.ui.form input[type="email"]:focus,
+.ui.form input[type="date"]:focus,
 .ui.form input[type="password"]:focus,
 .ui.form textarea:focus {
   color: rgba(0, 0, 0, 0.85);
@@ -240,10 +244,12 @@
 }
 .ui.form .fields.error .field textarea,
 .ui.form .fields.error .field input[type="text"],
+.ui.form .fields.error .field input[type="email"],
 .ui.form .fields.error .field input[type="date"],
 .ui.form .fields.error .field input[type="password"],
 .ui.form .field.error textarea,
 .ui.form .field.error input[type="text"],
+.ui.form .field.error input[type="email"],
 .ui.form .field.error input[type="date"],
 .ui.form .field.error input[type="password"] {
   background-color: #FFFAFA;
@@ -263,6 +269,8 @@
 }
 .ui.form .field.error textarea:focus,
 .ui.form .field.error input[type="text"]:focus,
+.ui.form .field.error input[type="email"]:focus,
+.ui.form .field.error input[type="date"]:focus,
 .ui.form .field.error input[type="password"]:focus {
   border-color: rgba(255, 80, 80, 1);
   color: rgba(255, 80, 80, 1);
@@ -395,7 +403,10 @@
   color: #FFFFFF;
 }
 .ui.inverted.form .field.error textarea,
-.ui.inverted.form .field.error input[type="text"] {
+.ui.inverted.form .field.error input[type="text"],
+.ui.inverted.form .field.error input[type="email"],
+.ui.inverted.form .field.error input[type="date"],
+.ui.inverted.form .field.error input[type="password"]{
   background-color: #FFCCCC;
 }
 
@@ -527,6 +538,8 @@
 }
 .ui.small.form textarea,
 .ui.small.form input[type="text"],
+.ui.small.form input[type="email"],
+.ui.small.form input[type="date"],
 .ui.small.form input[type="password"],
 .ui.small.form label {
   font-size: 1em;

src/elements/basic.icon.less

@@ -458,6 +458,11 @@ i.basic.icon {
   font-size: 1em;
 }
 i.large.basic.icon {
+  font-size: 1.5em;
+  margin-right: 0.2em;
+  vertical-align: middle;
+}
+i.big.basic.icon {
   font-size: 2em;
   margin-right: 0.5em;
   vertical-align: middle;

src/elements/icon.less

@@ -755,6 +755,10 @@ i.icon {
   font-size: 1em;
 }
 i.large.icon {
+  font-size: 1.5em;
+  vertical-align: middle;
+}
+i.big.icon {
   font-size: 2em;
   vertical-align: middle;
 }

src/modules/checkbox.js

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

src/modules/dropdown.less

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