fixed issue with hr tag mention in 23032 #23078
Conversation
|
@chiraggmodi: please rebase against v4-dev and remove any unrelated changes. |
|
Unrelated change is also touching package-lock.json. |
|
ok so can you guide me how to remove all unrelated changes? as i am doing rebase command but it is showing me conflict error. or do you suggest me to push new PR? |
|
Now it's OK, but it's not rebased. So leave it as is. But if you're feeling adventurous, |
|
As a quick heads up for folks who don't rebase via command line, there's no need to really do it yourself these days. GitHub has a |
|
Yeah, that is why I suggested to leave it as is since we don't have any conflicts :) |
|
Cool, git is really a smart ass!! |
scss/mixins/_forms.scss
Outdated
| &:focus { | ||
| box-shadow: 0 0 0 .2rem rgba($color,.25); | ||
| box-shadow: 0 0 0 0.2rem rgba($color, 0.25); |
There was a problem hiding this comment.
0.2 should be written without a leading zero as .20.25 should be written without a leading zero as .25
scss/mixins/_forms.scss
Outdated
| @@ -56,8 +73,9 @@ | |||
| .was-validated &:#{$state}, | |||
| &.is-#{$state} { | |||
| ~ .custom-control-indicator { | |||
| background-color: rgba($color, .25); | |||
| background-color: rgba($color, 0.25); | |||
There was a problem hiding this comment.
0.25 should be written without a leading zero as .25
scss/mixins/_forms.scss
Outdated
| @@ -40,6 +51,12 @@ | |||
| } | |||
| } | |||
|
|
|||
| textarea.form-control, | |||
There was a problem hiding this comment.
Avoid qualifying class selectors with an element.
scss/mixins/_forms.scss
Outdated
|
|
||
| &:focus { | ||
| box-shadow: 0 0 0 .2rem rgba($color,.25); | ||
| box-shadow: 0 0 0 0.2rem rgba($color, 0.25); |
There was a problem hiding this comment.
0.2 should be written without a leading zero as .20.25 should be written without a leading zero as .25
|
@chiraggmodi: don't mix your patches. What you pushed is wrong. Also, test locally before pushing. |
chiraggmodi
force-pushed
the
issue_23032
branch
from
fec0a7d to
3d4d9f1
Compare
|
yes, mistakenly i have push in wrong branch. |
- enforces the correct order (this shouldn't be dropped in between random rules) - scoped it to immediate children only
scss/_card.scss
Outdated
| @@ -12,6 +12,11 @@ | |||
| background-clip: border-box; | |||
| border: $card-border-width solid $card-border-color; | |||
| @include border-radius($card-border-radius); | |||
|
|
|||
have added
margin-left:0; margin-right:0;to_card.scssto makehrvisible inside.cardclass.Fixes #23032