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

@@ -7,7 +7,7 @@
cursor: pointer;
.param-link-text {
color: $kontenaBlue;
color: $lensBlue;
text-decoration: underline;
}
}
@@ -51,7 +51,7 @@
}
.drawer-title {
background: $kontenaBlue;
background: $lensBlue;
color: $drawerTitleText;
padding: $padding $padding * 2.5;
word-break: break-all;