Merge branch 'dev' into feat-room

leejaeseong11 · Dec 13, 2023 · ae1edff · ae1edff
2 parents 4e1816a + 57a321d
commit ae1edff
Show file tree

Hide file tree

Showing 8 changed files with 685 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,7 +17,10 @@
     "@fortawesome/vue-fontawesome": "^3.0.5",
     "axios": "^1.6.2",
     "bootstrap": "^5.3.2",
+    "monaco-editor-vue3": "^0.1.10",
+
     "sweetalert2": "^11.10.1",
+
     "vue": "^3.3.4",
     "vue-router": "^4.2.5"
   },

diff --git a/src/assets/main.css b/src/assets/main.css
@@ -14,6 +14,7 @@ body {
   --red-rank-color: #ff7d97;
   --blue-rank-color: #33d6f5;
 
+
   --black-color: #000000;
   --white-color: #ffffff;
   --green-color:#4c7c35;