fix: editor scrollbar not working (window 7 / Firefox)

AdFabConnect · Oct 20, 2016 · dab6064 · dab6064
1 parent e641b0e
commit dab6064
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 27 deletions.
diff --git a/package.json b/package.json
@@ -91,7 +91,7 @@
     "istanbul": "^1.1.0-alpha.1",
     "mkdirp": "^0.5.1",
     "mocha": "^3.0.2",
-    "node-sass": "^3.6.0",
+    "node-sass": "^3.7.0",
     "nodemon": "^1.8.1",
     "parallelshell": "^2.0.0",
     "watchify": "^3.4.0"

diff --git a/src/server/sass/modules/_editor-blocks.scss b/src/server/sass/modules/_editor-blocks.scss
@@ -15,6 +15,19 @@
 	}
 }
 
+.abeform-wrapper {
+	height: 100%;
+	position: relative;
+	> form {
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		overflow: auto;
+		position: absolute;
+	}
+}
+
 .btn {
 	.glyphicon-chevron-down {
 	  transform: rotate(-180deg);

diff --git a/src/server/views/partials/engine.html b/src/server/views/partials/engine.html
@@ -25,36 +25,38 @@
 
   <!-- *************** form edit *************** -->
   {{#if form}}
-    <form class="text-i18n status-{{@root.json.abe_meta.status}}" id="abeForm">
-      <div class="display-status">
-        current status : {{@root.json.abe_meta.status}}
-      </div>
+    <div class="abeform-wrapper">
+      <form class="text-i18n status-{{@root.json.abe_meta.status}}" id="abeForm">
+        <div class="display-status">
+          current status : {{@root.json.abe_meta.status}}
+        </div>
 
-      <ul class="nav nav-tabs" role="tablist">
+        <ul class="nav nav-tabs" role="tablist">
+          {{#each form}}
+            <li role="presentation" class="{{#if @first}}active{{/if}}">
+              <a href="#{{cleanTab @key}}" aria-controls="{{cleanTab @key}}" role="tab" data-toggle="tab">
+                {{@key}}
+              </a>
+            </li>
+          {{/each}}
+        </ul>
+        <div class="tab-content">
         {{#each form}}
-          <li role="presentation" class="{{#if @first}}active{{/if}}">
-            <a href="#{{cleanTab @key}}" aria-controls="{{cleanTab @key}}" role="tab" data-toggle="tab">
-              {{@key}}
-            </a>
-          </li>
+          <div role="tabpanel" class="tab-pane {{#if @first}}active{{/if}}" id="{{cleanTab @key}}">
+            {{#each this}}
+              <div class="{{cleanTab @key}}">
+              {{{printBlock this}}}
+              </div>
+            {{/each}}
+            <small class="text-muted">* Required</small>
+          </div>
         {{/each}}
-      </ul>
-      <div class="tab-content">
-      {{#each form}}
-        <div role="tabpanel" class="tab-pane {{#if @first}}active{{/if}}" id="{{cleanTab @key}}">
-          {{#each this}}
-            <div class="{{cleanTab @key}}">
-            {{{printBlock this}}}
-            </div>
-          {{/each}}
-          <small class="text-muted">* Required</small>
         </div>
-      {{/each}}
-      </div>
-      <button type='submit' class='hidden' data-action="draft"></button>
-      <span class="abe-version">abe@{{abeVersion}}</span>
-      {{abeImport 'engine-more' manager.config this}}
-    </form><!-- *************** /end form edit *************** -->
+        <button type='submit' class='hidden' data-action="draft"></button>
+        <span class="abe-version">abe@{{abeVersion}}</span>
+        {{abeImport 'engine-more' manager.config this}}
+      </form><!-- *************** /end form edit *************** -->
+    </div>
   {{/if}}
   <div class="close-engine">
     <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>