Docs - switch to using bootstrap from npm

sonic-pi-net · Sep 9, 2021 · 9a22e06 · 9a22e06
1 parent eee5418
commit 9a22e06
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 4 deletions.
diff --git a/etc/docs/assets/css/app.scss b/etc/docs/assets/css/app.scss
@@ -1,5 +1,5 @@
 /* This file is for your main application css. */
-
+@import "../node_modules/bootstrap/scss/bootstrap";
 /* LiveView specific classes for your customizations */
 .phx-no-feedback.invalid-feedback,
 .phx-no-feedback .invalid-feedback {

diff --git a/etc/docs/assets/js/app.js b/etc/docs/assets/js/app.js
@@ -1,6 +1,7 @@
 // We need to import the CSS so that webpack will load it.
 // The MiniCssExtractPlugin is used to separate it out into
 // its own CSS file.
+import 'bootstrap';
 import "../css/app.scss"
 
 // webpack automatically bundles all modules in your

diff --git a/etc/docs/assets/package-lock.json b/etc/docs/assets/package-lock.json
diff --git a/etc/docs/assets/package.json b/etc/docs/assets/package.json
@@ -7,6 +7,7 @@
  "watch": "webpack --mode development --watch"
  },
  "dependencies": {
+ "bootstrap": "^5.1.1",
  "phoenix": "file:../deps/phoenix",
  "phoenix_html": "file:../deps/phoenix_html",
  "phoenix_live_view": "file:../deps/phoenix_live_view",
@@ -20,8 +21,8 @@
  "css-loader": "^3.4.2",
  "hard-source-webpack-plugin": "^0.13.1",
  "mini-css-extract-plugin": "^0.9.0",
- "sass": "^1.37.5",
  "optimize-css-assets-webpack-plugin": "^5.0.1",
+ "sass": "^1.37.5",
  "sass-loader": "^8.0.2",
  "terser-webpack-plugin": "^2.3.2",
  "webpack": "^4.41.5",

diff --git a/etc/docs/lib/docs_web/templates/layout/root.html.leex b/etc/docs/lib/docs_web/templates/layout/root.html.leex
@@ -7,11 +7,9 @@
  <%= csrf_meta_tag() %>
  <%= live_title_tag assigns[:page_title] || "Docs", suffix: " · Phoenix Framework" %>
  <link phx-track-static rel="stylesheet" href="<%= Routes.static_path(@conn, "/css/app.css") %>"/>
- <link phx-track-static rel="stylesheet" href="<%= Routes.static_path(@conn, "/css/bootstrap.min.css") %>"/>
  <script defer phx-track-static type="text/javascript" src="<%= Routes.static_path(@conn, "/js/app.js") %>"></script>
  </head>
  <body>
  <%= @inner_content %>
- <script defer phx-track-static type="text/javascript" src="<%= Routes.static_path(@conn, "/js/bootstrap.bundle.min.js") %>"></script>
  </body>
 </html>