Fix menu + scale and move slop to CSS

diff --git a/extensions/menu/deck.menu.css b/extensions/menu/deck.menu.css
index 3e88549..c664a3f 100644 (file)
--- a/extensions/menu/deck.menu.css
+++ b/extensions/menu/deck.menu.css
@@ -17,11 +17,11 @@
   padding: 0 0.5%;
 }
 .csstransforms .deck-menu > .slide {
-  -webkit-transform: scale(0.22);
-  -moz-transform: scale(0.22);
-  -o-transform: scale(0.22);
-  -ms-transform: scale(0.22);
-  transform: scale(0.22);
+  -webkit-transform: scale(0.22) !important;
+  -moz-transform: scale(0.22) !important;
+  -o-transform: scale(0.22) !important;
+  -ms-transform: scale(0.22) !important;
+  transform: scale(0.22) !important;
   -webkit-transform-origin: 0 0;
   -moz-transform-origin: 0 0;
   -o-transform-origin: 0 0;

diff --git a/extensions/menu/deck.menu.scss b/extensions/menu/deck.menu.scss
index 86385c4..0bd576d 100755 (executable)
--- a/extensions/menu/deck.menu.scss
+++ b/extensions/menu/deck.menu.scss
@@ -21,11 +21,11 @@
                }
                
                .csstransforms & {
-                       -webkit-transform:scale(.22);
-                       -moz-transform:scale(.22);
-                       -o-transform:scale(.22);
-                       -ms-transform:scale(.22);
-                       transform:scale(.22);
+                       -webkit-transform:scale(.22) !important;
+                       -moz-transform:scale(.22) !important;
+                       -o-transform:scale(.22) !important;
+                       -ms-transform:scale(.22) !important;
+                       transform:scale(.22) !important;
                        -webkit-transform-origin:0 0;
                        -moz-transform-origin:0 0;
                        -o-transform-origin:0 0;

diff --git a/extensions/scale/deck.scale.css b/extensions/scale/deck.scale.css
dissimilarity index 99%
index a8b4a94..806b1e3 100644 (file)
--- a/extensions/scale/deck.scale.css
+++ b/extensions/scale/deck.scale.css
@@ -1,16 +1,12 @@
-.csstransforms .deck-container.deck-scale section.slide {
-       width:auto;
-       -webkit-transform-origin: 50% 0;
-       -moz-transform-origin: 50% 0;
-       -o-transform-origin: 50% 0;
-       -ms-transform-origin: 50% 0;
-       transform-origin: 50% 0;
-}
-.csstransforms .deck-container.deck-scale.deck-menu {
-       width:70%;
-       -webkit-transform:none !important;
-       -moz-transform:none !important;
-       -o-transform:none !important;
-       -ms-transform:none !important;
-       transform:none !important;
-}
+.csstransforms .deck-container.deck-scale:not(.deck-menu) section.slide {
+  -webkit-box-sizing: padding-box;
+  -moz-box-sizing: padding-box;
+  box-sizing: padding-box;
+  width: 100%;
+  padding-bottom: 20px;
+  -webkit-transform-origin: 50% 0;
+  -moz-transform-origin: 50% 0;
+  -o-transform-origin: 50% 0;
+  -ms-transform-origin: 50% 0;
+  transform-origin: 50% 0;
+}

diff --git a/extensions/scale/deck.scale.js b/extensions/scale/deck.scale.js
index 74dc463..0c2eb6b 100644 (file)
--- a/extensions/scale/deck.scale.js
+++ b/extensions/scale/deck.scale.js
@@ -41,9 +41,7 @@ works fine.
                else {
                        // Use window height as base height if not set manually
                        baseHeight = obh ? obh : (function() {
-                               var slop = 40; /* for padding */
-                         var windowHeight = $(window).height();
-                               return windowHeight - slop;
+                               return $(window).height();
                        })();
                }
 

diff --git a/extensions/scale/deck.scale.scss b/extensions/scale/deck.scale.scss
index e96d60c..c07f935 100644 (file)
--- a/extensions/scale/deck.scale.scss
+++ b/extensions/scale/deck.scale.scss
@@ -1,19 +1,14 @@
-.csstransforms .deck-container.deck-scale {
+.csstransforms .deck-container.deck-scale:not(.deck-menu) {
        section.slide {
-               width:auto;
+         -webkit-box-sizing: padding-box;
+    -moz-box-sizing: padding-box;
+    box-sizing: padding-box;
+               width:100%;
+               padding-bottom:20px;
                -webkit-transform-origin: 50% 0;
                -moz-transform-origin: 50% 0;
                -o-transform-origin: 50% 0;
                -ms-transform-origin: 50% 0;
                transform-origin: 50% 0;
        }
-       
-       &.deck-menu {
-               width:70%;
-               -webkit-transform:none !important;
-               -moz-transform:none !important;
-               -o-transform:none !important;
-               -ms-transform:none !important;
-               transform:none !important;
-       }
 }
\ No newline at end of file