Skip to content

Commit a777b70

Browse files
committed
bug #672 Fixed the responsive navigation menu (javiereguiluz)
This PR was merged into the master branch. Discussion ---------- Fixed the responsive navigation menu This fixes #670. The responsive menu now it works as expected: ![navbar](https://user-images.githubusercontent.com/73419/31537884-fac46ac0-b003-11e7-94d1-6fba6dc1ace7.gif) The only important change is this one: ```diff // assets/js/app.js +import 'bootstrap-sass/assets/javascripts/bootstrap/collapse.js'; ``` The other changes were introduced by Webpack automatically. Commits ------- 18d8ec0 Fixed the responsive navigation menu
2 parents b61db41 + 18d8ec0 commit a777b70

File tree

9 files changed

+512
-13
lines changed

9 files changed

+512
-13
lines changed

assets/js/app.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// loads the Bootstrap jQuery plugins
2+
import 'bootstrap-sass/assets/javascripts/bootstrap/collapse.js';
23
import 'bootstrap-sass/assets/javascripts/bootstrap/dropdown.js';
34
import 'bootstrap-sass/assets/javascripts/bootstrap/modal.js';
45
import 'bootstrap-sass/assets/javascripts/bootstrap/transition.js';

public/build/css/app.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/js/admin.js

Lines changed: 461 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/js/app.js

Lines changed: 28 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/js/common.js

Lines changed: 8 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/js/login.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
webpackJsonp([6],{nxx7:function(n,a,l){(function(n){n(function(){var a=n("#username"),l=n("#password");a.val()||l.val()||(a.val("jane_admin"),l.val("kitten"))})}).call(a,l("7t+N"))}},["nxx7"]);
1+
webpackJsonp([6],{nxx7:/*!****************************!*\
2+
!*** ./assets/js/login.js ***!
3+
\****************************/
4+
function(n,a,l){(function(n){n(function(){var a=n("#username"),l=n("#password");a.val()||l.val()||(a.val("jane_admin"),l.val("kitten"))})}).call(a,l(/*! jquery */"7t+N"))}},["nxx7"]);

public/build/js/search.js

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/manifest.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@
2525
"build/js/login.js": "/build/js/login.js",
2626
"build/js/search.js": "/build/js/search.js",
2727
"build/manifest.js": "/build/manifest.js"
28-
}
28+
}

0 commit comments

Comments
 (0)