Skip to content
Snippets Groups Projects
Unverified Commit b79a2214 authored by Ahmad Farhat's avatar Ahmad Farhat Committed by GitHub
Browse files

More cleanup and font change (#4549)

* More cleanup and font change

* eslint
parent 4f98632a
No related branches found
No related tags found
No related merge requests found
Showing with 13 additions and 5 deletions
File added
File added
File added
File added
File added
File added
File added
File added
File added
......@@ -9,6 +9,7 @@
@import 'presentation';
@import 'admin_panel';
@import 'pagination';
@import 'fonts';
html,
body {
......@@ -17,6 +18,7 @@ body {
body {
background: whitesmoke;
font-family: "Inter";
}
#navbar {
......
/*** FONTS ***/
@font-face {
font-family: 'Inter';
src: url('Inter-Regular.ttf');
}
\ No newline at end of file
......@@ -24,5 +24,3 @@ $column-md-width: 150px;
$column-lg-width: 325px;
$input-max-width: 300px;
\ No newline at end of file
$font-family-base: "Montserrat", Sans-serif !important;
......@@ -41,10 +41,12 @@ export default function RoomJoin() {
const path = encodeURIComponent(location.pathname);
useEffect(() => { // set cookie to return to if needed
document.cookie = `location=${path};path=/;`;
const date = new Date();
date.setTime(date.getTime() + (60 * 1000)); // expire the cookie in 1min
document.cookie = `location=${path};path=/;expires=${date.toGMTString()}`;
return () => { // delete redirect location when unmounting
document.cookie = 'location=;path=/;expires=Thu, 01 Jan 1970 00:00:00 GMT';
document.cookie = `location=${path};path=/;expires=Thu, 01 Jan 1970 00:00:00 GMT`;
};
}, []);
......
......@@ -9,6 +9,7 @@ Rails.application.config.assets.version = '1.0'
# Rails.application.config.assets.paths << Emoji.images_path
Rails.application.config.assets.paths << Rails.root.join('node_modules/bootstrap-icons/font')
Rails.application.config.assets.paths << Rails.root.join('app/assets/locales')
Rails.application.config.assets.paths << Rails.root.join('app/assets/fonts')
# Precompile additional assets.
# application.jsx, application.css, and all non-JS/CSS in the app/assets
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment