Skip to content

Commit

Permalink
Improve login logo & upgrade node packages (#123)
Browse files Browse the repository at this point in the history
  • Loading branch information
loic425 authored Nov 22, 2024
2 parents fd6155e + 5489204 commit 30b5f7c
Show file tree
Hide file tree
Showing 8 changed files with 1,541 additions and 3,009 deletions.
3 changes: 3 additions & 0 deletions src/BootstrapAdminUi/assets/styles/_body.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
}

body {
--bs-body-bg: #{$body-bg};
--bs-tertiary-bg: #{$body-bg};
--bs-body-color: #{$body-color};
font-feature-settings: "cv03", "cv04", "cv11";
}

Expand Down
28 changes: 28 additions & 0 deletions src/BootstrapAdminUi/assets/styles/_navbar.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*!
* This file is part of the Sylius package.
*
* (c) Sylius Sp. z o.o.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

.sylius {
&.navbar-nav {
gap: 0.5rem;
}

&.navbar-brand-image {
height: 4rem;
}
}

.navbar-collapse a.nav-link,
.navbar-collapse a.dropdown-item {
transition: all .1s;

&:hover {
color: var(--tblr-primary) !important;
background: transparent;
}
}
9 changes: 2 additions & 7 deletions src/BootstrapAdminUi/assets/styles/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,12 @@

@import "@tabler/core/src/scss/tabler.scss";

body {
--bs-body-bg: #{$body-bg};
--bs-tertiary-bg: #{$body-bg};
--bs-body-color: #{$body-color};
}
@import "body";

@import "alert";
@import "datatable";
@import "form";
@import "navbar";
@import "icons";
@import "sidebar";
@import "tom-select";

@import "body";
15 changes: 9 additions & 6 deletions src/BootstrapAdminUi/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{
"devDependencies": {
"@babel/core": "^7.17.0",
"@babel/preset-env": "^7.25.8",
"@fortawesome/fontawesome-free": "^5.8.1",
"@hotwired/stimulus": "^3.0.0",
"@popperjs/core": "^2.9.2",
"@symfony/stimulus-bridge": "^3.2.2",
"@symfony/ux-autocomplete": "file:vendor/symfony/ux-autocomplete/assets",
"@symfony/ux-live-component": "file:vendor/symfony/ux-live-component/assets",
"@symfony/webpack-encore": "^1.3",
"@tabler/core": "tabler/tabler#dev",
"@symfony/webpack-encore": "^5.0",
"@tabler/core": "^1.0.0-beta21",
"apexcharts": "^3.41.0",
"basiclightbox": "^5.0.4",
"bootstrap": "^5.3.0",
Expand All @@ -18,15 +20,16 @@
"jquery": "^3.5.0",
"mark.js": "^8.11.1",
"postcss": "^8.2.10",
"sass": "^1.54.8",
"sass-loader": "^13.0.0",
"sass": "~1.64.2",
"sass-loader": "~16.0.1",
"slugify": "^1.4.0",
"tom-select": "^2.2.2",
"trix": "^1.3.1",
"webpack": "^5.72",
"webpack-cli": "^5.1.4",
"webpack-rtl-plugin": "^2.0.0"
},
"engines": {
"node": "^18 || ^20"
"node": "^20"
},
"license": "UNLICENSED",
"private": true,
Expand Down
37 changes: 15 additions & 22 deletions src/BootstrapAdminUi/public/app.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/BootstrapAdminUi/public/app.js

Large diffs are not rendered by default.

37 changes: 15 additions & 22 deletions src/BootstrapAdminUi/public/app.rtl.css

Large diffs are not rendered by default.

4,419 changes: 1,468 additions & 2,951 deletions src/BootstrapAdminUi/yarn.lock

Large diffs are not rendered by default.

0 comments on commit 30b5f7c

Please sign in to comment.