Include Bootstrap after application assets.

renderedtext · Mar 28, 2014 · 95aa770 · 95aa770
1 parent e55b9c3
commit 95aa770
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
@@ -5,12 +5,12 @@
 
     <title>Base Application - Admin Dashboard</title>
 
-    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css">
-    <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.min.js"></script>
-
     <%= stylesheet_link_tag "application" %>
     <%= javascript_include_tag "application" %>
 
+    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css">
+    <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.min.js"></script>
+
     <%= csrf_meta_tags %>
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -5,12 +5,12 @@
 
     <title>Base Application</title>
 
-    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css">
-    <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.min.js"></script>
-
     <%= stylesheet_link_tag "application" %>
     <%= javascript_include_tag "application" %>
 
+    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css">
+    <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.min.js"></script>
+
     <%= csrf_meta_tags %>
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">