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: use appearance to style radio buttons and checkboxes #357

Merged
merged 3 commits into from
May 26, 2020
Merged

feat: use appearance to style radio buttons and checkboxes #357

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
41aeb95
feat: use appearance to style radio buttons and checkboxes
greatislander May 26, 2020
9c6eb14
feat: style checkbox and radio labels using class
greatislander May 26, 2020
3a3dc34
fix: radio buttons
greatislander May 26, 2020
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
101 changes: 48 additions & 53 deletions src/assets/styles/components/_input.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ label {
Text input and text areas.
*/

input:not([type="submit"]),
input:not([type="submit"]):not([type="checkbox"]):not([type="radio"]),
select,
textarea {
-moz-appearance: none;
Expand Down Expand Up @@ -165,7 +165,7 @@ textarea {
resize: none;
}

select {
select:not([multiple]) {
background-image: url("../images/chevron-down.svg");
background-position: calc(100% - #{rem(8)}) center;
background-repeat: no-repeat;
Expand All @@ -188,27 +188,27 @@ select {
}

.input-group--inverse input[type="text"],
.input-group--inverse select,
.input-group--inverse select:not([multiple]),
.input-group--inverse textarea {
border-color: var(--parent-background-color);
}

input[type="text"]:hover,
textarea:hover,
select:hover {
select:not([multiple]):hover {
box-shadow: var(--text-hover-box-shadow);
}

.input-group--error input[type="text"],
.input-group--error select,
.input-group--error select:not([multiple]),
.input-group--error textarea {
box-shadow: var(--text-error-box-shadow);
color: var(--text-value-color-error);
}

input[type="text"]:focus,
textarea:focus,
select:focus,
select:not([multiple]):focus,
input[type="text"]:focus:hover,
textarea:focus:hover,
select:focus:hover {
Expand All @@ -219,26 +219,26 @@ select[disabled] {
background-image: none;
}

select[disabled],
select:not([multiple])[disabled],
input[type="text"][disabled],
textarea[disabled],
input[type="text"][disabled]:hover,
textarea[disabled]:hover,
select[disabled]:hover {
select:not([multiple])[disabled]:hover {
background-color: var(--text-background-color-disabled);
box-shadow: var(--text-disabled-box-shadow);
color: var(--text-value-color-disabled);
}

.input-group--error input[type="text"]:hover,
.input-group--error textarea:hover,
.input-group--error select:hover {
.input-group--error select:not([multiple]):hover {
box-shadow: var(--text-error-hover-box-shadow);
}

.input-group--error input[type="text"]:focus,
.input-group--error textarea:focus,
.input-group--error select:focus {
.input-group--error select:not([multiple]):focus {
box-shadow: var(--text-error-focus-box-shadow);
}

Expand All @@ -248,35 +248,24 @@ Checkboxes and radios.

input[type="checkbox"],
input[type="radio"] {
@include visually-hidden();
}

input[type="checkbox"],
[role="checkbox"] {
cursor: default;
margin-right: rem(40);

&::before {
margin-right: rem(8);
}

&:focus {
outline: none;
}
appearance: none;
margin: 0;
}

[role="checkbox"] + input[type="checkbox"] {
display: none;
}

label.label--radio,
input[type="radio"] + label,
input[type="checkbox"] + label {
label.label--checkbox,
input[type="checkbox"] + label
[role="checkbox"] {
font-weight: $font-weight-normal;
padding-left: rem(8);
}

input[type="radio"] + label::before,
input[type="checkbox"] + label::before,
input[type="radio"]::before,
input[type="checkbox"]::before,
[role="checkbox"]::before {
border: rem(1) solid;
border-color: var(--checkbox-radio-border-color);
Expand All @@ -285,7 +274,7 @@ input[type="checkbox"] + label::before,
display: block;
float: left;
height: rem(18);
margin-top: rem(1);
margin: 0 rem(8) rem(-4) 0;
transition: border 0.1s ease-out, background-color 0.1s ease-out, box-shadow 0.1s ease-out;
width: rem(18);

Expand All @@ -294,16 +283,22 @@ input[type="checkbox"] + label::before,
}
}

input[type="radio"]::before {
border-radius: 100%;
}

input[type="radio"]::before:focus,
input[type="checkbox"]::before:focus,
[role="checkbox"]::before:focus {
outline: none;
}

input[type="radio"]:disabled + label,
input[type="checkbox"]:disabled + label {
color: var(--text-value-color-disabled);
}

input[type="radio"] + label::before {
border-radius: 100%;
}

input[type="checkbox"]:checked + label::before,
input[type="checkbox"]:checked::before,
[role="checkbox"][aria-checked="true"]::before {
background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="10.572" height="7.742" viewBox="0 0 10.572 7.742"><path d="M.681 3.812l3.148 2.931L9.864.708" fill="none" stroke="%23f9f9f7" stroke-linejoin="round" class="stroke" stroke-width="2"/></svg>');
}
Expand All @@ -313,30 +308,30 @@ input[type="checkbox"]:checked + label::before,
background-size: rem(10) rem(2.5);
}

input[type="radio"]:hover + label::before,
input[type="checkbox"]:hover + label::before,
input[type="radio"]:hover::before,
input[type="checkbox"]:hover::before,
[role="checkbox"]:hover::before {
background-color: var(--checkbox-radio-focus-hover-background-color);
border-color: var(--checkbox-radio-hover-color);
box-shadow: var(--checkbox-radio-hover-box-shadow);
}

input[type="radio"]:active + label::before,
input[type="checkbox"]:active + label::before,
input[type="radio"]:active::before,
input[type="checkbox"]:active::before,
[role="checkbox"]:active::before {
background-color: var(--checkbox-radio-active-color);
border-color: var(--checkbox-radio-hover-color);
box-shadow: var(--checkbox-radio-hover-box-shadow);
}

input[type="radio"]:focus + label::before,
input[type="checkbox"]:focus + label::before,
input[type="radio"]:focus::before,
input[type="checkbox"]:focus::before,
[role="checkbox"]:focus::before {
border-color: var(--checkbox-radio-focus-border-color);
box-shadow: var(--checkbox-radio-focus-box-shadow);
}

input[type="checkbox"]:checked + label::before,
input[type="checkbox"]:checked::before,
[role="checkbox"][aria-checked="mixed"]::before,
[role="checkbox"][aria-checked="true"]::before {
background-color: var(--checkbox-radio-checked-background-color);
Expand All @@ -345,50 +340,50 @@ input[type="checkbox"]:checked + label::before,
border: rem(1) solid var(--checkbox-radio-checked-background-color);
}

input[type="radio"]:checked + label::before {
input[type="radio"]:checked::before {
background: var(--checkbox-radio-checked-background-color);
border-color: var(--checkbox-radio-focus-border-color);
box-shadow: var(--radio-checked-box-shadow);
}

input[type="radio"]:disabled + label::before,
input[type="checkbox"]:disabled + label::before {
input[type="radio"]:disabled::before,
input[type="checkbox"]:disabled::before {
border-color: var(--text-border-color-disabled);
}

input[type="radio"]:disabled:hover + label::before,
input[type="checkbox"]:disabled:hover + label::before,
input[type="radio"]:disabled:hover::before,
input[type="checkbox"]:disabled:hover::before,
[role="checkbox"]:disabled:hover::before {
background: initial;
box-shadow: none;
}

input[type="radio"]:disabled:active + label::before,
input[type="checkbox"]:disabled:active + label::before,
input[type="radio"]:disabled:active::before,
input[type="checkbox"]:disabled:active::before,
[role="checkbox"]:disabled:active::before {
background: initial;
box-shadow: none;
}

input[type="radio"]:checked:hover + label::before {
input[type="radio"]:checked:hover::before {
border-color: var(--checkbox-radio-hover-color);
box-shadow: var(--radio-checked-hover-box-shadow);
}

input[type="radio"]:checked:focus + label::before {
input[type="radio"]:checked:focus::before {
box-shadow: var(--radio-checked-focus-box-shadow);
}

.input-group--inverse [role="checkbox"][aria-checked="mixed"]::before {
background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 2"><path fill="%23000000" d="M0,1A1,1,0,0,0,1,2H7A1,1,0,0,0,7,0H1A1,1,0,0,0,0,1Z"/></svg>');
}

.input-group--inverse input[type="checkbox"]:checked + label::before,
.input-group--inverse input[type="checkbox"]:checked::before,
.input-group--inverse [role="checkbox"][aria-checked="true"]::before {
background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="10.572" height="7.742" viewBox="0 0 10.572 7.742"><path d="M.681 3.812l3.148 2.931L9.864.708" fill="none" stroke="%23000000" stroke-linejoin="round" class="stroke" stroke-width="2"/></svg>');
}

.input-group--inverse input[type="checkbox"]:checked:focus + label::before,
.input-group--inverse input[type="checkbox"]:checked:focus::before,
.input-group--inverse [role="checkbox"][aria-checked="true"]:focus::before {
box-shadow:
0 0 0 calc(2 * var(--border-width)) var(--parent-background-color),
Expand Down
2 changes: 1 addition & 1 deletion src/components/10-atoms/100-form-elements/50-radio-buttons/radio-buttons.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<ul class="input-group {% if inverse %} input-group--inverse{% endif %}{% if select.modifiers %}{% for modifier in select.modifiers %} input-group--{{ modifier }}{% endfor %}{% endif %}">
{% for radioButton in radioButtons %}
<li><input id="{{ radioButton.name }}" type="radio" name="radio" value="{{ value }}"{% if radioButton.checked %} checked{% elseif radioButton.disabled %} disabled{% endif %} /><label for="{{ radioButton.name }}">{{ radioButton.label }}</label></li>
<li><label class="label--radio" for="{{ radioButton.name }}"><input id="{{ radioButton.name }}" type="radio" name="radio" value="{{ value }}"{% if radioButton.checked %} checked{% elseif radioButton.disabled %} disabled{% endif %} />{{ radioButton.label }}</label></li>
{% endfor %}
</ul>
3 changes: 1 addition & 2 deletions src/components/10-atoms/100-form-elements/_checkbox/_checkbox.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{% if standAlone %}<p{% if modifiers %} class="{% for modifier in modifiers %} input-group--{{ modifier }}{% endfor %}"{% endif %}>{% endif %}
<input id="{{ name | slugify }}" type="checkbox" name="{{ name }}" value="{{ value }}"{% if checked %} checked{% endif %}{% if disabled %} disabled{% endif %} />
<label for="{{ name | slugify }}">{{ label }}</label>
<label class="label--checkbox" for="{{ name | slugify }}"><input id="{{ name | slugify }}" type="checkbox" name="{{ name }}" value="{{ value }}"{% if checked %} checked{% endif %}{% if disabled %} disabled{% endif %} />{{ label }}</label>
{% if standAlone %}</p>{% endif %}