Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use flexbox in wizard #1569

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Use flexbox in wizard #1569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions app/assets/stylesheets/common/layouts.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ Full license explanation at https://github.com/houdiniproject/houdini/blob/main/
.fieldsLayout--three {
@include fieldsLayout;
& > .field { width: 33.333%; }
& > .field:nth-of-type(3n -2) { padding: 0 10px 0 0; }
& > .field:nth-of-type(3n -1) { padding: 0 5px; }
& > .field:nth-of-type(3n) { padding:0 0 0 10px; }
// & > .field:nth-of-type(3n -2) { padding: 0 10px 0 0; }
// & > .field:nth-of-type(3n -1) { padding: 0 5px; }
// & > .field:nth-of-type(3n) { padding:0 0 0 10px; }
}

.fieldsLayout--four {
Expand All @@ -127,14 +127,14 @@ Full license explanation at https://github.com/houdiniproject/houdini/blob/main/
}

@mixin fieldsetLayout {
clear: both;
overflow: auto;
fieldset {
display: inline-block;
float: left;
margin-left: 0;
margin-right: 0;
}
// clear: both;
// overflow: auto;
// fieldset {
// display: inline-block;
// float: left;
// margin-left: 0;
// margin-right: 0;
// }
}


Expand Down Expand Up @@ -167,9 +167,15 @@ Full license explanation at https://github.com/houdiniproject/houdini/blob/main/

.fieldsetLayout--three--evenPadding {
@include fieldsetLayout;
fieldset {
width: 33.33% !important;
padding: 0 5px;
display: flex;
align-content: stretch;
row-gap: 10px;
column-gap: 10px;
flex-wrap: wrap;
justify-items: stretch;

> * {
flex: 1 1 25%;
}
}

Expand Down
8 changes: 4 additions & 4 deletions app/javascript/legacy/nonprofits/donate/amount-step.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,9 @@ function composeTranslation(full, bold) {
// All the buttons and the custom input for the amounts to select
function amountFields(state) {
if(state.params$().single_amount) return ''
return h('div.u-inline.fieldsetLayout--three--evenPadding', [
h('span',
R.map(
return h('div.fieldsetLayout--three--evenPadding', [

...R.map(
amt => h('fieldset', [
h('button.button.u-width--full.white.amount', {
class: {'is-selected': state.buttonAmountSelected$() && state.donation$().amount === amt*100}
Expand All @@ -159,7 +159,7 @@ function amountFields(state) {
])
])
, state.params$().custom_amounts || [] )
)

, h('fieldset.' + prependCurrencyClassname(), [
h('input.amount.other', {
props: {name: 'amount', step: 'any', type: 'number', min: 1, placeholder: I18n.t('nonprofits.donate.amount.custom')}
Expand Down
8 changes: 4 additions & 4 deletions app/javascript/legacy/recurring_donations/edit/amount-step.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ function chooseNewDonationAmount() {
// All the buttons and the custom input for the amounts to select
function amountFields(state) {
if(state.params$().single_amount) return ''
return h('div.u-inline.fieldsetLayout--three--evenPadding', [
h('span',
R.map(
return h('div.fieldsetLayout--three--evenPadding', [

...R.map(
amt => h('fieldset', [
h('button.button.u-width--full.white.amount', {
class: {'is-selected': state.buttonAmountSelected$() && state.donation$().amount === amt*100}
Expand All @@ -86,7 +86,7 @@ function amountFields(state) {
])
])
, state.params$().custom_amounts || [] )
)

, h('fieldset.prepend--dollar', [
h('input.amount', {
props: {name: 'amount', step: 'any', type: 'number', min: 1, placeholder: 'Custom'}
Expand Down
2 changes: 1 addition & 1 deletion app/views/nonprofits/donate/_amount.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<small>Select an amount for your <strong>monthly</strong> contribution</small>
</p>

<div class='u-inline fieldsetLayout--three--evenPadding'>
<div class='fieldsetLayout--three--evenPadding'>
<fieldset>
<!--= repeat donate_wiz.amounts -->
<button class='button u-width--full white amount'>
Expand Down