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

Jump to bottom

feat: fulfillment + scheduling templates for ordering page #44

Draft
wants to merge 3 commits into
base: swf-example-base
Choose a base branch
from
Draft

feat: fulfillment + scheduling templates for ordering page #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56cdb2a
add swf template to the ordering page
sohnj877 Feb 9, 2024
be1a714
refactor: clean up
sohnj877 Feb 9, 2024
1bf86a1
Merge branch 'alpha' of https://github.com/square/brisk-theme into sw…
sohnj877 Feb 9, 2024
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
1 change: 1 addition & 0 deletions .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"Square": "readonly",
"Utils": "readonly",
"Constants": "readonly",
"SquareTranslations": "readonly",
"SquareWebSDK": "readonly"
}
}
5 changes: 5 additions & 0 deletions theme/assets/css/components/fulfillment-and-scheduling/choose-location.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.choose-location__container {
display: flex;
align-items: center;
justify-content: space-between;
}
30 changes: 30 additions & 0 deletions theme/assets/css/components/fulfillment-and-scheduling/scheduling-dialog.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
.scheduling-dialog__content {
display: flex;
flex-direction: column;
flex-shrink: 1;
gap: var(--space-x2);
height: 100%;
}

.scheduling-dialog__options {
position: relative;
height: 100%;

/* adding negative margin so the row hover style doesn't cutoff and the scroll content will extend to the dialog edge */
margin: calc(var(--space-x2) * -1) calc((var(--space-x2) + var(--browser-scrollbar-width)) * -1) calc(var(--space-x4) * -1) calc(var(--space-x2) * -1);
overflow: hidden;
}

.scheduling-dialog__options--scroll {
height: 100%;
padding: var(--space-x2);
}

.scheduling-dialog__options .form-radio__input {
align-self: start;
margin-top: 2px;
}

.scheduling-dialog__content .form-choice__label {
flex-direction: column;
}
9 changes: 9 additions & 0 deletions theme/assets/css/components/fulfillment-and-scheduling/scheduling.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.scheduling__container {
display: flex;
align-items: center;
justify-content: space-between;
}

.scheduling__button {
margin-left: auto;
}
26 changes: 26 additions & 0 deletions theme/assets/css/components/fulfillment-and-scheduling/site-wide-fulfillment.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
.site-wide-fulfillment__container {
display: flex;
flex-direction: column;
gap: var(--space-x3);
}

.scheduling-date-dialog__carousel {
width: calc(var(--theme-dialog-container-max-width-large) - var(--space-x8));
max-width: calc(100vw - var(--space-x8));
margin-bottom: var(--space-x2);
}

.fulfillment-select-container {
display: flex;
gap: var(--space);
width: 100%;
}

.site-wide-fulfillment__buttons {
display: flex;
flex-direction: column;
gap: var(--space-x2);
padding: var(--space-x2) var(--space-x3);
border: 1px solid var(--theme-border-color);
border-radius: var(--theme-border-radius);
}
4 changes: 4 additions & 0 deletions theme/assets/css/components/store/item/locations-dialog.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
margin-bottom: var(--space-x3);
}

.locations-dialog__input--second-line.form-text__input {
margin-top: 0;
}

.locations-dialog__content--empty .locations-dialog__input {
margin-bottom: 0;
}
Expand Down
Empty file added theme/assets/css/components/store/order/.gitkeep
View file
Open in desktop
Empty file.
5 changes: 5 additions & 0 deletions theme/assets/css/components/store/order/item-list.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.order-item-list {
display: flex;
flex-flow: column;
gap: var(--space-x5);
}
5 changes: 5 additions & 0 deletions theme/assets/css/form/choice.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@
width: 100%;
}

.form-choice__overhead-label-text {
padding-top: var(--space-half);
font-size: calc(var(--theme-font-size-minus-2) - 2px);
}

.form-choice__input {
position: absolute;
left: 0;
Expand Down
13 changes: 11 additions & 2 deletions theme/assets/css/form/radio.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,21 @@
transition: border-color 0.1s ease;
}

.form-radio--row-divider .form-radio__option {
padding-bottom: var(--space-x2);
}

.form-radio--row .form-radio__option {
align-items: center;
}

.form-radio--row-divider .form-radio__option {
padding-bottom: var(--space-x2);
.form-radio--row .form-radio__options-collapse {
margin-right: calc(var(--space-x1_5) * -1);
margin-left: calc(var(--space-x1_5) * -1);
}

.form-radio--row .form-radio__options-collapse .form-radio__option {
margin: var(--space-half) var(--space-x1_5);
}

.form-radio--normal-divider .form-radio__option:last-of-type {
Expand Down
9 changes: 9 additions & 0 deletions theme/assets/css/templates/store/order.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.order-page {
display: flex;
flex-flow: column;
gap: var(--space-x5);
}

.order-page__item-loader {
max-height: 100vh;
}
Loading