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

[WIP] feat(inputs): new inputs #710

Merged
merged 5 commits into from
Apr 18, 2018
Merged

[WIP] feat(inputs): new inputs #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4743d8e
feat(text-input): started working on new styles
marijohannessen Apr 11, 2018
8a48693
feat(text-inputs): added new variations of text inputs
marijohannessen Apr 12, 2018
755cd6f
feat(text-inputs): added new styles to text area
marijohannessen Apr 12, 2018
db9c33d
feat(text-inputs): added new styles to date picker
marijohannessen Apr 13, 2018
55ee97e
feat(inputs): finished up first iteration of inptus
marijohannessen Apr 18, 2018
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
62 changes: 62 additions & 0 deletions src/components/date-picker/_date-picker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,4 +333,66 @@
width: rem(225px);
margin-bottom: $spacing-2xs;
}

.#{$prefix}--date-picker__calendar--v2.open {
margin-top: 1px !important;
}

.#{$prefix}--date-picker--v2 {
.#{$prefix}--date-picker-container {
display: flex;
flex-direction: column;
}

& ~ .#{$prefix}--label {
order: 1;
}
}

.#{$prefix}--date-picker--v2 .#{$prefix}--date-picker__input {
border: none;
box-shadow: 0 1px 0 0 $text-02;
order: 2;

&:focus {
outline: none;
box-shadow: 0 2px 0 0 $brand-01;
}

&:focus ~ .#{$prefix}--label {
color: $brand-01;
}

&[data-invalid],
&[data-invalid]:focus {
box-shadow: 0 2px 0 0 $support-01;
}

&[data-invalid]:focus + .#{$prefix}--label {
color: $support-01;
}

& ~ .#{$prefix}--form-requirement {
order: 3;
color: $support-01;
font-weight: 400;
margin-top: $spacing-2xs;
overflow: visible;

&::before {
display: none;
}
}

&:focus ~ .#{$prefix}--form__helper-text {
z-index: 0;
max-height: 3rem;
opacity: 1;
margin-bottom: $spacing-xs;
}
}

.#{$prefix}--date-picker--light input {
background: $field-02;
}
}
41 changes: 41 additions & 0 deletions src/components/date-picker/date-picker--range-v2-light.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<!-- Ranged -->
<div class="bx--form-item">
<div data-date-picker data-date-picker-type="range" data-date-picker-version="v2" class="bx--date-picker bx--date-picker--range bx--date-picker--v2 bx--date-picker--light">
<div class="bx--date-picker-container">
<input type="text" id="date-picker-1" class="bx--date-picker__input" pattern="\d{1,2}/\d{1,2}/\d{4}" placeholder="mm/dd/yyyy"
data-date-picker-input-from />
<label for="date-picker-1" class="bx--label">Start date label</label>
</div>
<div class="bx--date-picker-container">
<input type="text" id="date-picker-2" class="bx--date-picker__input" pattern="\d{1,2}/\d{1,2}/\d{4}" placeholder="mm/dd/yyyy"
data-date-picker-input-to />
<label for="date-picker-2" class="bx--label">End date label</label>
</div>
<svg data-date-picker-icon class="bx--date-picker__icon" width="17" height="19" viewBox="0 0 17 19">
<path d="M12 0h2v2.7h-2zM3 0h2v2.7H3z" />
<path d="M0 2v17h17V2H0zm15 15H2V7h13v10z" />
<path d="M9.9 15H8.6v-3.9H7.1v-.9c.9 0 1.7-.3 1.8-1.2h1v6z" />
</svg>
</div>
</div>

