You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2020/10/30 21:47:39 UTC

[allura] 09/10: [#8260] avoid style bleed onto a button; update SimpleMDE->EasyMDE terms

This is an automated email from the ASF dual-hosted git repository.

brondsem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git

commit aca2f28f31ca0b99d71eebee182dd53254797d48
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Fri Oct 30 20:47:32 2020 +0000

    [#8260] avoid style bleed onto a button; update SimpleMDE->EasyMDE terms
---
 Allura/allura/lib/widgets/resources/js/sf_markitup.js | 2 +-
 Allura/allura/nf/allura/css/site_style.css            | 4 ----
 Allura/allura/public/nf/js/memorable.js               | 6 +++---
 rat-excludes.txt                                      | 4 ++--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Allura/allura/lib/widgets/resources/js/sf_markitup.js b/Allura/allura/lib/widgets/resources/js/sf_markitup.js
index 7d34752..d676126 100644
--- a/Allura/allura/lib/widgets/resources/js/sf_markitup.js
+++ b/Allura/allura/lib/widgets/resources/js/sf_markitup.js
@@ -81,7 +81,7 @@ $(window).load(function() {
             });
             Memorable.add(editor);
             // https://github.com/codemirror/CodeMirror/issues/1576#issuecomment-19146595
-            // can't use simplemde's shortcuts settings, since those only hook into bindings set up for each button
+            // can't use easymde's shortcuts settings, since those only hook into bindings set up for each button
             editor.codemirror.options.extraKeys.Home = "goLineLeft";
             editor.codemirror.options.extraKeys.End = "goLineRight";
 
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 9f1f444..77e4c7c 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -163,10 +163,6 @@ html {
   -webkit-font-smoothing: antialiased;
 }
 
-.link {
-  color: #0077aa;
-}
-
 ul {
   margin-left: 30px;
   margin-bottom: 1em;
diff --git a/Allura/allura/public/nf/js/memorable.js b/Allura/allura/public/nf/js/memorable.js
index 9ef07a7..f5b5428 100644
--- a/Allura/allura/public/nf/js/memorable.js
+++ b/Allura/allura/public/nf/js/memorable.js
@@ -192,17 +192,17 @@ Memorable.InputBasic = (function() {
 
 
 /**
- * Class describing a field backed by SimpleMDE, as identified by the passed instance of `SimpleMDE` provided, with specific methods for
+ * Class describing a field backed by EasyMDE, as identified by the passed instance of `EasyMDE` provided, with specific methods for
  * getting & setting the value, and finding it's parent form
  *
- * @property obj: the SimpleMDE object describing the field to be tracked
+ * @property obj: the EasyMDE object describing the field to be tracked
  * @property watchEvent: the name of the event to watch to detect when changes have been made
  * @property watchObj: the object instance to watch for events on; editor.codemirror per their docs
  * @property $el: the jquery object representing the actual input field on the page
  */
 Memorable.InputMDE = (function() {
     /**
-     * @param obj: A SimpleMDE object representing the input field
+     * @param obj: A EasyMDE object representing the input field
      * @constructor
      */
     function InputMDE(obj) {
diff --git a/rat-excludes.txt b/rat-excludes.txt
index f73e853..03f25ea 100644
--- a/rat-excludes.txt
+++ b/rat-excludes.txt
@@ -19,13 +19,13 @@ Allura/allura/lib/widgets/resources/css/colorPicker.css
 Allura/allura/lib/widgets/resources/css/jqfontselector.css
 Allura/allura/lib/widgets/resources/css/jquery.tagsinput.css
 Allura/allura/lib/widgets/resources/css/show-hint.css
-Allura/allura/lib/widgets/resources/css/simplemde.min.css
+Allura/allura/lib/widgets/resources/css/easymde.min.css
 Allura/allura/lib/widgets/resources/js/jqfontselector.js
 Allura/allura/lib/widgets/resources/js/jquery.autosize-min.js
 Allura/allura/lib/widgets/resources/js/jquery.colorPicker.js
 Allura/allura/lib/widgets/resources/js/jquery.tagsinput.js
 Allura/allura/lib/widgets/resources/js/show-hint.js
-Allura/allura/lib/widgets/resources/js/simplemde.min.js
+Allura/allura/lib/widgets/resources/js/easymde.min.js
 Allura/allura/nf/responsive/scss/_settings.scss
 Allura/allura/public/nf/css/blueprint/
 Allura/allura/public/nf/css/chosen.min.css