fix: update custom react-summernote and fix lint issues

Coursemology · Mar 6, 2022 · c0c97c3 · c0c97c3
1 parent 4536835
commit c0c97c3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
@@ -31,6 +31,12 @@ textarea.code {
 .note-editor {
   @extend .note-editor, .note-frame;
   @extend .panel;
+
+  .note-popover .popover-content {
+    line-height: 2.5;
+    padding: 5px;
+    padding-right: 0;
+  }
 }
 
 table.codehilite {
@@ -78,20 +84,17 @@ table.codehilite {
 }
 
 // Summernote defaults
+$summernote-border-color: #e4e4e4;
+
 .note-editor,
 .note-editor.note-airframe {
-  border: 1px solid #e4e4e4;
+  border: 1px solid $summernote-border-color;
   overflow: visible;
 }
 
 .note-editor.note-airframe .note-editing-area .note-editable,
 .note-editor.note-frame .note-editing-area .note-editable,
 .note-editor .note-editing-area .note-editable {
-  padding: 10px 10px;
-  color: #000;
+  color: black;
+  padding: 10px;
 }
-
-.note-editor .note-popover .popover-content {
-  line-height: 2.5;
-  padding: 5px 0 5px 5px;
-}
diff --git a/client/package.json b/client/package.json
@@ -115,7 +115,7 @@
     "react-router": "^4.3.1",
     "react-router-dom": "^4.3.1",
     "react-scroll": "^1.8.4",
-    "react-summernote": "github:zhuhanming/react-summernote#v1.1",
+    "react-summernote": "github:zhuhanming/react-summernote#v1.2",
     "react-tooltip": "^4.2.21",
     "redux": "^4.1.1",
     "redux-form": "^7.4.3",

diff --git a/client/yarn.lock b/client/yarn.lock
@@ -2884,7 +2884,7 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-codemirror@^5.26.0:
+codemirror@^5.65.2:
   version "5.65.2"
   resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.2.tgz#5799a70cb3d706e10f60e267245e3a75205d3dd9"
   integrity sha512-SZM4Zq7XEC8Fhroqe3LxbEEX1zUPWH1wMr5zxiBuiUF64iYOUH/JI88v4tBag8MiBS8B8gRv8O1pPXGYXQ4ErA==
@@ -7028,7 +7028,7 @@ prompts@^2.0.1:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
-prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.0, prop-types@^15.7.2, prop-types@^15.8.0:
+prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.0, prop-types@^15.7.2, prop-types@^15.8.0, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
   integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -7380,13 +7380,13 @@ react-shallow-renderer@^16.13.1:
     object-assign "^4.1.1"
     react-is "^16.12.0 || ^17.0.0"
 
-"react-summernote@github:zhuhanming/react-summernote#v1.1":
+"react-summernote@github:zhuhanming/react-summernote#v1.2":
   version "2.0.0"
-  resolved "https://codeload.github.com/zhuhanming/react-summernote/tar.gz/f12a57ecc6b3da02880053fc7e271035e572230d"
+  resolved "https://codeload.github.com/zhuhanming/react-summernote/tar.gz/11d35e2f3dc7741dfb174ae011f6206ea90e02ef"
   dependencies:
-    codemirror "^5.26.0"
-    prop-types "^15.5.10"
-    summernote "^0.8.15"
+    codemirror "^5.65.2"
+    prop-types "^15.8.1"
+    summernote "^0.8.20"
 
 react-test-renderer@^17.0.0, react-test-renderer@^17.0.2:
   version "17.0.2"
@@ -8378,7 +8378,7 @@ style-loader@^3.3.1:
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575"
   integrity sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==
 
-summernote@^0.8.15:
+summernote@^0.8.20:
   version "0.8.20"
   resolved "https://registry.yarnpkg.com/summernote/-/summernote-0.8.20.tgz#395905f2cec0aceebc712edc019d91b8ef88f7cf"
   integrity sha512-W9RhjQjsn+b1s9xiJQgJbCiYGJaDAc9CdEqXo+D13WuStG8lCdtKaO5AiNiSSMJsQJN2EfGSwbBQt+SFE2B8Kw==