Updated distribution to version 2.1.4

Semantic-Org · Sep 13, 2015 · 1884dd3 · 1884dd3
1 parent 5c88d4a
commit 1884dd3
Show file tree

Hide file tree

Showing 18 changed files with 228 additions and 126 deletions.
diff --git a/definitions/behaviors/api.js b/definitions/behaviors/api.js
@@ -1103,7 +1103,7 @@ $.api.settings = {
     missingSerialize  : 'jquery-serialize-object is required to add form data to an existing data object',
     missingURL        : 'No URL specified for api event',
     noReturnedValue   : 'The beforeSend callback must return a settings object, beforeSend ignored.',
-    noStorage         : 'Caching respopnses locally requires session storage',
+    noStorage         : 'Caching responses locally requires session storage',
     parseError        : 'There was an error parsing your request',
     requiredParameter : 'Missing a required URL parameter: ',
     statusMessage     : 'Server gave an error: ',

diff --git a/definitions/behaviors/form.js b/definitions/behaviors/form.js
diff --git a/definitions/collections/form.less b/definitions/collections/form.less
@@ -426,7 +426,7 @@
 }
 
 /*--------------------
-        Warning
+        Error
 ---------------------*/
 
 /* On Form */

diff --git a/definitions/collections/grid.less b/definitions/collections/grid.less
@@ -1170,6 +1170,7 @@
 
 /* Top Aligned */
 .ui[class*="top aligned"].grid > .column:not(.row),
+.ui[class*="top aligned"].grid > .row > .column,
 .ui.grid > [class*="top aligned"].row > .column,
 .ui.grid > [class*="top aligned"].column:not(.row),
 .ui.grid > .row > [class*="top aligned"].column {
@@ -1180,6 +1181,7 @@
 
 /* Middle Aligned */
 .ui[class*="middle aligned"].grid > .column:not(.row),
+.ui[class*="middle aligned"].grid > .row > .column,
 .ui.grid > [class*="middle aligned"].row > .column,
 .ui.grid > [class*="middle aligned"].column:not(.row),
 .ui.grid > .row > [class*="middle aligned"].column {
@@ -1190,6 +1192,7 @@
 
 /* Bottom Aligned */
 .ui[class*="bottom aligned"].grid > .column:not(.row),
+.ui[class*="bottom aligned"].grid > .row > .column,
 .ui.grid > [class*="bottom aligned"].row > .column,
 .ui.grid > [class*="bottom aligned"].column:not(.row),
 .ui.grid > .row > [class*="bottom aligned"].column {
@@ -1222,7 +1225,8 @@
 -----------------------*/
 
 /* Left Aligned */
-.ui[class*="left aligned"].grid .column,
+.ui[class*="left aligned"].grid > .column,
+.ui[class*="left aligned"].grid > .row > .column,
 .ui.grid > [class*="left aligned"].row > .column,
 .ui.grid > [class*="left aligned"].column.column,
 .ui.grid > .row > [class*="left aligned"].column {
@@ -1231,7 +1235,8 @@
 }
 
 /* Center Aligned */
-.ui[class*="center aligned"].grid .column,
+.ui[class*="center aligned"].grid > .column,
+.ui[class*="center aligned"].grid > .row > .column,
 .ui.grid > [class*="center aligned"].row > .column,
 .ui.grid > [class*="center aligned"].column.column,
 .ui.grid > .row > [class*="center aligned"].column {
@@ -1243,7 +1248,8 @@
 }
 
 /* Right Aligned */
-.ui[class*="right aligned"].grid .column,
+.ui[class*="right aligned"].grid > .column,
+.ui[class*="right aligned"].grid > .row > .column,
 .ui.grid > [class*="right aligned"].row > .column,
 .ui.grid > [class*="right aligned"].column.column,
 .ui.grid > .row > [class*="right aligned"].column {
@@ -1252,18 +1258,14 @@
 }
 
 /* Justified */
-.ui.justified.grid,
-.ui.justified.grid > .row > .column,
 .ui.justified.grid > .column,
-.ui.grid .justified.column,
-.ui.grid > .justified.row > .column {
+.ui.justified.grid > .row > .column,
+.ui.grid > .justified.row > .column,
+.ui.grid > .justified.column.column,
+.ui.grid > .row > .justified.column {
   text-align: justify;
   hyphens: auto;
 }
-.ui.grid .justified.column {
-  text-align: justify !important;
-  hyphens: auto !important;
-}
 
 /*----------------------
          Colored

diff --git a/definitions/collections/menu.less b/definitions/collections/menu.less
@@ -377,7 +377,7 @@
 
 @media only screen and (max-width: @largestMobileScreen) {
   .ui.menu > .ui.container {
-    width: 100%;
+    width: 100% !important;
     margin-left: 0em !important;
     margin-right: 0em !important;
   }

diff --git a/definitions/collections/message.less b/definitions/collections/message.less
@@ -76,33 +76,33 @@
 }
 
 /* List */
-.ui.message ul.list {
+.ui.message .list:not(.ui) {
   text-align: left;
   padding: 0em;
   opacity: @listOpacity;
   list-style-position: @listStylePosition;
   margin: @listMargin 0em 0em;
 }
-.ui.message ul.list:first-child {
+.ui.message .list:not(.ui):first-child {
   margin-top: 0em;
 }
-.ui.message ul.list:last-child {
+.ui.message .list:not(.ui):last-child {
   margin-bottom: 0em;
 }
-.ui.message ul.list li {
+.ui.message .list:not(.ui) li {
   position: relative;
   list-style-type: none;
   margin: 0em 0em @listItemMargin @listItemIndent;
   padding: 0em;
 }
-.ui.message ul.list li:before {
+.ui.message .list:not(.ui) li:before {
   position: absolute;
   content: '•';
   left: -1em;
   height: 100%;
   vertical-align: baseline;
 }
-.ui.message ul.list li:last-child {
+.ui.message .list:not(.ui) li:last-child {
   margin-bottom: 0em;
 }
 

diff --git a/definitions/elements/button.less b/definitions/elements/button.less
@@ -834,10 +834,11 @@
   border-radius: 0px;
   border-top-left-radius: inherit;
   border-bottom-left-radius: inherit;
+  text-align: center;
 
+  margin: @labeledIconMargin;
   width: @labeledIconWidth;
   background-color: @labeledIconBackgroundColor;
-  text-align: center;
   color: @labeledIconColor;
   box-shadow: @labeledIconLeftShadow;
 }

diff --git a/definitions/elements/label.less b/definitions/elements/label.less
@@ -25,7 +25,6 @@
 
 .ui.label {
   display: inline-block;
-  white-space: nowrap;
   line-height: 1;
   vertical-align: @verticalAlign;
 

diff --git a/definitions/elements/list.less b/definitions/elements/list.less
@@ -670,7 +670,6 @@ ol.ui.horizontal.list li:before,
   margin: 0em @horizontalOrderedCountDistance 0em 0em;
 }
 
-
 /*-------------------
        Divided
 --------------------*/

diff --git a/definitions/elements/segment.less b/definitions/elements/segment.less
@@ -86,7 +86,8 @@
 
 /* Grid */
 .ui.page.grid.segment,
-.ui.grid .ui.segment.column {
+.ui.grid > .row > .ui.segment.column,
+.ui.grid > .ui.segment.column {
   padding-top: @pageGridMargin;
   padding-bottom: @pageGridMargin;
 }

diff --git a/definitions/globals/site.js b/definitions/globals/site.js
@@ -81,7 +81,7 @@ $.site = $.fn.site = function(parameters) {
       requestAnimationFrame: function() {
         module.debug('Normalizing requestAnimationFrame');
         if(window.requestAnimationFrame === undefined) {
-          module.debug('RequestAnimationFrame not available, normailizing event');
+          module.debug('RequestAnimationFrame not available, normalizing event');
           window.requestAnimationFrame = window.requestAnimationFrame
             || window.mozRequestAnimationFrame
             || window.webkitRequestAnimationFrame
@@ -484,4 +484,4 @@ $.extend($.expr[ ":" ], {
 });
 
 
-})( jQuery, window , document );
+})( jQuery, window , document );
diff --git a/definitions/modules/dropdown.js b/definitions/modules/dropdown.js
@@ -321,6 +321,10 @@ $.fn.dropdown = function(parameters) {
               if($input.is('[multiple]')) {
                 module.set.multiple();
               }
+              if ($input.prop('disabled')) {
+                module.debug('Disabling dropdown')
+                $module.addClass(className.disabled)
+              }
               $input
                 .removeAttr('class')
                 .detach()
@@ -821,7 +825,7 @@ $.fn.dropdown = function(parameters) {
               module.hide();
             }
           },
-          // prevents focus callback from occuring on mousedown
+          // prevents focus callback from occurring on mousedown
           mousedown: function() {
             activated = true;
           },
@@ -1148,6 +1152,7 @@ $.fn.dropdown = function(parameters) {
                 hasSubMenu           = ($subMenu.length> 0),
                 hasSelectedItem      = ($selectedItem.length > 0),
                 selectedIsSelectable = ($selectedItem.not(selector.unselectable).length > 0),
+                delimiterPressed     = (pressedKey == keys.delimiter && settings.allowAdditions && module.is.multiple()),
                 $nextItem,
                 isSubMenuItem,
                 newIndex
@@ -1157,7 +1162,7 @@ $.fn.dropdown = function(parameters) {
               if( module.is.visible() ) {
 
                 // enter (select or open sub-menu)
-                if(pressedKey == keys.enter || pressedKey == keys.delimiter) {
+                if(pressedKey == keys.enter || delimiterPressed) {
                   if(pressedKey == keys.enter && hasSelectedItem && hasSubMenu && !settings.allowCategorySelection) {
                     module.verbose('Pressed enter on unselectable category, opening sub menu');
                     pressedKey = keys.rightArrow;
@@ -1274,7 +1279,7 @@ $.fn.dropdown = function(parameters) {
               }
               else {
                 // delimiter key
-                if(pressedKey == keys.delimiter) {
+                if(delimiterPressed) {
                   event.preventDefault();
                 }
                 // down arrow (open menu)
@@ -3229,7 +3234,7 @@ $.fn.dropdown.settings = {
 
   maxSelections          : false,      // When set to a number limits the number of selections to this count
   useLabels              : true,       // whether multiple select should filter currently active selections from choices
-  delimiter              : ',',        // when multiselect uses normal <input> the values will be delmited with this character
+  delimiter              : ',',        // when multiselect uses normal <input> the values will be delimited with this character
 
   showOnFocus            : true,       // show menu on focus
   allowTab               : true,       // add tabindex to element

diff --git a/definitions/modules/search.js b/definitions/modules/search.js
@@ -350,7 +350,7 @@ $.fn.search = function(parameters) {
               $.each(results, function(index, category) {
                 if($.isArray(category.results)) {
                   result = module.search.object(value, category.results, lookupFields)[0];
-                  // dont continue searching if a result is found
+                  // don't continue searching if a result is found
                   if(result) {
                     return false;
                   }

diff --git a/definitions/modules/tab.js b/definitions/modules/tab.js
@@ -107,7 +107,7 @@ $.fn.tab = function(parameters) {
 
         bind: {
           events: function() {
-            // if using $.tab dont add events
+            // if using $.tab don't add events
             if( !$.isWindow( element ) ) {
               module.debug('Attaching tab activation events to element', $module);
               $module
@@ -895,4 +895,4 @@ $.fn.tab.settings = {
 
 };
 
-})( jQuery, window , document );
+})( jQuery, window , document );
diff --git a/package.js b/package.js
@@ -5,7 +5,7 @@ var
 Package.describe({
   name    : 'semantic:ui',
   summary : 'Semantic UI - LESS Release of Semantic UI',
-  version : '2.1.3',
+  version : '2.1.4',
   git     : 'git://github.com/Semantic-Org/Semantic-UI-LESS.git',
 });
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "semantic-ui-less",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "title": "Semantic UI",
   "description": "LESS Only distribution of Semantic UI",
   "homepage": "http://www.semantic-ui.com",

diff --git a/theme.less b/theme.less
@@ -19,7 +19,7 @@
 @import "@{themesFolder}/@{site}/globals/site.variables";
 
 /* Component's site.variables */
-@import "@{themesFolder}/@{theme}/globals/site.variables";
+@import (optional) "@{themesFolder}/@{theme}/globals/site.variables";
 
 /* Site theme site.variables */
 @import (optional) "@{siteFolder}/globals/site.variables";

diff --git a/themes/default/elements/button.variables b/themes/default/elements/button.variables
@@ -167,6 +167,7 @@
 @labeledLabelBorderColor: @borderColor;
 @labeledLabelBorderOffset: -@borderBoxShadowWidth;
 @labeledTagLabelSize: 1.85em; /* hypotenuse of triangle */
+@labeledIconMargin: 0em;
 
 /* Labeled Icon */
 @labeledIconWidth: 1em + (@verticalPadding * 2);
-Original file line number
+Diff line change
@@ Expand Up / @@ -426,7 +426,7 @@ @@
     }
     /*--------------------
-            Warning
+            Error
     ---------------------*/
     /* On Form */
@@ Expand Down @@