manuth/mantra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: manuth:afc65d8cf309a1062a9967ccd0c11021c0b87fe7
Branches Tags
manuth:main
manuth:dev
...
compare: manuth:983ce40397c6d650cbc1e74dee430fbcf0d581cc
Branches Tags
manuth:dev
manuth:main

5 commits
afc65d8cf3 ... 983ce40397

Author SHA1 Message Date
Manuel Thalmann
983ce40397 Refactor bootstrap style 2022-03-01 15:05:12 +00:00
Manuel Thalmann
397d401d13 Wrap calculation in a calc() call 2022-03-01 15:05:01 +00:00
Manuel Thalmann
70208bf6cc Add missing extension 2022-03-01 15:04:50 +00:00
Manuel Thalmann
84f09ee473 Update all dependencies 2022-03-01 15:04:40 +00:00
Manuel Thalmann
1b0e3c0155 Update outdated extensions 2022-03-01 14:32:19 +00:00
7 changed files with 1473 additions and 2092 deletions
Show stats Expand all files Collapse all files

8
.devcontainer/devcontainer.json
View file

@ -6,10 +6,10 @@
"extensions": [ "extensions": [
"adrianhumphreys.silverstripe", "adrianhumphreys.silverstripe",
"bmewburn.vscode-intelephense-client", "bmewburn.vscode-intelephense-client",
"felixfbecker.php-debug", "dbaeumer.vscode-eslint",
"manuth.eslint-language-service", "mikestead.dotenv",
"ms-vscode.vscode-typescript-tslint-plugin", "neilbrayfield.php-docblocker",
"neilbrayfield.php-docblocker" "xdebug.php-debug"
], ],
"settings": { "settings": {
"php.executablePath": null "php.executablePath": null

8
.vscode/extensions.json vendored
View file

@ -2,10 +2,10 @@
"recommendations": [ "recommendations": [
"adrianhumphreys.silverstripe", "adrianhumphreys.silverstripe",
"bmewburn.vscode-intelephense-client", "bmewburn.vscode-intelephense-client",
"felixfbecker.php-debug", "dbaeumer.vscode-eslint",
"manuth.eslint-language-service", "mikestead.dotenv",
"ms-vscode-remote.remote-containers", "ms-vscode-remote.remote-containers",
"msjsdiag.debugger-for-edge", "neilbrayfield.php-docblocker",
"neilbrayfield.php-docblocker" "xdebug.php-debug"
] ]
} }

3
gulpfile.ts
View file

