Skip to content

Commit

Permalink
Update node packages, replace depreciated bootstrap class 'navbar-dar…
Browse files Browse the repository at this point in the history
…k' (#170)

* bootstrap v5.3.2 to v5.3.3
* autoprefixer v9.8.8 to 10.4.19
* cssnano v4.1.11 to 7.0.1
* grunt-postcss v0.9.0 to @lodder/grunt-postcss v3.1.1
* postcss 8.4.31 to 8.4.38
* @eonasdan/tempus-dominus v6.7.19 to v6.9.4

Replace depreciated Bootstrap navbar-dark class

* Dark navbar items: Add attribute data-bs-theme="dark"
* Ligth navbar items: Add attribute data-bs-theme="light"

Bump version to v7.0.1
  • Loading branch information
axunonb authored May 6, 2024
1 parent 5171bf0 commit 30647c4
Show file tree
Hide file tree
Showing 8 changed files with 620 additions and 3,035 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Copyright>Copyright 2011-$(CurrentYear) axuno gGmbH</Copyright>
<RepositoryUrl>https://github.com/axuno/Volleyball-League</RepositoryUrl>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<Version>7.0.0</Version>
<Version>7.0.1</Version>
<FileVersion>7.0.0</FileVersion>
<AssemblyVersion>7.0.0.0</AssemblyVersion> <!--only update AssemblyVersion with major releases -->
<LangVersion>latest</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion League.Demo/Views/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</div>
</div>
</header>
<nav id="nav-main" class="navbar navbar-expand-md navbar-dark rounded ps-2 site-sticky-top">
<nav id="nav-main" class="navbar navbar-expand-md rounded ps-2 site-sticky-top" data-bs-theme="dark">
@* bootstrap class "sticky-top" interferes with modal, that's why we use our identical "site-sticky-top" *@
<div class="container-fluid ps-0">
@* <a class="navbar-brand" href="#">axuno</a>*@
Expand Down
2 changes: 1 addition & 1 deletion League/Areas/Admin/Views/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</div>
</div>
</header>
<nav id="nav-main" class="navbar navbar-expand-md navbar-dark rounded ps-2 site-sticky-top">
<nav id="nav-main" class="navbar navbar-expand-md rounded ps-2 site-sticky-top" data-bs-theme="dark">
@* bootstrap 4 class "sticky-top" interferes with modal, that's why we use our identical "site-sticky-top" *@
<div class="container-fluid ps-0">
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-header" aria-controls="navbar-header" aria-expanded="false" aria-label="Toggle navigation">
Expand Down
6 changes: 3 additions & 3 deletions League/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = function (grunt) {
const sass = require('node-sass'); // used in grunt-sass options, must be included in package.json

grunt.loadNpmTasks('grunt-sass');
grunt.loadNpmTasks('grunt-postcss');
grunt.loadNpmTasks('@lodder/grunt-postcss'); // grunt-postcss is retired, use @lodder/grunt-postcss
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-copy');
Expand Down Expand Up @@ -38,10 +38,10 @@ module.exports = function (grunt) {
// Postcss
postcss: {
options: {
// map: true, // inline sourcemaps
// map: true, // inline source maps
// or
map: {
inline: false, // save all sourcemaps as separate files...
inline: false, // save all source maps as separate files...
annotation: 'wwwroot/css/maps/', // ...to the specified directory relative to the project root
sourcesContent: true // whether original contents (e.g. Sass sources) will be included to a sourcemap.
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@model League.Components.MainNavigationComponentModel
@using League.Components

<ul class="navbar-nav me-auto mt-2 mt-md-0 w-100" role="menubar">
<ul class="navbar-nav me-auto mt-2 mt-md-0 w-100" role="menubar" data-bs-theme="light">
@foreach (var node in Model.TopNavigationNodes)
{
// Node keys after "RightAlignSeparator" shall be aligned to the right margin of the navigation bar
Expand Down
2 changes: 1 addition & 1 deletion League/Views/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</div>
</div>
</header>
<nav id="nav-main" class="navbar navbar-expand-md navbar-dark rounded ps-2 site-sticky-top">
<nav id="nav-main" class="navbar navbar-expand-md rounded ps-2 site-sticky-top" data-bs-theme="dark">
@* bootstrap class "sticky-top" interferes with modal, that's why we use our identical "site-sticky-top" *@
<div class="container-fluid ps-0">
@* <a class="navbar-brand" href="#">axuno</a>*@
Expand Down
Loading

0 comments on commit 30647c4

Please sign in to comment.