Desktop changes

Gemfile

@@ -23,6 +23,8 @@ gem 'sdoc', '~> 0.4.0', group: :doc
 # Used for 'respond_to' feature
 gem 'responders', '~> 2.0'
 
+gem 'tzinfo-data'
+
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'

Gemfile.lock

@@ -76,6 +76,7 @@ GEM
     erubi (1.7.1)
     execjs (2.7.0)
     ffi (1.9.23)
+    ffi (1.9.23-x64-mingw32)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     haml (5.0.4)
@@ -99,6 +100,8 @@ GEM
     nio4r (2.3.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
+    nokogiri (1.8.2-x64-mingw32)
+      mini_portile2 (~> 2.3.0)
     non-stupid-digest-assets (1.0.9)
       sprockets (>= 2.0)
     puma (3.11.4)
@@ -172,6 +175,8 @@ GEM
     tilt (2.0.8)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    tzinfo-data (1.2018.7)
+      tzinfo (>= 1.0.0)
     uglifier (4.1.10)
       execjs (>= 0.3.0, < 3)
     web-console (3.5.1)
@@ -185,6 +190,7 @@ GEM
 
 PLATFORMS
   ruby
+  x64-mingw32
 
 DEPENDENCIES
   bower-rails (~> 0.10.0)
@@ -207,8 +213,9 @@ DEPENDENCIES
   sdoc (~> 0.4.0)
   secure_headers
   spring
+  tzinfo-data
   uglifier
   web-console (= 3.5.1)
 
 BUNDLED WITH
-   1.16.3
+   1.17.1

app/assets/javascripts/app/directives/views/componentView.js

@@ -125,6 +125,8 @@ class ComponentView {
 
       expired = component.valid_until && component.valid_until <= new Date();
 
+      // expired = true;
+
       $scope.componentValid = !offlineRestricted && !urlError && !expired;
 
       if(offlineRestricted) $scope.error = 'offline-restricted';

app/assets/javascripts/app/services/componentManager.js

@@ -981,10 +981,7 @@ class ComponentManager {
       if(!iframe) {
         return;
       }
-      var width = data.width;
-      var height = data.height;
-      iframe.width = width;
-      iframe.height = height;
+
       setSize(iframe, data);
 
       // On Firefox, resizing a component iframe does not seem to have an effect with editor-stack extensions.

app/assets/stylesheets/app/_editor.scss

@@ -126,12 +126,18 @@ $heading-height: 75px;
 #editor-pane-component-stack {
   width: 100%;
 
+  // When two component stack items are expired and eat up full screen, this is required to scroll them.
+  overflow: auto;
+
   .component-stack-item {
     width: 100%;
     position: relative;
-    border-top: 1px solid $bg-color;
+    
     iframe {
       width: 100%;
+      // we moved the border top from the .component-stack-item to the .iframe, as on parent,
+      // it increases its height and caused unneccessary scrollbars on windows.
+      border-top: 1px solid var(--sn-component-outer-border-color);
     }
   }
-}
+}

app/assets/stylesheets/app/_main.scss

@@ -38,6 +38,7 @@ body {
 
 * {
   box-sizing: border-box;
+  scrollbar-color: rebeccapurple green;
 }
 
 .tinted {

app/assets/stylesheets/app/_modals.scss

@@ -145,7 +145,13 @@
   }
 
   iframe {
-    flex: 1;
+    // We're disabling flex: 1; because on Firefox, it causes weird sizing issues with component stack items.
+    // Not sure yet if totally required.
+    // Update: The extensions manager doesn't display correctly without it
+    // flex-grow: 1 should fix that.
+  
+    flex-grow: 1;
     width: 100%;
+    height: 100%;
   }
 }

app/assets/stylesheets/main.css.scss

@@ -9,4 +9,4 @@
 @import "app/modals";
 @import "app/lock-screen";
 @import "app/stylekit-sub";
-@import "app/ionicons";
+@import "app/ionicons";

app/assets/templates/editor.html.haml

@@ -79,6 +79,5 @@
     %p.medium-padding{"style" => "padding-top: 0 !important;"} There was an error decrypting this item. Ensure you are running the latest version of this app, then sign out and sign back in to try again.
 
   #editor-pane-component-stack
-    .sn-component
-      %component-view.component-view.component-stack-item.border-color{"ng-repeat" => "component in ctrl.componentStack",
+    %component-view.sn-component.component-view.component-stack-item.border-color{"ng-repeat" => "component in ctrl.componentStack",
        "ng-if" => "component.active", "ng-show" => "!component.hidden", "manual-dealloc" => "true", "component" => "component"}

package.json

@@ -23,7 +23,7 @@
     "bower": "^1.8.0",
     "chai": "^4.1.2",
     "connect": "^3.6.6",
-    "grunt": "^1.0.1",
+    "grunt": "^1.0.3",
     "grunt-angular-templates": "^1.1.0",
     "grunt-babel": "^6.0.0",
     "grunt-browserify": "^5.0.0",
@@ -44,7 +44,10 @@
     "mocha": "^5.2.0",
     "serve-static": "^1.13.2",
     "sn-models": "0.1.9",
-    "sn-stylekit": "1.0.15",
+    "sn-stylekit": "1.1.7",
     "standard-file-js": "0.3.19"
+  },
+  "dependencies": {
+    "grunt-shell": "^2.1.0"
   }
 }