Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Bootstrap 5 #502

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.19.1
18.12.0
14 changes: 8 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"author": "Sushain Cherivirala <[email protected]>",
"license": "GPL-3.0-or-later",
"scripts": {
"build": "ts-node build.ts",
"build": "sass scss/custom.scss src/bootstrap.css && ts-node build.ts",
"serve": "python3 -m http.server --directory dist",
"tsc": "tsc --noEmit",
"eslint": "eslint . --ext .ts,.tsx --max-warnings 0",
"stylelint": "stylelint 'src/**/*.css' --max-warnings 0",
"build-sass": "sass scss/*.scss src/bootstrap.css",
"test": "jest",
"prettier": "prettier . --check",
"verify": "$npm_execpath run tsc && $npm_execpath run eslint && $npm_execpath stylelint && $npm_execpath run prettier && $npm_execpath run test",
Expand All @@ -20,7 +21,7 @@
"@fortawesome/free-solid-svg-icons": "^6.1.1",
"@fortawesome/react-fontawesome": "^0.1.14",
"axios": "^0.28.0",
"bootstrap": "^4.6.0",
"bootstrap": "^5.3.3",
"classnames": "^2.3.1",
"query-string": "^7.1.1",
"react": "^17.0.2",
Expand All @@ -35,7 +36,7 @@
"@testing-library/react-hooks": "^7.0.2",
"@testing-library/user-event": "^13.1.4",
"@types/jest": "^26.0.22",
"@types/node": "^14.14.37",
"@types/node": "^18.12.0",
"@types/react-dom": "^17.0.3",
"@types/react-router-bootstrap": "^0.24.5",
"@types/react-router-dom": "^5.1.7",
Expand All @@ -52,9 +53,10 @@
"jest": "^26.6.3",
"jest-mock-axios": "^4.4.0",
"prettier": "^2.5.1",
"stylelint": "^15.10.1",
"stylelint-config-prettier": "^9.0.3",
"stylelint-config-standard": "^25.0.0",
"sass": "^1.77.7",
"stylelint": "^16.1.0",
"stylelint-config-recommended": "^14.0.1",
"stylelint-config-standard": "^36.0.1",
"ts-node": "^10.4.0",
"typescript": "^4.2.4"
}
Expand Down
22 changes: 22 additions & 0 deletions scss/custom.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
@import "../node_modules/bootstrap/scss/functions";

$link-color: #dd4814;
$nav-link-color: #dd4814;
$nav-link-hover-color: #97310e;

$link-decoration: null;

$dark: #333;

.float-right {
float: right;
}

.form-group {
margin-bottom: 1rem;
}

$link-decoration: none;

@import "../node_modules/bootstrap/scss/variables";
@import "../node_modules/bootstrap/scss/bootstrap";
Loading
Loading