maintain scroll position after closing the component editing modal in Studio

cms/static/js/views/modals/base_modal.js

@@ -11,6 +11,7 @@ define(["jquery", "underscore", "underscore.string", "gettext", "js/views/basevi
             }),
 
             show: function() {
+                this.lastPosition = $(document).scrollTop();
                 $('body').addClass('modal-window-is-shown');
                 this.$('.wrapper-modal-window').addClass('is-shown');
             },
@@ -18,6 +19,7 @@ define(["jquery", "underscore", "underscore.string", "gettext", "js/views/basevi
             hide: function() {
                 $('body').removeClass('modal-window-is-shown');
                 this.$('.wrapper-modal-window').removeClass('is-shown');
+                $(document).scrollTop(this.lastPosition);
             }
         });
 

cms/static/sass/elements/_forms.scss

@@ -59,20 +59,6 @@ textarea.text {
 // forms - additional UI
 form {
 
-  .field {
-    margin-bottom: ($baseline/2);
-  }
-
-  label {
-    @include font-size(14);
-    display: block;
-    font-weight: bold;
-  }
-
-  input[type="text"] {
-    @extend %t-copy-sub1;
-  }
-
   .note {
     @include box-sizing(border-box);
 

cms/static/sass/elements/_modal-window.scss

@@ -3,7 +3,6 @@
 
 // start with the view/body
 [class*="view-"] {
-  overflow: initial;
 
   // modal-window backdrop covers the window
   .wrapper-modal-window {