@ -10,6 +10,7 @@ import sass = require("gulp-sass");
import terser = require("gulp-terser"); import terser = require("gulp-terser");
import merge = require("merge-stream"); import merge = require("merge-stream");
import minimist = require("minimist"); import minimist = require("minimist");
import * as dartSass from "sass";
import { parseArgsStringToArgv } from "string-argv"; import { parseArgsStringToArgv } from "string-argv";
import tsify = require("tsify"); import tsify = require("tsify");
import { changeExt, dirname, join, parse, relative } from "upath"; import { changeExt, dirname, join, parse, relative } from "upath";
@ -383,7 +384,7 @@ export function Theme(): NodeJS.ReadWriteStream
sourcemaps: settings.Debug, sourcemaps: settings.Debug,
base: settings.StylePath() base: settings.StylePath()
}).pipe( }).pipe(
sass( sass(dartSass).sync(
{ {
importer: require("node-sass-tilde-importer") importer: require("node-sass-tilde-importer")
} }

3407
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

59
package.json
View file

@ -19,54 +19,55 @@
}, },
"dependencies": {}, "dependencies": {},
"devDependencies": { "devDependencies": {
"@manuth/eslint-plugin-typescript": "^2.3.10", "@manuth/eslint-plugin-typescript": "^3.2.6",
"@manuth/tsconfig": "^1.2.9", "@manuth/tsconfig": "^3.0.0",
"@manuth/typescript-eslint-plugin": "^1.3.5", "@manuth/typescript-eslint-plugin": "^1.3.5",
"@types/bootstrap": "^5.0.13", "@types/bootstrap": "^5.1.9",
"@types/browser-sync": "^2.26.1", "@types/browser-sync": "^2.26.3",
"@types/browserify": "^12.0.36", "@types/browserify": "^12.0.37",
"@types/fancy-log": "^1.3.1", "@types/fancy-log": "^1.3.1",
"@types/fs-extra": "^9.0.11", "@types/fs-extra": "^9.0.13",
"@types/gulp": "^4.0.8", "@types/gulp": "^4.0.9",
"@types/gulp-if": "0.0.33", "@types/gulp-if": "0.0.34",
"@types/gulp-rename": "2.0.0", "@types/gulp-rename": "2.0.1",
"@types/gulp-sass": "^4.0.0", "@types/gulp-sass": "^5.0.0",
"@types/gulp-terser": "^1.2.1", "@types/gulp-terser": "^1.2.1",
"@types/jquery": "^3.5.5", "@types/jquery": "^3.5.14",
"@types/merge-stream": "^1.1.2", "@types/merge-stream": "^1.1.2",
"@types/minimist": "^1.2.1", "@types/minimist": "^1.2.2",
"@types/node": "^15.0.2", "@types/node": "^17.0.21",
"@types/vinyl-buffer": "^1.0.0", "@types/vinyl-buffer": "^1.0.0",
"@types/vinyl-source-stream": "0.0.30", "@types/vinyl-source-stream": "0.0.30",
"@types/watchify": "^3.11.0", "@types/watchify": "^3.11.1",
"@typescript-eslint/eslint-plugin": "^4.23.0", "@typescript-eslint/eslint-plugin": "^5.13.0",
"@typescript-eslint/eslint-plugin-tslint": "^4.23.0", "@typescript-eslint/eslint-plugin-tslint": "^5.13.0",
"@typescript-eslint/parser": "^4.23.0", "@typescript-eslint/parser": "^5.13.0",
"bootstrap": "^5.0.0", "bootstrap": "^5.1.3",
"browser-sync": "^2.26.14", "browser-sync": "^2.27.7",
"browserify": "^17.0.0", "browserify": "^17.0.0",
"create-symlink": "^1.0.0", "create-symlink": "^1.0.0",
"eslint": "^7.26.0", "eslint": "^8.10.0",
"eslint-plugin-deprecation": "^1.2.1", "eslint-plugin-deprecation": "^1.3.2",
"eslint-plugin-import": "^2.22.1", "eslint-plugin-import": "^2.25.4",
"eslint-plugin-jsdoc": "^34.0.1", "eslint-plugin-jsdoc": "^37.9.5",
"fancy-log": "^1.3.3", "fancy-log": "^2.0.0",
"fs-extra": "^10.0.0", "fs-extra": "^10.0.1",
"gulp": "^4.0.2", "gulp": "^4.0.2",
"gulp-if": "^3.0.0", "gulp-if": "^3.0.0",
"gulp-rename": "^2.0.0", "gulp-rename": "^2.0.0",
"gulp-sass": "^4.1.0", "gulp-sass": "^5.1.0",
"gulp-terser": "^2.0.1", "gulp-terser": "^2.1.0",
"jquery": "^3.6.0", "jquery": "^3.6.0",
"merge-stream": "^2.0.0", "merge-stream": "^2.0.0",
"minimist": "^1.2.5", "minimist": "^1.2.5",
"node-sass-tilde-importer": "^1.0.2", "node-sass-tilde-importer": "^1.0.2",
"popper.js": "^1.16.0", "popper.js": "^1.16.0",
"sass": "^1.49.9",
"string-argv": "^0.3.1", "string-argv": "^0.3.1",
"ts-node": "^9.1.1", "ts-node": "^10.5.0",
"tsify": "^5.0.4", "tsify": "^5.0.4",
"tslint": "^6.1.3", "tslint": "^6.1.3",
"typescript": "^4.2.4", "typescript": "^4.6.2",
"typescript-tslint-plugin": "^1.0.1", "typescript-tslint-plugin": "^1.0.1",
"upath": "^2.0.1", "upath": "^2.0.1",
"vinyl-buffer": "^1.0.1", "vinyl-buffer": "^1.0.1",

78
src/Templates/Page.ss
View file

@ -11,47 +11,49 @@
</head> </head>
<body class="d-flex flex-column h-100"> <body class="d-flex flex-column h-100">
<nav class="navbar navbar-expand-md fixed-top navbar-dark bg-dark"> <nav class="navbar navbar-expand-md fixed-top navbar-dark bg-dark">
<a class="navbar-brand" href="$AbsoluteBaseURL"> <div class="container-fluid">
<div class="navbar-title">$SiteConfig.Title</div> <a class="navbar-brand" href="$AbsoluteBaseURL">
<div class="navbar-tagline">$SiteConfig.Tagline</div> <div class="navbar-title">$SiteConfig.Title</div>
</a> <div class="navbar-tagline">$SiteConfig.Tagline</div>
<% if $Menu(1) %> </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNav" aria-controls="mainNav" aria-expanded="false" aria-label="Toggle navigation"> <% if $Menu(1) %>
<span class="navbar-toggler-icon"></span> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNav" aria-controls="mainNav" aria-expanded="false" aria-label="Toggle navigation">
</button> <span class="navbar-toggler-icon"></span>
<div class="collapse navbar-collapse" id="mainNav"> </button>
<ul class="navbar-nav"> <div class="collapse navbar-collapse" id="mainNav">
<% loop $Menu(1) %> <ul class="navbar-nav">
<% if $Children %> <% loop $Menu(1) %>
<li class="nav-item dropdown"> <% if $Children %>
<a class="nav-link dropdown-toggle<% if $isCurrent || $isSection %> active <% end_if %>" href="#" id="mainNav_$URLSegment" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <li class="nav-item dropdown">
$MenuTitle <a class="nav-link dropdown-toggle<% if $isCurrent || $isSection %> active <% end_if %>" href="#" id="mainNav_$URLSegment" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
</a> $MenuTitle
<div class="dropdown-menu" aria-labelledby="mainNav_$URLSegment"> </a>
<a class="dropdown-item<% if $isCurrent %> active <% end_if %>" href="$Link"> <div class="dropdown-menu" aria-labelledby="mainNav_$URLSegment">
<a class="dropdown-item<% if $isCurrent %> active <% end_if %>" href="$Link">
$MenuTitle<% if $isCurrent %><span class="visually-hidden"> (current)</span><% end_if %>
</a>
<div class="dropdown-divider"></div>
<% loop $Children %>
<a class="dropdown-item<% if $isCurrent %> active<% end_if %>" href="$Link">
$MenuTitle
</a>
<% end_loop %>
</div>
</li>
<% else %>
<li class="nav-item<% if $isCurrent %> active<% end_if %>">
<a class="nav-link" href="$Link">
$MenuTitle<% if $isCurrent %><span class="visually-hidden"> (current)</span><% end_if %> $MenuTitle<% if $isCurrent %><span class="visually-hidden"> (current)</span><% end_if %>
</a> </a>
<div class="dropdown-divider"></div> </li>
<% loop $Children %> <% end_if %>
<a class="dropdown-item<% if $isCurrent %> active<% end_if %>" href="$Link"> <% end_loop %>
$MenuTitle </ul>
</a> </div>
<% end_loop %> <% end_if %>
</div> </div>
</li>
<% else %>
<li class="nav-item<% if $isCurrent %> active<% end_if %>">
<a class="nav-link" href="$Link">
$MenuTitle<% if $isCurrent %><span class="visually-hidden"> (current)</span><% end_if %>
</a>
</li>
<% end_if %>
<% end_loop %>
</ul>
</div>
<% end_if %>
</nav> </nav>
<main role="main" class="col-11 flex-shrink-0" style="padding-top: 4.5rem"> <main role="main" class="container-fluid col-11 flex-shrink-0" style="padding-top: 4.5rem">
$Content $Content
$Form $Form
</main> </main>

2
src/Theme/_variables.scss
View file

@ -1 +1 @@
$tagline-font-size: $small-font-size / 2; $tagline-font-size: calc($small-font-size / 2);