Compare commits
No commits in common. "983ce40397c6d650cbc1e74dee430fbcf0d581cc" and "afc65d8cf309a1062a9967ccd0c11021c0b87fe7" have entirely different histories.
983ce40397
...
afc65d8cf3
7 changed files with 2033 additions and 1414 deletions
|
|
@ -6,10 +6,10 @@
|
||||||
"extensions": [
|
"extensions": [
|
||||||
"adrianhumphreys.silverstripe",
|
"adrianhumphreys.silverstripe",
|
||||||
"bmewburn.vscode-intelephense-client",
|
"bmewburn.vscode-intelephense-client",
|
||||||
"dbaeumer.vscode-eslint",
|
"felixfbecker.php-debug",
|
||||||
"mikestead.dotenv",
|
"manuth.eslint-language-service",
|
||||||
"neilbrayfield.php-docblocker",
|
"ms-vscode.vscode-typescript-tslint-plugin",
|
||||||
"xdebug.php-debug"
|
"neilbrayfield.php-docblocker"
|
||||||
],
|
],
|
||||||
"settings": {
|
"settings": {
|
||||||
"php.executablePath": null
|
"php.executablePath": null
|
||||||
|
|
|
||||||
8
.vscode/extensions.json
vendored
8
.vscode/extensions.json
vendored
|
|
@ -2,10 +2,10 @@
|
||||||
"recommendations": [
|
"recommendations": [
|
||||||
"adrianhumphreys.silverstripe",
|
"adrianhumphreys.silverstripe",
|
||||||
"bmewburn.vscode-intelephense-client",
|
"bmewburn.vscode-intelephense-client",
|
||||||
"dbaeumer.vscode-eslint",
|
"felixfbecker.php-debug",
|
||||||
"mikestead.dotenv",
|
"manuth.eslint-language-service",
|
||||||
"ms-vscode-remote.remote-containers",
|
"ms-vscode-remote.remote-containers",
|
||||||
"neilbrayfield.php-docblocker",
|
"msjsdiag.debugger-for-edge",
|
||||||
"xdebug.php-debug"
|
"neilbrayfield.php-docblocker"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,6 @@ 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";
|
||||||
|
|
@ -384,7 +383,7 @@ export function Theme(): NodeJS.ReadWriteStream
|
||||||
sourcemaps: settings.Debug,
|
sourcemaps: settings.Debug,
|
||||||
base: settings.StylePath()
|
base: settings.StylePath()
|
||||||
}).pipe(
|
}).pipe(
|
||||||
sass(dartSass).sync(
|
sass(
|
||||||
{
|
{
|
||||||
importer: require("node-sass-tilde-importer")
|
importer: require("node-sass-tilde-importer")
|
||||||
}
|
}
|
||||||
|
|
|
||||||
3289
package-lock.json
generated
3289
package-lock.json
generated
File diff suppressed because it is too large
Load diff
59
package.json
59
package.json
|
|
@ -19,55 +19,54 @@
|
||||||
},
|
},
|
||||||
"dependencies": {},
|
"dependencies": {},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@manuth/eslint-plugin-typescript": "^3.2.6",
|
"@manuth/eslint-plugin-typescript": "^2.3.10",
|
||||||
"@manuth/tsconfig": "^3.0.0",
|
"@manuth/tsconfig": "^1.2.9",
|
||||||
"@manuth/typescript-eslint-plugin": "^1.3.5",
|
"@manuth/typescript-eslint-plugin": "^1.3.5",
|
||||||
"@types/bootstrap": "^5.1.9",
|
"@types/bootstrap": "^5.0.13",
|
||||||
"@types/browser-sync": "^2.26.3",
|
"@types/browser-sync": "^2.26.1",
|
||||||
"@types/browserify": "^12.0.37",
|
"@types/browserify": "^12.0.36",
|
||||||
"@types/fancy-log": "^1.3.1",
|
"@types/fancy-log": "^1.3.1",
|
||||||
"@types/fs-extra": "^9.0.13",
|
"@types/fs-extra": "^9.0.11",
|
||||||
"@types/gulp": "^4.0.9",
|
"@types/gulp": "^4.0.8",
|
||||||
"@types/gulp-if": "0.0.34",
|
"@types/gulp-if": "0.0.33",
|
||||||
"@types/gulp-rename": "2.0.1",
|
"@types/gulp-rename": "2.0.0",
|
||||||
"@types/gulp-sass": "^5.0.0",
|
"@types/gulp-sass": "^4.0.0",
|
||||||
"@types/gulp-terser": "^1.2.1",
|
"@types/gulp-terser": "^1.2.1",
|
||||||
"@types/jquery": "^3.5.14",
|
"@types/jquery": "^3.5.5",
|
||||||
"@types/merge-stream": "^1.1.2",
|
"@types/merge-stream": "^1.1.2",
|
||||||
"@types/minimist": "^1.2.2",
|
"@types/minimist": "^1.2.1",
|
||||||
"@types/node": "^17.0.21",
|
"@types/node": "^15.0.2",
|
||||||
"@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.1",
|
"@types/watchify": "^3.11.0",
|
||||||
"@typescript-eslint/eslint-plugin": "^5.13.0",
|
"@typescript-eslint/eslint-plugin": "^4.23.0",
|
||||||
"@typescript-eslint/eslint-plugin-tslint": "^5.13.0",
|
"@typescript-eslint/eslint-plugin-tslint": "^4.23.0",
|
||||||
"@typescript-eslint/parser": "^5.13.0",
|
"@typescript-eslint/parser": "^4.23.0",
|
||||||
"bootstrap": "^5.1.3",
|
"bootstrap": "^5.0.0",
|
||||||
"browser-sync": "^2.27.7",
|
"browser-sync": "^2.26.14",
|
||||||
"browserify": "^17.0.0",
|
"browserify": "^17.0.0",
|
||||||
"create-symlink": "^1.0.0",
|
"create-symlink": "^1.0.0",
|
||||||
"eslint": "^8.10.0",
|
"eslint": "^7.26.0",
|
||||||
"eslint-plugin-deprecation": "^1.3.2",
|
"eslint-plugin-deprecation": "^1.2.1",
|
||||||
"eslint-plugin-import": "^2.25.4",
|
"eslint-plugin-import": "^2.22.1",
|
||||||
"eslint-plugin-jsdoc": "^37.9.5",
|
"eslint-plugin-jsdoc": "^34.0.1",
|
||||||
"fancy-log": "^2.0.0",
|
"fancy-log": "^1.3.3",
|
||||||
"fs-extra": "^10.0.1",
|
"fs-extra": "^10.0.0",
|
||||||
"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": "^5.1.0",
|
"gulp-sass": "^4.1.0",
|
||||||
"gulp-terser": "^2.1.0",
|
"gulp-terser": "^2.0.1",
|
||||||
"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": "^10.5.0",
|
"ts-node": "^9.1.1",
|
||||||
"tsify": "^5.0.4",
|
"tsify": "^5.0.4",
|
||||||
"tslint": "^6.1.3",
|
"tslint": "^6.1.3",
|
||||||
"typescript": "^4.6.2",
|
"typescript": "^4.2.4",
|
||||||
"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",
|
||||||
|
|
|
||||||
|
|
@ -11,49 +11,47 @@
|
||||||
</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">
|
||||||
<div class="container-fluid">
|
<a class="navbar-brand" href="$AbsoluteBaseURL">
|
||||||
<a class="navbar-brand" href="$AbsoluteBaseURL">
|
<div class="navbar-title">$SiteConfig.Title</div>
|
||||||
<div class="navbar-title">$SiteConfig.Title</div>
|
<div class="navbar-tagline">$SiteConfig.Tagline</div>
|
||||||
<div class="navbar-tagline">$SiteConfig.Tagline</div>
|
</a>
|
||||||
</a>
|
<% if $Menu(1) %>
|
||||||
<% if $Menu(1) %>
|
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNav" aria-controls="mainNav" aria-expanded="false" aria-label="Toggle navigation">
|
||||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNav" aria-controls="mainNav" aria-expanded="false" aria-label="Toggle navigation">
|
<span class="navbar-toggler-icon"></span>
|
||||||
<span class="navbar-toggler-icon"></span>
|
</button>
|
||||||
</button>
|
<div class="collapse navbar-collapse" id="mainNav">
|
||||||
<div class="collapse navbar-collapse" id="mainNav">
|
<ul class="navbar-nav">
|
||||||
<ul class="navbar-nav">
|
<% loop $Menu(1) %>
|
||||||
<% loop $Menu(1) %>
|
<% if $Children %>
|
||||||
<% if $Children %>
|
<li class="nav-item dropdown">
|
||||||
<li class="nav-item dropdown">
|
<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 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">
|
$MenuTitle
|
||||||
$MenuTitle
|
</a>
|
||||||
</a>
|
<div class="dropdown-menu" aria-labelledby="mainNav_$URLSegment">
|
||||||
<div class="dropdown-menu" aria-labelledby="mainNav_$URLSegment">
|
<a class="dropdown-item<% if $isCurrent %> active <% end_if %>" href="$Link">
|
||||||
<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>
|
||||||
</li>
|
<div class="dropdown-divider"></div>
|
||||||
<% end_if %>
|
<% loop $Children %>
|
||||||
<% end_loop %>
|
<a class="dropdown-item<% if $isCurrent %> active<% end_if %>" href="$Link">
|
||||||
</ul>
|
$MenuTitle
|
||||||
</div>
|
</a>
|
||||||
<% end_if %>
|
<% end_loop %>
|
||||||
</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="container-fluid col-11 flex-shrink-0" style="padding-top: 4.5rem">
|
<main role="main" class="col-11 flex-shrink-0" style="padding-top: 4.5rem">
|
||||||
$Content
|
$Content
|
||||||
$Form
|
$Form
|
||||||
</main>
|
</main>
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
$tagline-font-size: calc($small-font-size / 2);
|
$tagline-font-size: $small-font-size / 2;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue