Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
42 changes: 0 additions & 42 deletions src/app/address/AddressForm.scss

This file was deleted.

1 change: 0 additions & 1 deletion src/app/address/AddressForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { withLanguage, WithLanguageProps } from '../locale';
import { AutocompleteItem } from '../ui/autocomplete';

import { mapToAddress, GoogleAutocompleteFormField } from './googleAutocomplete';
import './AddressForm.scss';
import AddressFormField from './AddressFormField';
import { AddressKeyMap } from './DynamicFormField';
import DynamicFormFieldType from './DynamicFormFieldType';
Expand Down
1 change: 0 additions & 1 deletion src/app/address/AddressSelect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { TranslatedString } from '../locale';
import { DropdownTrigger } from '../ui/dropdown';

import isEqualAddress from './isEqualAddress';
import './AddressSelect.scss';
import StaticAddress from './StaticAddress';

export interface AddressSelectProps {
Expand Down
12 changes: 0 additions & 12 deletions src/app/address/MultiCheckboxControl.scss

This file was deleted.

2 changes: 0 additions & 2 deletions src/app/address/MultiCheckboxControl.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ import React, { memo, useCallback, FunctionComponent, MouseEvent } from 'react';

import { TranslatedString } from '../locale';

import './MultiCheckboxControl.scss';

export interface MultiCheckboxControlProps {
testId?: string;
onSelectedAll(): void;
Expand Down
1 change: 0 additions & 1 deletion src/app/ui/Base.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import '../../../node_modules/@bigcommerce/citadel/src/tools/toolkit';
@import '../../../node_modules/@bigcommerce/citadel/src/settings/global/global';
@import '../../scss/settings/foundation/foundation';

$global-radius: 4px;
3 changes: 3 additions & 0 deletions src/scss/components/_components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@
// Checkout Steps
@import "checkout/checkoutSteps/component";

// Checkout Dropdown Select
@import "checkout/dropdownSelect/component";

// GenericModal
@import "checkout/genericModal/component";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,52 @@
flex: 1; // 1
}

.checkout-address {
display: flex;
flex-flow: row wrap;
margin-left: -1 * spacing("half");
margin-right: -1 * spacing("half");

.dynamic-form-addressState,
.dynamic-form-field {
display: block;
flex: 1;
flex-basis: 100%;
max-width: 100%;
padding: 0 spacing("half");
}

.dynamic-form-field--province,
.dynamic-form-field--provinceCode,
.dynamic-form-field--firstName,
.dynamic-form-field--lastName,
.dynamic-form-field--phone,
.dynamic-form-field--city {
@include breakpoint("small") {
flex-basis: 50%;
}
}

.dynamic-form-field--postCode {
@include breakpoint("small") {
flex-basis: 30%;
}
}
}

.shipping-address {
.address-line {
margin-bottom: 0;
}
}

.multiCheckbox--controls {
list-style: none;
margin: 0 0 spacing("half");
padding: 0;
}

.multiCheckbox--control {
display: inline-block;
margin-right: spacing("quarter");
}
5 changes: 5 additions & 0 deletions src/scss/components/checkout/dropdownSelect/_component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// =============================================================================
// DROPDOWN SELECT
// =============================================================================

@import "dropdownSelect";
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
@import "../ui/Base";
// =============================================================================
// DROPDOWN SELECT (Component)
// =============================================================================

.dropdown--select {
cursor: pointer;
Expand All @@ -8,7 +10,7 @@
.dropdown-toggle--select {
color: $input-font-color;
margin-bottom: 0;
min-height: 3rem;
min-height: $dropdown-toggle-height--select;
padding: $buttonSize-default-verticalPadding $input-horizontalPadding;
text-align: left;
text-transform: none;
Expand All @@ -20,6 +22,12 @@
}
}

.dropdown-menu--select {
max-height: 20rem;
max-width: none;
overflow: auto;
}

.dropdown-menu-item--select {
border-bottom: container("border");

Expand Down
8 changes: 8 additions & 0 deletions src/scss/components/foundation/forms/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@
}
}

.dynamic-form-field {
margin-bottom: spacing("half");

&:last-child {
margin-bottom: 0;
}
}

.form-field {
position: relative;

Expand Down