diff --git a/css/style.css b/css/style.css index 631522d3..bda5c4c2 100644 --- a/css/style.css +++ b/css/style.css @@ -1,5 +1,4 @@ html, body { - height: 100%; width: 100%; font-family: 'Source Sans Pro'; } @@ -15,9 +14,7 @@ body h5 { #slider { margin-left: auto; margin-right: auto; - /*margin-top: 2%;*/ padding: 5px; - /*background: #e8e8e8;*/ max-width: 750px; width: 100%; height: 100%; @@ -56,7 +53,6 @@ body .form-control { text-align: center; max-width: 240px; font-size: 25px; - /*font-weight: bold;*/ margin: -35px auto 0 auto; } diff --git a/js/app.js b/js/app.js index 693d53e1..fcdbe4e8 100644 --- a/js/app.js +++ b/js/app.js @@ -103,7 +103,7 @@ app = Sammy('#main', function (sam) { if (store.get('slide') == 'back') { $('#slideBack').css('display', 'inline-block').css('margin-left', '-'+ 2*blockSize +'px'); rendered.appendTo($('#slideBack')); - $('#main').animate({marginLeft: blockSize +'px'}, 500, function() { + $('#main').animate({marginLeft: blockSize +'px'}, 300, function() { $('#main').html($('#slideBack').html()); $('#main').css('margin-left', '0'); leSwap(); @@ -112,7 +112,7 @@ app = Sammy('#main', function (sam) { } else if (store.get('slide') == 'to') { $('#slideTo').css('display', 'inline-block'); rendered.appendTo($('#slideTo')); - $('#main').animate({marginLeft: '-'+ blockSize +'px'}, 500, function() { + $('#main').animate({marginLeft: '-'+ blockSize +'px'}, 300, function() { $('#main').html($('#slideTo').html()); $('#main').css('margin-left', '0'); leSwap();