<!-- Ranged -->
<div class="bx--form-item">
<div data-date-picker data-date-picker-type="range" data-date-picker-version="v2" class="bx--date-picker bx--date-picker--range bx--date-picker--v2 bx--date-picker--light">
<div class="bx--date-picker-container">
<input type="text" id="date-picker-1" class="bx--date-picker__input" pattern="\d{1,2}/\d{1,2}/\d{4}" placeholder="mm/dd/yyyy"
data-date-picker-input-from />
<label for="date-picker-1" class="bx--label">Start date label</label>
</div>
<div class="bx--date-picker-container">
<input type="text" id="date-picker-2" class="bx--date-picker__input" pattern="\d{1,2}/\d{1,2}/\d{4}" placeholder="mm/dd/yyyy"
data-date-picker-input-to />
<label for="date-picker-2" class="bx--label">End date label</label>
</div>
<svg data-date-picker-icon class="bx--date-picker__icon" width="17" height="19" viewBox="0 0 17 19">
<path d="M12 0h2v2.7h-2zM3 0h2v2.7H3z" />
<path d="M0 2v17h17V2H0zm15 15H2V7h13v10z" />
<path d="M9.9 15H8.6v-3.9H7.1v-.9c.9 0 1.7-.3 1.8-1.2h1v6z" />
</svg>
</div>
</div>
42 changes: 42 additions & 0 deletions src/components/date-picker/date-picker--range-v2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<!-- Ranged -->
<div class="bx--form-item">
<div data-date-picker data-date-picker-type="range" data-date-picker-version="v2" class="bx--date-picker bx--date-picker--range bx--date-picker--v2">
<div class="bx--date-picker-container">
<input type="text" id="date-picker-1" class="bx--date-picker__input" pattern="\d{1,2}/\d{1,2}/\d{4}" placeholder="mm/dd/yyyy"
data-date-picker-input-from />
<label for="date-picker-1" class="bx--label">Start date label</label>
</div>
<div class="bx--date-picker-container">
<input type="text" id="date-picker-2" class="bx--date-picker__input" pattern="\d{1,2}/\d{1,2}/\d{4}" placeholder="mm/dd/yyyy"
data-date-picker-input-to />
<label for="date-picker-2" class="bx--label">End date label</label>
</div>
<svg data-date-picker-icon class="bx--date-picker__icon" width="17" height="19" viewBox="0 0 17 19">
<path d="M12 0h2v2.7h-2zM3 0h2v2.7H3z" />
<path d="M0 2v17h17V2H0zm15 15H2V7h13v10z" />
<path d="M9.9 15H8.6v-3.9H7.1v-.9c.9 0 1.7-.3 1.8-1.2h1v6z" />
</svg>
</div>
</div>

<!-- Ranged -->
<div class="bx--form-item">
<div data-date-picker data-date-picker-type="range" data-date-picker-version="v2" class="bx--date-picker bx--date-picker--range bx--date-picker--v2 bx--input--light">
<div class="bx--date-picker-container">
<input type="text" id="date-picker-1" class="bx--date-picker__input" pattern="\d{1,2}/\d{1,2}/\d{4}" placeholder="mm/dd/yyyy"
data-date-picker-input-from />
<label for="date-picker-1" class="bx--label">Start date label</label>
</div>
<div class="bx--date-picker-container">
<input type="text" id="date-picker-2" class="bx--date-picker__input" pattern="\d{1,2}/\d{1,2}/\d{4}" placeholder="mm/dd/yyyy"
data-date-picker-input-to />
<label for="date-picker-2" class="bx--label">End date label</label>
</div>
<svg data-date-picker-icon class="bx--date-picker__icon" width="17" height="19" viewBox="0 0 17 19">
<path d="M12 0h2v2.7h-2zM3 0h2v2.7H3z" />
<path d="M0 2v17h17V2H0zm15 15H2V7h13v10z" />
<path d="M9.9 15H8.6v-3.9H7.1v-.9c.9 0 1.7-.3 1.8-1.2h1v6z" />
</svg>
</div>
</div>

