Merge pull request #144 from evolus/fix-#107-style-compact-main-toolbar

Fix #107 style compact main toolbar
evolus · Aug 31, 2016 · 6a269d2 · 6a269d2
2 parents 4d30454 + f84dec7
commit 6a269d2
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/app/views/ApplicationPane.xhtml b/app/views/ApplicationPane.xhtml
@@ -153,10 +153,9 @@
             color: darken(@app_bg, 45%);
         }
         @toolbarContainer *[label] {
-            padding-top: 0.8em;
+            padding-top: 1em;
             padding-bottom: 0.8em;
         }
-
         @contentSection {
             position: relative;
             padding-right: 3em;
@@ -192,6 +191,28 @@
         body.Fullscreen @contentSection .widget_CollapseablePanel:not([closed='true']) {
             box-shadow: 0em 0em 0.5em 0.3em rgba(0, 0, 0, 0.15);
         }
+
+        @media screen and (max-width: 1000px), screen and (max-height:650px)  {
+            @logoBox {
+                padding-right: 0.2em;
+            }
+            @appName {
+                margin-left: 0.2em !important;
+            }
+            @toolbarContainer *[label]:after {
+                display:none;
+            }
+            @contentHeader {
+                padding: 0px;
+            }
+            @toolbarContainer *[label] {
+                padding:0px;
+                padding-bottom:0.4em;
+            }
+            @contentHeader @menuIcon {
+                padding:0.2em;
+            }
+        }
     </style>
 
     <vbox flex="1" anon-id="mainArea">

diff --git a/app/views/common/ScrollableView.js b/app/views/common/ScrollableView.js
@@ -58,7 +58,9 @@ function ScrollableView () {
     this.nextButton.addEventListener("focusout", function() {
         stopScroll();
     }, false)
-
+    window.addEventListener("resize", function(ev){
+        thiz.invalidate();
+    },false)
 
     this.bind("wheel", function (event) {
         this.offset -= event.deltaY;