Skip to content

New options realization #300

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

Open
mikhailovSvyat wants to merge 2 commits into
base: master
Choose a base branch
from
Open

New options realization #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68f97d1
Redefine options
mikhailov-s Sep 27, 2019
f1d3720
Add animation
mikhailov-s Sep 27, 2019
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
23 changes: 12 additions & 11 deletions src/v2/scss/components/_forms/_checkbox.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
.ui.option {

.control__indicator::after {
top: 0;
transform: translateY(-4px);
}

&.checkbox {
.control__input {
&:checked ~ .control__indicator {
background: $control-checked-bg url("/static/v2/img/icons/checkmark.svg") no-repeat center;
}
}

&.disabled {
.control__input {
&:checked ~ .control__indicator {
background: $control-disabled-bg url("/static/v2/img/icons/checkmark.svg") no-repeat center;
}
&:checked ~ .control__indicator::after {
background-image: url("/static/v2/img/icons/checkmark.svg");
background-repeat: no-repeat;
background-position: 50% 50%;
transform: translateY(0);
}
}
}
}
}
5 changes: 2 additions & 3 deletions src/v2/scss/components/_forms/_inputs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,8 @@
//Error

.ui.input.error > input,
.ui.input.error > textarea,
.error .ui.option.radio:not(.disabled) > .control__indicator,
.error .ui.option.checkbox:not(.disabled) > .control__indicator {
.ui.input.error > textarea
{
background-color: $form-feedback-color;
border:$control-border-width solid $form-feedback-invalid-color;
&:hover {
Expand Down
122 changes: 72 additions & 50 deletions src/v2/scss/components/_forms/_options.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,82 +4,97 @@
// Default styles for checkbox and radio

.ui.option {
display: flex;
align-items: flex-start;
margin: 0 0 spacer("4x") 0;
cursor: pointer;
display: block;
position: relative;
margin-bottom: 1rem;
padding-left: 26px;
cursor: pointer;
line-height: 1.2;
font-size: $font-size-base;
font-size: $font-size-content-base;

&:hover {
.control__indicator {
border-color: $control-bg-hover;
.control__input {
position: absolute;
width: 1px;
height: 1px;
margin: -1px;
padding: 0;
overflow: hidden;
border: 0;
clip: rect(0 0 0 0);
}

.control__indicator {
line-height: 1.2;

&::after {
content: "";
position: absolute;
z-index: 201;
left: 0;
width: $control-size;
height: $control-size;
opacity: 0;
}

.control__description {
color: $input-color;
&::before {
content: "";
display: block;
position: absolute;
z-index: 200;
width: $control-size;
height: $control-size;
top: 0;
left: 0;
border-radius: $border-radius;
border: $control-border-width solid $control-border-color;
background-color: $control-bg;
transition: .075s ease-out;
transition-property: transform, border-color, background-color;
}
}

.control__input {
position: absolute;
top: 50%;
left: 12px;
transform: translate(-50%, -50%);
opacity: 0;
margin: 0;
padding: 0;

&:checked {
~ .control__indicator {
.control__input:checked {
~ .control__indicator {
&::before {
border: none;
background: $control-checked-bg;
background-color: $control-checked-bg;
}

&::after {
opacity: 1;
transition: opacity .075s ease-in-out, transform .125s ease-in-out;
}
}
}

&:focus {
~ .control__indicator {
.control__input:focus {
~ .control__indicator {
&::before {
border: none;
box-shadow: inset 0 0 2px 1px rgba($gray-darker, .5);
}
}
}

.control__indicator {
display: block;
position: absolute;
width: $control-size;
height: $control-size;
border: $control-border-width solid $control-border-color;
border-radius: $border-radius;
background-color: $control-bg;
background-size: 135%;
}

.control__description {
margin: 0 0 0 26px;
display: inline-block;
color: $control-color;
&:hover {
.control__indicator::before {
border: $control-border-width solid $gray-dark;
}
}

&.disabled {
cursor: default;
opacity: .5;

&:hover .control__indicator {
border-color: $control-border-color;
.control__indicator::before {
border-color: $control-disabled-bg;
}

.control__input {
&:checked ~ .control__indicator {
background: $control-disabled-bg;

&:hover {
.control__indicator::before {
border-color: $control-disabled-bg;
}
}

.control__description {
color: $control-disabled-bg;
}
}
}

Expand All @@ -89,7 +104,7 @@
display: block;

.option:last-child {
margin-bottom: 0!important;
margin-bottom: 0 !important;
}

&.inline {
Expand All @@ -115,3 +130,10 @@
}
}
}

//Error

.grouped.error .ui.option.radio:not(.disabled) > .control__indicator::before,
.grouped.error .ui.option.checkbox:not(.disabled) > .control__indicator::before {
border-color: $red;
}
26 changes: 14 additions & 12 deletions src/v2/scss/components/_forms/_radio.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,24 @@
&.radio {
.control__input {
&:checked ~ .control__indicator::after {
content: "";
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
margin: auto;
width: 10px;
height: 10px;
left: 6px;
top: 6px;
width: 8px;
height: 8px;
background-color: #fff;
border-radius: 50%;
background: $white;
transform: scale(1);
}
}

.control__indicator {
.control__indicator::before {
border-radius: 50%;
}

.control__indicator::after {
background-image: none;
transform: scale(.5);
transition: opacity .075s ease-in-out, transform .125s ease-in-out;
}
}
}
}