30 changes: 30 additions & 0 deletions src/components/date-picker/date-picker--single-v2-light.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<!-- Basic with calendar -->
<div class="bx--form-item">
<div data-date-picker data-date-picker-type="single" data-date-picker-version="v2" class="bx--date-picker bx--date-picker--single bx--date-picker--v2 bx--date-picker--light">
<div class="bx--date-picker-container">
<svg data-date-picker-icon class="bx--date-picker__icon" width="17" height="19" viewBox="0 0 17 19">
<path d="M12 0h2v2.7h-2zM3 0h2v2.7H3z" />
<path d="M0 2v17h17V2H0zm15 15H2V7h13v10z" />
<path d="M9.9 15H8.6v-3.9H7.1v-.9c.9 0 1.7-.3 1.8-1.2h1v6z" />
</svg>
<input type="text" id="date-picker-3" class="bx--date-picker__input" pattern="\d{1,2}/\d{1,2}/\d{4}" placeholder="mm/dd/yyyy"
data-date-picker-input />
<label for="date-picker-3" class="bx--label">Date Picker label</label>
</div>
</div>
</div>

<div class="bx--form-item">
<div data-date-picker data-date-picker-type="single" data-date-picker-version="v2" class="bx--date-picker bx--date-picker--single bx--date-picker--v2 bx--date-picker--light">
<div class="bx--date-picker-container">
<svg data-date-picker-icon class="bx--date-picker__icon" width="17" height="19" viewBox="0 0 17 19">
<path d="M12 0h2v2.7h-2zM3 0h2v2.7H3z" />
<path d="M0 2v17h17V2H0zm15 15H2V7h13v10z" />
<path d="M9.9 15H8.6v-3.9H7.1v-.9c.9 0 1.7-.3 1.8-1.2h1v6z" />
</svg>
<input type="text" id="date-picker-3" class="bx--date-picker__input" pattern="\d{1,2}/\d{1,2}/\d{4}" placeholder="mm/dd/yyyy"
data-date-picker-input />
<label for="date-picker-3" class="bx--label">Date Picker label</label>
</div>
</div>
</div>
30 changes: 30 additions & 0 deletions src/components/date-picker/date-picker--single-v2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<!-- Basic with calendar -->
<div class="bx--form-item">
<div data-date-picker data-date-picker-type="single" data-date-picker-version="v2" class="bx--date-picker bx--date-picker--single bx--date-picker--v2">
<div class="bx--date-picker-container">
<svg data-date-picker-icon class="bx--date-picker__icon" width="17" height="19" viewBox="0 0 17 19">
<path d="M12 0h2v2.7h-2zM3 0h2v2.7H3z" />
<path d="M0 2v17h17V2H0zm15 15H2V7h13v10z" />
<path d="M9.9 15H8.6v-3.9H7.1v-.9c.9 0 1.7-.3 1.8-1.2h1v6z" />
</svg>
<input type="text" id="date-picker-3" class="bx--date-picker__input" pattern="\d{1,2}/\d{1,2}/\d{4}" placeholder="mm/dd/yyyy"
data-date-picker-input />
<label for="date-picker-3" class="bx--label">Date Picker label</label>
</div>
</div>
</div>

<div class="bx--form-item">
<div data-date-picker data-date-picker-type="single" data-date-picker-version="v2" class="bx--date-picker bx--date-picker--single bx--date-picker--v2 bx--input--light">
<div class="bx--date-picker-container">
<svg data-date-picker-icon class="bx--date-picker__icon" width="17" height="19" viewBox="0 0 17 19">
<path d="M12 0h2v2.7h-2zM3 0h2v2.7H3z" />
<path d="M0 2v17h17V2H0zm15 15H2V7h13v10z" />
<path d="M9.9 15H8.6v-3.9H7.1v-.9c.9 0 1.7-.3 1.8-1.2h1v6z" />
</svg>
<input type="text" id="date-picker-3" class="bx--date-picker__input" pattern="\d{1,2}/\d{1,2}/\d{4}" placeholder="mm/dd/yyyy"
data-date-picker-input />
<label for="date-picker-3" class="bx--label">Date Picker label</label>
</div>
</div>
</div>
35 changes: 35 additions & 0 deletions src/components/date-picker/date-picker--v2-light.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<div class="bx--form-item">
<div class="bx--date-picker bx--date-picker--simple bx--date-picker--short bx--date-picker--v2 bx--date-picker--light">
<div class="bx--date-picker-container">
<input type="text" id="date-picker-4" class="bx--date-picker__input" pattern="\d{1,2}/\d{4}" placeholder="mm/yyyy" data-date-picker-input
/>
<label for="date-picker-4" class="bx--label">Date Picker label</label>
</div>
</div>
</div>

