Merge branch 'v4-dev' into yiq-function-update

7 files changed, 11 insertions, 23 deletions

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index d9fc88e2b..98b760eca 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -14,7 +14,7 @@ When reporting a bug, include:
 
 - Operating system and version (Windows, Mac OS X, Android, iOS, Win10 Mobile)
 - Browser and version (Chrome, Firefox, Safari, IE, MS Edge, Opera 15+, Android Browser)
-- Reduced test cases and potential fixes using [JS Bin](https://jsbin.com/)
+- Reduced test cases and potential fixes using [CodePen](https://codepen.io/) or [JS Bin](https://jsbin.com/)
 
 When suggesting a feature, include:
 
diff --git a/docs/4.0/examples/screenshots/equal-height-columns.jpg b/docs/4.0/examples/screenshots/equal-height-columns.jpg
deleted file mode 100644
index 63b043f48..000000000
--- a/docs/4.0/examples/screenshots/equal-height-columns.jpg
+++ /dev/null
diff --git a/docs/4.0/examples/screenshots/non-responsive.jpg b/docs/4.0/examples/screenshots/non-responsive.jpg
deleted file mode 100644
index 4262d5dd0..000000000
--- a/docs/4.0/examples/screenshots/non-responsive.jpg
+++ /dev/null
diff --git a/docs/4.0/examples/screenshots/theme.jpg b/docs/4.0/examples/screenshots/theme.jpg
deleted file mode 100644
index 2b966ff9a..000000000
--- a/docs/4.0/examples/screenshots/theme.jpg
+++ /dev/null
diff --git a/js/.eslintrc.json b/js/.eslintrc.json
index 7316e6f22..fc5f6a491 100644
--- a/js/.eslintrc.json
+++ b/js/.eslintrc.json
@@ -3,8 +3,7 @@
   "parser": "babel-eslint",
   "env": {
     "browser": true,
-    "es6": true,
-    "jquery": true
+    "es6": true
   },
   "extends": "eslint:recommended",
   "plugins": ["compat"],
diff --git a/js/tests/.eslintrc.json b/js/tests/.eslintrc.json
index 460286508..1452045e2 100644
--- a/js/tests/.eslintrc.json
+++ b/js/tests/.eslintrc.json
@@ -1,7 +1,8 @@
 {
   "env": {
     "es6": false,
-    "qunit": true
+    "qunit": true,
+    "jquery": true
   },
   "globals": {
     "Util": false
diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index a0ccc06fb..6b023e82e 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -74,13 +74,6 @@
     position: static;
     float: none;
   }
-
-  .dropdown-toggle {
-    &::after {
-      border-top: $caret-width solid;
-      border-bottom: 0;
-    }
-  }
 }
 
 
@@ -151,18 +144,6 @@
           padding-right: 0;
           padding-left: 0;
         }
-
-        .dropup {
-          .dropdown-menu {
-            position: absolute;
-            top: auto;
-            bottom: 100%;
-          }
-
-          .dropdown-toggle {
-            @include caret(up);
-          }
-        }
       }
 
       @include media-breakpoint-up($next) {
@@ -203,6 +184,13 @@
         .navbar-toggler {
           display: none;
         }
+
+        .dropup {
+          .dropdown-menu {
+            top: auto;
+            bottom: 100%;
+          }
+        }
       }
     }
   }