Skip to content

Commit

Permalink
Updated bootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
Bernardo-MG committed Sep 15, 2024
1 parent 1eade36 commit b323c13
Show file tree
Hide file tree
Showing 558 changed files with 38,456 additions and 6,215 deletions.
6 changes: 6 additions & 0 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": "stylelint-config-standard",
"rules": {
"selector-pseudo-element-colon-notation": "single"
}
}
2,297 changes: 2,191 additions & 106 deletions package-lock.json

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"scripts": {
"validate-css": "csslint ./src/main/resources/css/",
"validate-css": "stylelint ./src/main/resources/css/",
"minify-css": "cleancss -o ./target/classes/css/style.min.css ./src/main/resources/css/*.css"
},
"dependencies": {
"@fortawesome/fontawesome-free": "~6.3.0",
"bootstrap": "~5.2.0",
"bootswatch": "~5.2.0",
"@fortawesome/fontawesome-free": "~6.6.0",
"bootstrap": "~5.3.0",
"bootswatch": "~5.3.0",
"clean-css-cli": "~5.6.0",
"csslint": "~1.0.0"
"stylelint": "^16.9.0",
"stylelint-config-standard": "^36.0.1"
}
}
12 changes: 6 additions & 6 deletions src/main/resources/META-INF/maven/site.vm
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
</head>
<body class="d-flex flex-column">
<header>
<nav id="navbar-main" class="navbar navbar-expand-md navbar-$shine bg-$bgshine">
<nav id="navbar-main" class="navbar navbar-expand-md border-bottom bg-$bgshine" data-bs-theme="$bgshine" border-bottom>
<div class="container-fluid">
<a class="navbar-brand" href="./index.html">$project.name</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-main-menu" aria-controls="navbar-main" aria-expanded="false" aria-label="Toggle navigation">
Expand Down Expand Up @@ -151,13 +151,13 @@
</div>
</nav>
</header>
<main>
<section id="main-section" class="container flex-grow-1">
<main class="flex-grow-1">
<section id="main-section" class="container">
$bodyContent
</section>
</main>
<footer class="footer w-100 pt-2 border-top bg-$bgshine">
<div id="footer-nav" class="bg-$bgshine container">
<footer class="footer pt-2 border-top bg-$bgshine" data-bs-theme="$bgshine">
<div id="footer-nav" class="container">
#set( $menuElements = [] )##
#loadBottomNavMenuList( $menuElements )##
#if($menuElements.size() > 0)##
Expand All @@ -176,7 +176,7 @@ $bodyContent
</footer>
<script src="./lib/popperjs/core/dist/umd/popper.min.js"></script>
<script src="./lib/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="./lib/highlight/highlight.pack.js"></script>
<script src="./lib/highlight/highlight.min.js"></script>
<script src="./js/initializeHighlight.js"></script>
#if( $config.customScript )##
<script src="$config.customScript.getValue()"></script>
Expand Down
10 changes: 0 additions & 10 deletions src/main/resources/css/common.css

This file was deleted.

8 changes: 2 additions & 6 deletions src/main/resources/css/link.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
/*!
* Licensed under the MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
/*!
* Link styles.
*/

/* Licensed under the MIT License (http://www.opensource.org/licenses/mit-license.php) */

/**
* Link with a note.
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/js/initializeHighlight.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
* Initializes highlight.js when the document loads.
*/
// Uses the default initialization
hljs.initHighlightingOnLoad();
hljs.highlightAll();
Loading

0 comments on commit b323c13

Please sign in to comment.