Skip to content

Commit

Permalink
[fix] update versions
Browse files Browse the repository at this point in the history
  • Loading branch information
mostafabarmshory committed Jan 23, 2024
1 parent 71c2fa8 commit 18e5c0c
Show file tree
Hide file tree
Showing 8 changed files with 3,044 additions and 3,044 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"babel-loader": "^9.1.0",
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
"copy-webpack-plugin": "^11.0.0",
"css-loader": "^6.7.3",
"css-loader": "^6.9.1",
"file-loader": "^6.2.0",
"html-webpack-plugin": "^5.5.0",
"jest": "^29.3.1",
Expand All @@ -32,6 +32,8 @@
"sass-loader": "^13.2.0",
"serve": "^14.1.2",
"source-map-loader": "^4.0.1",
"resolve-url-loader": "^5.0.0",
"url-loader": "^4.1.1",
"style-loader": "^3.3.1",
"typescript": "^4.9.4",
"webpack": "^5.75.0",
Expand All @@ -47,8 +49,6 @@
"chart.js": "^4.0.1",
"chartjs-adapter-luxon": "^1.3.0",
"luxon": "^3.1.1",
"resolve-url-loader": "^5.0.0",
"url-loader": "^4.1.1",
"uuid": "^9.0.0",
"web3": "^1.8.1"
},
Expand Down
2 changes: 1 addition & 1 deletion src/core/sidebar/sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
}

.sidebar-brand {
height: $topbar-base-height;
// height: $topbar-base-height;
text-decoration: none;
font-size: 1rem;
font-weight: 800;
Expand Down
1 change: 1 addition & 0 deletions src/main.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Global styles
import "./variables.scss"
import "./main.scss";

// Global services
Expand Down
16 changes: 8 additions & 8 deletions src/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Option B: Include parts of Bootstrap

// 1. Include functions first (so you can manipulate colors, SVGs, calc, etc)
@import "../node_modules/bootstrap/scss/functions";
// @import "../node_modules/bootstrap/scss/functions";

// 2. Include any default variable overrides here

Expand Down Expand Up @@ -84,13 +84,13 @@ $dropdown-font-size: 0.85rem !default;
$dropdown-border-color: $border-color !default;

// Images
$login-image: 'https://source.unsplash.com/K4mSJ7kc0As/600x800' !default;
$register-image: 'https://source.unsplash.com/Mv9hjnEUHR4/600x800' !default;
$password-image: 'https://source.unsplash.com/oWTW-jNGl9I/600x800' !default;
// $login-image: 'https://source.unsplash.com/K4mSJ7kc0As/600x800' !default;
// $register-image: 'https://source.unsplash.com/Mv9hjnEUHR4/600x800' !default;
// $password-image: 'https://source.unsplash.com/oWTW-jNGl9I/600x800' !default;


// 3. Include remainder of required Bootstrap stylesheets
@import "../node_modules/bootstrap/scss/variables";
@import "../node_modules/bootstrap/scss/mixins";
// // 3. Include remainder of required Bootstrap stylesheets
// @import "../node_modules/bootstrap/scss/variables";
// @import "../node_modules/bootstrap/scss/mixins";

@import "./scss/utilities";
// @import "./scss/utilities";
2 changes: 1 addition & 1 deletion src/webclient/navbar/navbar.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Topbar
.topbar {
height: $topbar-base-height;
// height: $topbar-base-height;
#sidebarToggleTop {
height: 2.5rem;
width: 2.5rem;
Expand Down
4 changes: 2 additions & 2 deletions src/webclient/webclient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import "./webclient.scss";
import "./webclient.xml";

/**
* Root component of the application
* Root component of the web application
*
* This is the mani module and responsilbe to launch the app.
* This is the main component that is responsilbe to launch the app.
*/
@components({
Footer,
Expand Down
3 changes: 1 addition & 2 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ module.exports = function (env, argv) {
}, {
loader: 'sass-loader',
options: {
sourceMap: true,
additionalData: `@import "${path.resolve(__dirname, './src/variables.scss')}";`,
additionalData: `@import "${path.resolve(__dirname, 'src/variables.scss')}";`,
},
}]
}],
Expand Down
Loading

0 comments on commit 18e5c0c

Please sign in to comment.