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

feat: Add spacing variables to file-uploader, checkbox, file-uploader, form, number-input, radio, select, text-area & text-input #514

Merged
merged 1 commit into from
Jan 19, 2018
Merged

feat: Add spacing variables to file-uploader, checkbox, file-uploader, form, number-input, radio, select, text-area & text-input #514

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
11 changes: 7 additions & 4 deletions src/components/checkbox/_checkbox.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
@import '../../globals/scss/vars';
@import '../../globals/scss/colors';
@import '../../globals/scss/typography';
@import '../../globals/scss/spacing';
@import '../../globals/scss/helper-mixins';
@import '../../globals/scss/import-once';
@import '../form/form';
@import '../../globals/scss/css--reset';

@include exports('checkbox') {
.#{$prefix}--form-item.#{$prefix}--checkbox-wrapper {
margin-bottom: 1rem;
margin-bottom: $spacing-md;

&:first-of-type {
margin-top: rem(6px);
margin-top: $spacing-xs;
}

&:last-of-type {
Expand All @@ -32,7 +33,7 @@
align-items: center;
cursor: pointer;
position: relative;
padding-left: rem(25px);
padding-left: $spacing-lg;
min-height: rem(16px);
}

Expand All @@ -47,6 +48,7 @@
background-color: $ui-01;
}

// Checkmark
.#{$prefix}--checkbox-label::after {
content: '';
width: 10px;
Expand Down Expand Up @@ -85,6 +87,7 @@
@include focus-outline('blurred');
}

// Indeterminate dash
.#{$prefix}--checkbox:indeterminate + .#{$prefix}--checkbox-label::after,
.#{$prefix}--checkbox-label[data-contained-checkbox-state='mixed']::after {
transform: scale(1) rotate(0deg);
Expand All @@ -101,7 +104,7 @@
display: inline-block;
height: rem(18px);
width: rem(18px);
margin-right: 0.5rem;
margin-right: $spacing-xs;
background-color: $ui-01;
border: $checkbox-border-width solid $ui-05;
min-width: rem(18px);
Expand Down
14 changes: 7 additions & 7 deletions src/components/file-uploader/_file-uploader.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@import '../../globals/scss/vars';
@import '../../globals/scss/colors';
@import '../../globals/scss/typography';
@import '../../globals/scss/spacing';
@import '../../globals/scss/css--reset';
@import '../../globals/scss/helper-mixins';
@import '../../globals/scss/import-once';
Expand Down Expand Up @@ -28,14 +29,13 @@
@include typescale('zeta');
@include line-height('body');
color: $text-02;
margin-top: 0.25rem;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm kind of scratching the surface, but - Is removal of this line intentional?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, it’s intentional, the spacing on this component was updated, I can link the issue with the spec from Anna later.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's fine, as long as it's intentional I'm okay with merging!

margin-bottom: 1.25rem;
margin-bottom: $spacing-lg;
}

.#{$prefix}--file-container {
display: block;
width: 100%;
margin-top: rem(20px);
margin-top: $spacing-lg;
}

.#{$prefix}--file__selected-file {
Expand All @@ -45,8 +45,8 @@
justify-content: space-between;
min-height: rem(30px);
background-color: $field-01;
padding: 0 1rem;
margin-bottom: rem(20px);
padding: 0 $spacing-md;
margin-bottom: $spacing-md;

&:last-child {
margin-bottom: 0;
Expand All @@ -59,7 +59,7 @@
display: inline-flex;
align-items: center;
color: $text-01;
margin-right: 1rem;
margin-right: $spacing-md;
height: 1.875rem;
}

Expand All @@ -70,7 +70,7 @@
.#{$prefix}--loading {
width: 1.125rem;
height: 1.125rem;
margin-right: -7px;
margin-right: $spacing-xs;
}

.#{$prefix}--loading__svg {
Expand Down
11 changes: 6 additions & 5 deletions src/components/form/_form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
@import '../../globals/scss/colors';
@import '../../globals/scss/typography';
@import '../../globals/scss/spacing';
@import '../../globals/scss/css--reset';
@import '../../globals/scss/import-once';

@include exports('form') {
.#{$prefix}--fieldset {
@include reset;
margin-bottom: 2rem;
margin-bottom: $spacing-xl;
}

.#{$prefix}--form-item {
@include font-family;
flex: 1;
margin-right: 1rem;
margin-bottom: 1.5rem;
margin-right: $spacing-md;
margin-bottom: $spacing-lg;

