Merge branch 'hotfix/1.22.1' into develop

# Conflicts: # db/schema.rb
2021-11-22 23:35:44 +05:30
parent 1a8b8f0900 791d90c6b7
commit 0033a35ab8
38 changed files with 211 additions and 95 deletions
--- a/app/javascript/dashboard/assets/scss/_utility-helpers.scss
+++ b/app/javascript/dashboard/assets/scss/_utility-helpers.scss
@@ -2,6 +2,10 @@
  margin-right: var(--space-small);
 }

+.margin-right-smaller {
+  margin-right: var(--space-smaller);
+}
+
 .fs-small {
  font-size: var(--font-size-small);
 }
@@ -42,3 +46,7 @@
 .bg-white {
  background-color: var(--white);
 }
+
+.text-y-800 {
+  color: var(--y-800);
+}