Merge branch 'master' into jiwon

client/src/scss/custom.scss

@@ -34,6 +34,13 @@ $theme-colors: map-merge($theme-colors, $custom-colors);
     justify-content: center;
 }
 
+@font-face {
+  font-family: 'HangeulNuri-Bold';
+  src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_three@1.0/HangeulNuri-Bold.woff') format('woff');
+  font-weight: normal;
+  font-style: normal;
+}
+
 @media (max-width: 767px) {
     .carousel-inner .carousel-item > div {
         display: none;
@@ -60,4 +67,8 @@ $theme-colors: map-merge($theme-colors, $custom-colors);
 .carousel-inner .carousel-item-end,
 .carousel-inner .carousel-item-start { 
   transform: translateX(0);
-}
\ No newline at end of file
+}
+
+// .nav-link{
+//   color: yellow;
+// }
\ No newline at end of file