Merge branch 'master' of github.com:Semantic-Org/Semantic-UI into next

RELEASE-NOTES.md

@@ -1,5 +1,15 @@
 ## RELEASE NOTES
 
+### Version 1.5.2 - January 02, 2015
+
+**Bugs**
+- **Sidebar** - Fix bug with `useLegacy` introduced in `1.5.1`
+
+### Version 1.5.1 - January 01, 2015
+
+**Bugs**
+- **Button** - Fixed vertical alignment of ``ui animated button``
+- **Search** - Fixed issue with local search returning all results due to improper regexp
 
 ### Version 1.5.0 - December 30, 2014
 

dist/components/button.css

@@ -218,6 +218,7 @@
 .ui.animated.button {
   position: relative;
   overflow: hidden;
+  vertical-align: middle;
   padding-right: 0em !important;
 }
 .ui.animated.button .content {

dist/components/search.js

@@ -305,7 +305,7 @@ $.fn.search = function(parameters) {
                   if( content[field].match(searchRegExp) ) {
                     results.push(content);
                   }
-                  else if( settings.searchFullText && content[field].match(content[field]) ) {
+                  else if( settings.searchFullText && content[field].match(fullTextRegExp) ) {
                     fullTextResults.push(content);
                   }
                 }

dist/components/sidebar.js

@@ -83,7 +83,7 @@ $.fn.sidebar = function(parameters) {
           transitionEvent = module.get.transitionEvent();
 
           // cache on initialize
-          if( module.is.legacy() || settings.legacy) {
+          if( ( settings.useLegacy == 'auto' && module.is.legacy() ) || settings.useLegacy === true) {
             settings.transition = 'overlay';
             settings.useLegacy = true;
           }
@@ -331,7 +331,7 @@ $.fn.sidebar = function(parameters) {
 
         show: function(callback) {
           var
-            animateMethod = (settings.useLegacy)
+            animateMethod = (settings.useLegacy === true)
               ? module.legacyPushPage
               : module.pushPage
           ;
@@ -366,7 +366,7 @@ $.fn.sidebar = function(parameters) {
 
         hide: function(callback) {
           var
-            animateMethod = (settings.useLegacy)
+            animateMethod = (settings.useLegacy === true)
               ? module.legacyPullPage
               : module.pullPage
           ;
@@ -991,7 +991,7 @@ $.fn.sidebar.settings = {
   scrollLock        : false,
   returnScroll      : false,
 
-  useLegacy         : false,
+  useLegacy         : 'auto',
   duration          : 500,
   easing            : 'easeInOutQuint',
 

dist/semantic.css

@@ -849,6 +849,7 @@ a:hover {
 .ui.animated.button {
   position: relative;
   overflow: hidden;
+  vertical-align: middle;
   padding-right: 0em !important;
 }
 

dist/semantic.js

@@ -8590,7 +8590,7 @@ $.fn.search = function(parameters) {
                   if( content[field].match(searchRegExp) ) {
                     results.push(content);
                   }
-                  else if( settings.searchFullText && content[field].match(content[field]) ) {
+                  else if( settings.searchFullText && content[field].match(fullTextRegExp) ) {
                     fullTextResults.push(content);
                   }
                 }
@@ -10085,7 +10085,7 @@ $.fn.sidebar = function(parameters) {
           transitionEvent = module.get.transitionEvent();
 
           // cache on initialize
-          if( module.is.legacy() || settings.legacy) {
+          if( ( settings.useLegacy == 'auto' && module.is.legacy() ) || settings.useLegacy === true) {
             settings.transition = 'overlay';
             settings.useLegacy = true;
           }
@@ -10333,7 +10333,7 @@ $.fn.sidebar = function(parameters) {
 
         show: function(callback) {
           var
-            animateMethod = (settings.useLegacy)
+            animateMethod = (settings.useLegacy === true)
               ? module.legacyPushPage
               : module.pushPage
           ;
@@ -10368,7 +10368,7 @@ $.fn.sidebar = function(parameters) {
 
         hide: function(callback) {
           var
-            animateMethod = (settings.useLegacy)
+            animateMethod = (settings.useLegacy === true)
               ? module.legacyPullPage
               : module.pullPage
           ;
@@ -10993,7 +10993,7 @@ $.fn.sidebar.settings = {
   scrollLock        : false,
   returnScroll      : false,
 
-  useLegacy         : false,
+  useLegacy         : 'auto',
   duration          : 500,
   easing            : 'easeInOutQuint',
 

gulpfile.js

@@ -139,9 +139,9 @@ var
 
     // relative paths
     assetPaths = {
-      uncompressed : path.relative(output.uncompressed, output.themes),
-      compressed   : path.relative(output.compressed, output.themes),
-      packaged     : path.relative(output.packaged, output.themes)
+      uncompressed : path.relative(output.uncompressed, output.themes).replace(/\\/g,'/'),
+      compressed   : path.relative(output.compressed, output.themes).replace(/\\/g,'/'),
+      packaged     : path.relative(output.packaged, output.themes).replace(/\\/g,'/')
     };
 
     // add base to values
@@ -490,7 +490,7 @@ gulp.task('install', 'Set-up project for first time', function () {
         siteVariable      = /@siteFolder .*\'(.*)/mg,
         siteDestination   = answers.site || config.folders.site,
 
-        pathToSite        = path.relative(path.resolve(config.folders.theme), path.resolve(siteDestination)),
+        pathToSite        = path.relative(path.resolve(config.folders.theme), path.resolve(siteDestination)).replace(/\\/g,'/'),
         sitePathReplace   = "@siteFolder   : '" + pathToSite + "/';",
 
         configExists      = fs.existsSync(config.files.config),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "semantic-ui",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "title": "Semantic UI",
   "description": "Semantic empowers designers and developers by creating a shared vocabulary for UI.",
   "homepage": "http://www.semantic-ui.com",

src/definitions/modules/sidebar.js

@@ -83,7 +83,7 @@ $.fn.sidebar = function(parameters) {
           transitionEvent = module.get.transitionEvent();
 
           // cache on initialize
-          if( (module.useLegacy == 'auto' && module.is.legacy()) || settings.useLegacy) {
+          if( ( settings.useLegacy == 'auto' && module.is.legacy() ) || settings.useLegacy === true) {
             settings.transition = 'overlay';
             settings.useLegacy = true;
           }
@@ -331,7 +331,7 @@ $.fn.sidebar = function(parameters) {
 
         show: function(callback) {
           var
-            animateMethod = (settings.useLegacy)
+            animateMethod = (settings.useLegacy === true)
               ? module.legacyPushPage
               : module.pushPage
           ;
@@ -366,7 +366,7 @@ $.fn.sidebar = function(parameters) {
 
         hide: function(callback) {
           var
-            animateMethod = (settings.useLegacy)
+            animateMethod = (settings.useLegacy === true)
               ? module.legacyPullPage
               : module.pullPage
           ;

src/themes/default/elements/button.variables

@@ -258,6 +258,7 @@
 @floatedMargin: 0.25em;
 
 /* Animated */
+@animatedVerticalAlign: middle;
 @animationDuration: 0.3s;
 @animationEasing: ease;
 @fadeScaleHigh: 1.5;