fixed modal height and change grid to have button and text side by side

openfoodfoundation · Feb 19, 2018 · 88b77e7 · 88b77e7
1 parent 183621f
commit 88b77e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/app/assets/stylesheets/darkswarm/modals.css.scss b/app/assets/stylesheets/darkswarm/modals.css.scss
@@ -19,10 +19,7 @@ dialog, .reveal-modal {
 
   // Small - when modal IS full screen
   @media only screen and (max-width: 640px) {
-    max-height: initial;
-
-    // This is needed to make the height not the height of whole content page
-    min-height: 100%;
+    height: 500px;
     position: absolute !important;
     top: 0;
     left: 0;
@@ -31,7 +28,7 @@ dialog, .reveal-modal {
   // Medium and up - when modal IS NOT full screen
   @media only screen and (min-width: 641px) {
     top: 10%;
-    max-height: 80%;
+    max-height: 120%;
   }
 }
 

diff --git a/app/views/registration/steps/_introduction.html.haml b/app/views/registration/steps/_introduction.html.haml
@@ -34,13 +34,13 @@
 
   .row{'ng-init' => "tos_required=#{Spree::Config.enterprises_require_tos}" }
     %hr
-    .small-12.columns{'ng-hide' => '!tos_required' }
+    .small-12.medium-6.columns{'ng-hide' => '!tos_required' }
       %p.tos-message
         #{t(:enterprise_tos_message)}
         %a{href: ContentConfig.footer_tos_url, target: "_blank" } #{t(:enterprise_tos_link_text)}
       %p.tos-checkbox
         %input{ type: 'checkbox', name: 'accept_terms', id: 'accept_terms', ng: { model: "tos_accepted" } }
           %label{for: "accept_terms"} #{t(:enterprise_tos_agree)}
 
-    .small-12.columns
+    .small-12.medium-6.columns
       %input.button.primary.left{ type: "button", value: "{{'registration_action' | t}}", ng: { click: "select('details')", disabled: "tos_required && !tos_accepted", model: "tos_accepted"} }