raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-02 21:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Hugo Daniel
2018-02-19 13:17:42 +01:00
committed by Maikel Linke
parent d30362b78c
commit f2eee77a15
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/stylesheets/darkswarm/modals.css.scss
View File

@@ -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%;
}
}

4
app/views/registration/steps/_introduction.html.haml
View File

@@ -34,7 +34,7 @@
.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)}
@@ -42,5 +42,5 @@
%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"} }