diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d33a61c..e0eecee 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -10,11 +10,13 @@ // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details // about supported directives. // -//= require_tree . //= require jquery //= require jquery_ujs // Bootstrap 3.3.6 in vendor/assets/javascripts //= require bootstrap.min.js // Data Tables 1.10.6 in vendor/assets/javascripts //= require jquery.dataTables.min.js +//= require turbolinks +// +//= require_tree . diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 82024f4..3f498d9 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -10,10 +10,10 @@ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new * file per style scope. * - *= require_tree . - *= require_self * Bootstrap 3.3.6 in vendor/assets/stylesheets *= require bootstrap.min.css *= require bootstrap-theme.min.css - - */ \ No newline at end of file + *= require_tree . + *= require custom + *= require_self + */ diff --git a/app/assets/stylesheets/custom.css b/app/assets/stylesheets/custom.css new file mode 100644 index 0000000..bcdf66f --- /dev/null +++ b/app/assets/stylesheets/custom.css @@ -0,0 +1,8 @@ +.navbar-inverse.navbar-fixed-top { + z-index: 1040; /* Ensure main navbar is above tournament navbar */ +} + +#tournament-navbar { + top: 50px; /* Position below the first fixed navbar */ + z-index: 1030; /* Explicitly set standard fixed navbar z-index */ +} \ No newline at end of file diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 403947a..b21f2b7 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -10,7 +10,7 @@ WrestlingDev