Merge branch 'develop' into 1278-conversation-group-by-date

app/javascript/dashboard/assets/scss/app.scss

@@ -6,7 +6,7 @@
 @import 'variables';
 
 @import '~spinkit/scss/spinners/7-three-bounce';
-@import '~ionicons/scss/ionicons';
+@import '~shared/assets/stylesheets/ionicons';
 
 @import 'mixins';
 @import 'foundation-settings';

app/javascript/dashboard/assets/scss/super_admin/pages.scss

@@ -1,3 +1,3 @@
 @import 'shared/assets/fonts/inter';
 @import '../variables';
-@import '~ionicons/scss/ionicons';
+@import '~shared/assets/stylesheets/ionicons';

app/javascript/shared/assets/fonts/inter.scss

@@ -3,8 +3,8 @@
   font-style: normal;
   font-weight: 100;
   font-display: swap;
-  src: url('~shared/assets/fonts/Inter-Thin-BETA.woff2?v=3.11') format('woff2'),
-       url('~shared/assets/fonts/Inter-Thin-BETA.woff?v=3.11') format('woff');
+  src: url('~shared/assets/fonts/Inter-Thin.woff2') format('woff2'),
+       url('~shared/assets/fonts/Inter-Thin.woff') format('woff');
 }
 
 @font-face {
@@ -12,8 +12,8 @@
   font-style: normal;
   font-weight: 300;
   font-display: swap;
-  src: url('~shared/assets/fonts/Inter-Light-BETA.woff2?v=3.11') format('woff2'),
-       url('~shared/assets/fonts/Inter-Light-BETA.woff?v=3.11') format('woff');
+  src: url('~shared/assets/fonts/Inter-Light.woff2') format('woff2'),
+       url('~shared/assets/fonts/Inter-Light.woff') format('woff');
 }
 
 @font-face {
@@ -21,8 +21,8 @@
   font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: url('~shared/assets/fonts/Inter-Regular.woff2?v=3.11') format('woff2'),
-       url('~shared/assets/fonts/Inter-Regular.woff?v=3.11') format('woff');
+  src: url('~shared/assets/fonts/Inter-Regular.woff2') format('woff2'),
+       url('~shared/assets/fonts/Inter-Regular.woff') format('woff');
 }
 
 @font-face {
@@ -30,8 +30,8 @@
   font-style: italic;
   font-weight: 400;
   font-display: swap;
-  src: url('~shared/assets/fonts/Inter-Italic.woff2?v=3.11') format('woff2'),
-       url('~shared/assets/fonts/Inter-Italic.woff?v=3.11') format('woff');
+  src: url('~shared/assets/fonts/Inter-Italic.woff2') format('woff2'),
+       url('~shared/assets/fonts/Inter-Italic.woff') format('woff');
 }
 
 @font-face {
@@ -39,8 +39,8 @@
   font-style: normal;
   font-weight: 500;
   font-display: swap;
-  src: url('~shared/assets/fonts/Inter-Medium.woff2?v=3.11') format('woff2'),
-       url('~shared/assets/fonts/Inter-Medium.woff?v=3.11') format('woff');
+  src: url('~shared/assets/fonts/Inter-Medium.woff2') format('woff2'),
+       url('~shared/assets/fonts/Inter-Medium.woff') format('woff');
 }
 
 @font-face {
@@ -48,8 +48,8 @@
   font-style: normal;
   font-weight: 600;
   font-display: swap;
-  src: url('~shared/assets/fonts/Inter-SemiBold.woff2?v=3.11') format('woff2'),
-       url('~shared/assets/fonts/Inter-SemiBold.woff?v=3.11') format('woff');
+  src: url('~shared/assets/fonts/Inter-SemiBold.woff2') format('woff2'),
+       url('~shared/assets/fonts/Inter-SemiBold.woff') format('woff');
 }
 
 @font-face {
@@ -57,6 +57,6 @@
   font-style: normal;
   font-weight: 700;
   font-display: swap;
-  src: url('~shared/assets/fonts/Inter-Bold.woff2?v=3.11') format('woff2'),
-       url('~shared/assets/fonts/Inter-Bold.woff?v=3.11') format('woff');
+  src: url('~shared/assets/fonts/Inter-Bold.woff2') format('woff2'),
+       url('~shared/assets/fonts/Inter-Bold.woff') format('woff');
 }

app/javascript/shared/assets/fonts/widget_fonts.scss

@@ -3,8 +3,8 @@
   font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: url('~shared/assets/fonts/Inter-Regular.woff2?v=3.11') format('woff2'),
-       url('~shared/assets/fonts/Inter-Regular.woff?v=3.11') format('woff');
+  src: url('~shared/assets/fonts/Inter-Regular.woff2') format('woff2'),
+       url('~shared/assets/fonts/Inter-Regular.woff') format('woff');
 }
 
 @font-face {
@@ -12,6 +12,6 @@
   font-style: normal;
   font-weight: 500;
   font-display: swap;
-  src: url('~shared/assets/fonts/Inter-Medium.woff2?v=3.11') format('woff2'),
-       url('~shared/assets/fonts/Inter-Medium.woff?v=3.11') format('woff');
+  src: url('~shared/assets/fonts/Inter-Medium.woff2') format('woff2'),
+       url('~shared/assets/fonts/Inter-Medium.woff') format('woff');
 }

app/javascript/shared/assets/stylesheets/ionicons.scss

@@ -0,0 +1,23 @@
+@import "~ionicons/scss/ionicons-variables";
+
+@font-face {
+  font-family: $ionicons-font-family;
+  src: url("#{$ionicons-font-path}/ionicons.woff?v=#{$ionicons-version}") format("woff");
+  font-weight: normal;
+  font-style: normal;
+}
+
+.ion {
+  display: inline-block;
+  font-family: $ionicons-font-family;
+  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  text-transform: none;
+  text-rendering: auto;
+  line-height: 1;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+@import "~ionicons/scss/ionicons-icons";

app/javascript/widget/assets/scss/woot.scss

@@ -7,7 +7,7 @@
 @import 'mixins';
 @import 'forms';
 @import 'shared/assets/fonts/widget_fonts';
-@import '~ionicons/scss/ionicons';
+@import '~shared/assets/stylesheets/ionicons';
 @import '~spinkit/scss/spinners/7-three-bounce';
 
 html,