<div class="bx--form-item">
<div class="bx--date-picker bx--date-picker--simple bx--date-picker--short bx--date-picker--v2 bx--date-picker--light">
<div class="bx--date-picker-container">
<input type="text" id="date-picker-5" class="bx--date-picker__input" pattern="\d{1,2}/\d{4}" placeholder="mm/yyyy" data-date-picker-input
/>
<label for="date-picker-5" class="bx--label">Date Picker label</label>
<div class="bx--form__helper-text">
Optional helper text here; if message is more than one line text should wrap (~100 character count maximum)
</div>
</div>
</div>
</div>

<div class="bx--form-item">
<div class="bx--date-picker bx--date-picker--simple bx--date-picker--v2 bx--date-picker--light">
<div class="bx--date-picker-container">
<input data-invalid type="text" id="date-picker-6" class="bx--date-picker__input" pattern="\d{1,2}/\d{1,2}/\d{4}" placeholder="mm/dd/yyyy"
data-date-picker-input />
<label for="date-picker-6" class="bx--label">Date Picker label</label>
<div class="bx--form-requirement">
Invalid date format.
</div>
</div>
</div>
</div>
35 changes: 35 additions & 0 deletions src/components/date-picker/date-picker--v2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<div class="bx--form-item">
<div class="bx--date-picker bx--date-picker--simple bx--date-picker--short bx--date-picker--v2">
<div class="bx--date-picker-container">
<input type="text" id="date-picker-4" class="bx--date-picker__input" pattern="\d{1,2}/\d{4}" placeholder="mm/yyyy" data-date-picker-input
/>
<label for="date-picker-4" class="bx--label">Date Picker label</label>
</div>
</div>
</div>

<div class="bx--form-item">
<div class="bx--date-picker bx--date-picker--simple bx--date-picker--short bx--date-picker--v2">
<div class="bx--date-picker-container">
<input type="text" id="date-picker-5" class="bx--date-picker__input" pattern="\d{1,2}/\d{4}" placeholder="mm/yyyy" data-date-picker-input
/>
<label for="date-picker-5" class="bx--label">Date Picker label</label>
<div class="bx--form__helper-text">
Optional helper text here; if message is more than one line text should wrap (~100 character count maximum)
</div>
</div>
</div>
</div>

<div class="bx--form-item">
<div class="bx--date-picker bx--date-picker--simple bx--date-picker--v2">
<div class="bx--date-picker-container">
<input data-invalid type="text" id="date-picker-6" class="bx--date-picker__input" pattern="\d{1,2}/\d{1,2}/\d{4}" placeholder="mm/dd/yyyy"
data-date-picker-input />
<label for="date-picker-6" class="bx--label">Date Picker label</label>
<div class="bx--form-requirement">
Invalid date format.
</div>
</div>
</div>
</div>
8 changes: 7 additions & 1 deletion src/components/date-picker/date-picker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,12 @@ class DatePicker extends mixin(createComponent, initComponentBySearch, handles)

_updateClassNames = calendar => {
const calendarContainer = calendar.calendarContainer;
calendarContainer.classList.add(this.options.classCalendarContainer);
if (this.element.dataset.datePickerVersion === 'v2') {
calendarContainer.classList.add(this.options.classCalendarContainer);
calendarContainer.classList.add(this.options.classCalendarContainerV2);
} else {
calendarContainer.classList.add(this.options.classCalendarContainer);
}
calendarContainer.querySelector('.flatpickr-month').classList.add(this.options.classMonth);
calendarContainer.querySelector('.flatpickr-weekdays').classList.add(this.options.classWeekdays);
calendarContainer.querySelector('.flatpickr-days').classList.add(this.options.classDays);
Expand Down Expand Up @@ -320,6 +325,7 @@ class DatePicker extends mixin(createComponent, initComponentBySearch, handles)
selectorDatePickerInputTo: '[data-date-picker-input-to]',
selectorDatePickerIcon: '[data-date-picker-icon]',
classCalendarContainer: `${prefix}--date-picker__calendar`,
classCalendarContainerV2: `${prefix}--date-picker__calendar--v2`,
classMonth: `${prefix}--date-picker__month`,
classWeekdays: `${prefix}--date-picker__weekdays`,
classDays: `${prefix}--date-picker__days`,
Expand Down
23 changes: 23 additions & 0 deletions src/components/dropdown/_dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@
}
}

