rebase to master + resolve some conflicts

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Miska Kaipiainen authored and Jari Kolehmainen committed 2020-04-10 10:47:25 +03:00
1 parent 8b3acf2ded
commit dc3e3d90cc
32 files changed
+47 -47

No files matched your search

@@ -1,17 +1,17 @@
.Slider {
.track {
background: $kontenaBlue;
background: $lensBlue;
}
.thumb {
background: $kontenaBlue;
background: $lensBlue;
&.activated, &.jumped, &.focused {
box-shadow: 0 0 0 $unit * 2 rgba($kontenaBlue, 0.16)!important;
box-shadow: 0 0 0 $unit * 2 rgba($lensBlue, 0.16)!important;
}
&:hover{
box-shadow: 0 0 0 $unit rgba($kontenaBlue, 0.16);
box-shadow: 0 0 0 $unit rgba($lensBlue, 0.16);
}
}
}