Skip to content

Commit

Permalink
minor #1452 Import the entire Bootstrap styles (javiereguiluz)
Browse files Browse the repository at this point in the history
This PR was merged into the main branch.

Discussion
----------

Import the entire Bootstrap styles

Here's another proposal to improve `@weaverryan`'s work on #1449.

We already import 90% of Bootstrap so, why not import 100% of it?

Commits
-------

bae0115 Import the entire Bootstrap styles
  • Loading branch information
javiereguiluz committed Nov 10, 2023
2 parents b19c543 + bae0115 commit 206f0c9
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 43 deletions.
40 changes: 1 addition & 39 deletions assets/styles/app.scss
Original file line number Diff line number Diff line change
@@ -1,44 +1,6 @@
@import "variables";

// @import "~bootstrap/scss/bootstrap.scss";
@import "~bootstrap/scss/functions";
@import "~bootstrap/scss/variables";
@import "~bootstrap/scss/mixins";
@import "~bootstrap/scss/root";
@import "~bootstrap/scss/reboot";
@import "~bootstrap/scss/type";
// @import "~bootstrap/scss/images";
@import "~bootstrap/scss/code";
@import "~bootstrap/scss/grid";
@import "~bootstrap/scss/tables";
@import "~bootstrap/scss/forms";
@import "~bootstrap/scss/buttons";
@import "~bootstrap/scss/transitions";
@import "~bootstrap/scss/dropdown";
@import "~bootstrap/scss/button-group";
@import "~bootstrap/scss/input-group";
// @import "~bootstrap/scss/custom-forms";
@import "~bootstrap/scss/nav";
@import "~bootstrap/scss/navbar";
// @import "~bootstrap/scss/card";
@import "~bootstrap/scss/breadcrumb";
@import "~bootstrap/scss/pagination";
@import "~bootstrap/scss/badge";
@import "~bootstrap/scss/jumbotron";
@import "~bootstrap/scss/alert";
// @import "~bootstrap/scss/progress";
// @import "~bootstrap/scss/media";
// @import "~bootstrap/scss/list-group";
@import "~bootstrap/scss/close";
// @import "~bootstrap/scss/toasts";
@import "~bootstrap/scss/modal";
// @import "~bootstrap/scss/tooltip";
// @import "~bootstrap/scss/popover";
// @import "~bootstrap/scss/carousel";
// @import "~bootstrap/scss/spinners";
@import "~bootstrap/scss/utilities";
// @import "~bootstrap/scss/print";

@import "~bootstrap/scss/bootstrap.scss";
@import "~bootswatch/dist/flatly/bootswatch";
@import "~@fortawesome/fontawesome-free/css/all.css";
@import "~@fortawesome/fontawesome-free/css/v4-shims.css";
Expand Down
1 change: 0 additions & 1 deletion public/build/app.69248a88.css

This file was deleted.

7 changes: 7 additions & 0 deletions public/build/app.c47b2171.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/build/entrypoints.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
],
"css": [
"/build/691.5d22d6da.css",
"/build/app.69248a88.css"
"/build/app.c47b2171.css"
]
},
"admin": {
Expand All @@ -30,7 +30,7 @@
"/build/691.00474683.js": "sha384-IebcSy563+wytSYXkK+fxDGaR3Q7j+zmBrvadQzX3tHevDTxSKFhv29BMJkywEAS",
"/build/app.d0240a16.js": "sha384-4BU8VUhz6QMUbpucsazGKDfz6MYAEhLm/BcTFKYqnSr2iuhPJbnv8JDWbray+BYU",
"/build/691.5d22d6da.css": "sha384-Aj2DvjS/WxFSIf9uLVnmH9Dw6pixHWGKWrOnGxgr2eRW82BIPnXYihtUQyUMQmGm",
"/build/app.69248a88.css": "sha384-PrKQAly7R/8zHHp8fCKA9ARh+vjdDgilK6mdMWngFCuYwPO7xtpg+iDME2l5+pHm",
"/build/app.c47b2171.css": "sha384-2vmeQcQ7F1lU6tWi6tvuPzUG0oqZgBua30hLvTmemTgzLIBbin/5/by0G1r+f0Oc",
"/build/673.a8a6034c.js": "sha384-hsruohAAUG973CEl8FPGEzptQtqKi2m4i5/f7AK0WdjVA2HABqo4PDIl5F0ADoI2",
"/build/admin.2e00d7c6.js": "sha384-YdDZ6+TI8dzJ9EiFd0aE8XviYeBOqUkEs1AL2l+Xxwyr8bU/KuUdxdGefgKpJIYq",
"/build/admin.fd62a737.css": "sha384-fvoGdQq5TDnWkCaATqeO2OTzoej/gs53cfF+zl4mhBgy0Vf39tFB0tBXaVf/Ijno"
Expand Down
2 changes: 1 addition & 1 deletion public/build/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"build/app.css": "/build/app.69248a88.css",
"build/app.css": "/build/app.c47b2171.css",
"build/app.js": "/build/app.d0240a16.js",
"build/admin.css": "/build/admin.fd62a737.css",
"build/admin.js": "/build/admin.2e00d7c6.js",
Expand Down

0 comments on commit 206f0c9

Please sign in to comment.