.#{$prefix}--dropdown--light {
background-color: $field-02;
}

.#{$prefix}--dropdown--up {
&.#{$prefix}--dropdown--open:focus {
box-shadow: 0 1px 0 0 $brand-01, 1px 0 0 0 $brand-01, -1px 0 0 0 $brand-01;
Expand Down Expand Up @@ -154,4 +158,23 @@
outline: none;
}
}

.#{$prefix}--dropdown--v2 {
border: none;
box-shadow: 0 1px 0 0 $text-02;
order: 1;

&:focus {
outline: none;
box-shadow: 0 2px 0 0 $brand-01;
}
}

.#{$prefix}--dropdown--v2.#{$prefix}--dropdown--open:focus {
box-shadow: none;

.#{$prefix}--dropdown-list {
box-shadow: 0 2px 0 0 $brand-01;
}
}
}
25 changes: 25 additions & 0 deletions src/components/dropdown/dropdown--v2-light.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<ul data-dropdown data-value class="bx--dropdown bx--dropdown--v2 bx--dropdown--light" tabindex="0">
<li class="bx--dropdown-text">Dropdown label</li>
<svg class="bx--dropdown__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
<path d="M10 0L5 5 0 0z"></path>
</svg>
<li>
<ul class="bx--dropdown-list">
<li data-option data-value="all" class="bx--dropdown-item">
<a class="bx--dropdown-link" href="javascript:void(0)">Option 1</a>
</li>
<li data-option data-value="cloudFoundry" class="bx--dropdown-item">
<a class="bx--dropdown-link" href="javascript:void(0)">Option 2</a>
</li>
<li data-option data-value="staging" class="bx--dropdown-item">
<a class="bx--dropdown-link" href="javascript:void(0)">Option 3</a>
</li>
<li data-option data-value="dea" class="bx--dropdown-item">
<a class="bx--dropdown-link" href="javascript:void(0)">Option 4</a>
</li>
<li data-option data-value="router" class="bx--dropdown-item">
<a class="bx--dropdown-link" href="javascript:void(0)">Option 5</a>
</li>
</ul>
</li>
</ul>
25 changes: 25 additions & 0 deletions src/components/dropdown/dropdown--v2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<ul data-dropdown data-value class="bx--dropdown bx--dropdown--v2" tabindex="0">
<li class="bx--dropdown-text">Dropdown label</li>
<svg class="bx--dropdown__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
<path d="M10 0L5 5 0 0z"></path>
</svg>
<li>
<ul class="bx--dropdown-list">
<li data-option data-value="all" class="bx--dropdown-item">
<a class="bx--dropdown-link" href="javascript:void(0)">Option 1</a>
</li>
<li data-option data-value="cloudFoundry" class="bx--dropdown-item">
<a class="bx--dropdown-link" href="javascript:void(0)">Option 2</a>
</li>
<li data-option data-value="staging" class="bx--dropdown-item">
<a class="bx--dropdown-link" href="javascript:void(0)">Option 3</a>
</li>
<li data-option data-value="dea" class="bx--dropdown-item">
<a class="bx--dropdown-link" href="javascript:void(0)">Option 4</a>
</li>
<li data-option data-value="router" class="bx--dropdown-item">
<a class="bx--dropdown-link" href="javascript:void(0)">Option 5</a>
</li>
</ul>
</li>
</ul>
Loading