Browse Source

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

pull/1552/head
jlukic 10 years ago
parent
commit
3a98dc94d1
2 changed files with 3 additions and 2 deletions
  1. 1
      src/definitions/elements/button.less
  2. 4
      src/definitions/modules/sidebar.js

1
src/definitions/elements/button.less

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

4
src/definitions/modules/sidebar.js

@ -83,7 +83,7 @@ $.fn.sidebar = function(parameters) {
transitionEvent = module.get.transitionEvent(); transitionEvent = module.get.transitionEvent();
// cache on initialize // cache on initialize
if( module.is.legacy() || settings.legacy) {
if( (module.useLegacy == 'auto' && module.is.legacy()) || settings.useLegacy) {
settings.transition = 'overlay'; settings.transition = 'overlay';
settings.useLegacy = true; settings.useLegacy = true;
} }
@ -991,7 +991,7 @@ $.fn.sidebar.settings = {
scrollLock : false, scrollLock : false,
returnScroll : false, returnScroll : false,
useLegacy : false,
useLegacy : 'auto',
duration : 500, duration : 500,
easing : 'easeInOutQuint', easing : 'easeInOutQuint',

Loading…
Cancel
Save