&:last-of-type {
margin-right: 0;
Expand All @@ -28,7 +29,7 @@
font-weight: $input-label-weight;
display: inline-block;
vertical-align: baseline;
margin-bottom: rem(10px);
margin-bottom: $spacing-xs;
}

.#{$prefix}--label .#{$prefix}--tooltip__trigger {
Expand All @@ -52,7 +53,7 @@
.#{$prefix}--form-requirement {
@include reset;
@include typescale('omega');
margin: 0.75rem 0 0;
margin: $spacing-sm 0 0;
max-height: 0;
overflow: hidden;
font-weight: 600;
Expand Down
5 changes: 3 additions & 2 deletions src/components/number-input/_number-input.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@import '../../globals/scss/vars';
@import '../../globals/scss/colors';
@import '../../globals/scss/typography';
@import '../../globals/scss/spacing';
@import '../../globals/scss/helper-mixins';
@import '../../globals/scss/import-once';
@import '../../globals/scss/css--reset';
Expand All @@ -19,8 +20,8 @@
display: inline-flex;
width: 100%;
min-width: 9.375rem;
padding-left: 1rem;
padding-right: 2rem;
padding-left: $spacing-md;
padding-right: $spacing-xl;
font-weight: 300;
height: rem(40px);
color: $text-01;
Expand Down
7 changes: 4 additions & 3 deletions src/components/radio-button/_radio-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
@import '../../globals/scss/vars';
@import '../../globals/scss/colors';
@import '../../globals/scss/typography';
@import '../../globals/scss/spacing';
@import '../../globals/scss/helper-mixins';
@import '../../globals/scss/import-once';
@import '../form/form';
Expand All @@ -14,7 +15,7 @@
.#{$prefix}--radio-button-group {
display: flex;
align-items: center;
margin-top: rem(6px);
margin-top: $spacing-xs;
}

.#{$prefix}--radio-button {
Expand All @@ -27,7 +28,7 @@
display: flex;
align-items: center;
cursor: pointer;
margin-right: 1rem;
margin-right: $spacing-md;
}

.#{$prefix}--radio-button__appearance {
Expand All @@ -38,7 +39,7 @@
flex-shrink: 0;
height: rem(18px);
width: rem(18px);
margin-right: rem(10px);
margin-right: $spacing-xs;
}

.#{$prefix}--radio-button:checked + .#{$prefix}--radio-button__label .#{$prefix}--radio-button__appearance {
Expand Down
5 changes: 3 additions & 2 deletions src/components/select/_select.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
@import '../../globals/scss/css--reset';
@import '../../globals/scss/helper-mixins';
@import '../../globals/scss/typography';
@import '../../globals/scss/spacing';
@import '../../globals/scss/import-once';
@import '../form/form';

Expand All @@ -23,7 +24,7 @@
appearance: none;
display: block;
width: 100%;
padding: 0.75rem 2.75rem 0.75rem 1rem;
padding: $spacing-sm $spacing-2xl $spacing-sm $spacing-md;
color: $text-01;
background-color: $field-01;
border: $input-border;
Expand Down Expand Up @@ -79,7 +80,7 @@

.#{$prefix}--label {
white-space: nowrap;
margin: 0 0.5rem 0 0;
margin: 0 $spacing-xs 0 0;
font-weight: 400;
}

Expand Down
3 changes: 2 additions & 1 deletion src/components/text-area/_text-area.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
@import '../../globals/scss/vars';
@import '../../globals/scss/colors';
@import '../../globals/scss/typography';
@import '../../globals/scss/spacing';
@import '../../globals/scss/css--reset';
@import '../../globals/scss/helper-mixins';
@import '../../globals/scss/import-once';
Expand All @@ -17,7 +18,7 @@
@include typescale('zeta');
width: 100%;
min-width: 10rem;
padding: 1rem;
padding: $spacing-md;
color: $text-01;
background-color: $field-01;
border: $input-border;
Expand Down
3 changes: 2 additions & 1 deletion src/components/text-input/_text-input.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
@import '../../globals/scss/css--reset';
@import '../../globals/scss/helper-mixins';
@import '../../globals/scss/typography';
@import '../../globals/scss/spacing';
@import '../../globals/scss/import-once';
@import '../form/form';

Expand All @@ -19,7 +20,7 @@
width: 100%;
height: rem(40px);
min-width: 10rem;
padding: 0 1rem;
padding: 0 $spacing-md;
color: $text-01;
background-color: $field-01;
border: $input-border;
Expand Down