diff --git a/Gulpfile.js b/Gulpfile.js index f6ee9b9a..49a9dc82 100644 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -3,14 +3,13 @@ * Turn on/off build features */ -var settings = { +const settings = { clean: true, scripts: true, hjs: false, polyfills: false, styles: true, svgs: true, - copy: true, vendor: true } @@ -18,7 +17,7 @@ var settings = { * Paths to project folders */ -var paths = { +const paths = { input: 'src/main/frontend/', output: 'target/generated-resources/frontend/xar-resources/resources/', scripts: { @@ -31,20 +30,12 @@ var paths = { output: 'target/generated-resources/frontend/xar-resources/resources/styles/' }, svgs: { - input: 'src/main/frontend/img/*.svg', + input: 'src/main/frontend/svg/*.svg', output: 'target/generated-resources/frontend/xar-resources/resources/images/' }, - copy: { - input: 'src/main/frontend/copy/**', - output: 'target/generated-resources/frontend/xar-resources/resources/' - }, vendor: { - input: 'node_modules/', output: 'target/generated-resources/frontend/xar-resources/resources/' }, - fonts: { - output: 'target/generated-resources/frontend/xar-resources/resources/fonts/' - }, xml: { listings: 'src/main/xar-resources/data/*/listings/*.xml', articles: 'src/main/xar-resources/data/*/*.xml' @@ -55,7 +46,7 @@ var paths = { * Template for banner to add to file headers */ -var banner = { +const banner = { full: '/*!\n' + ' * <%= package.name %> v<%= package.version %>\n' + ' * <%= package.description %>\n' + @@ -76,43 +67,43 @@ var banner = { */ // General -var { +const { gulp, src, dest, series, parallel } = require('gulp') -var del = require('del') -var flatmap = require('gulp-flatmap') -var lazypipe = require('lazypipe') -var rename = require('gulp-rename') -var header = require('gulp-header') -var pkg = require('./package.json') -var muxml = require('gulp-muxml') +const del = require('del') +const flatmap = require('gulp-flatmap') +const lazypipe = require('lazypipe') +const rename = require('gulp-rename') +const header = require('gulp-header') +const pkg = require('./package.json') +const muxml = require('gulp-muxml') // Scripts -var standard = require('gulp-standard') -var concat = require('gulp-concat') -var uglify = require('gulp-uglify') -var optimizejs = require('gulp-optimize-js') +const standard = require('gulp-standard') +const concat = require('gulp-concat') +const uglify = require('gulp-uglify') +const optimizejs = require('gulp-optimize-js') // Styles -var sass = require('gulp-sass')(require('sass')) -var prefix = require('gulp-autoprefixer') -var minify = require('gulp-cssnano') -var sourcemaps = require('gulp-sourcemaps') +const sass = require('gulp-sass')(require('sass')) +const prefix = require('gulp-autoprefixer') +const minify = require('gulp-cssnano') +const sourcemaps = require('gulp-sourcemaps') // SVGs -var svgmin = require('gulp-svgmin') +const svgmin = require('gulp-svgmin') /** * Gulp Tasks */ // Remove pre-existing content from output folders -var cleanDist = function (done) { +const cleanDist = function (done) { // Make sure this feature is activated before running if (!settings.clean) return done() @@ -126,7 +117,7 @@ var cleanDist = function (done) { } // Repeated JavaScript tasks -var jsTasks = lazypipe() +const jsTasks = lazypipe() .pipe(header, banner.full, { package: pkg }) @@ -143,7 +134,7 @@ var jsTasks = lazypipe() .pipe(dest, paths.scripts.output) // Lint, minify, and concatenate scripts -var buildScripts = function (done) { +const buildScripts = function (done) { // Make sure this feature is activated before running if (!settings.scripts) return done() @@ -153,7 +144,7 @@ var buildScripts = function (done) { // If the file is a directory if (file.isDirectory()) { // Setup a suffix variable - var suffix = '' + const suffix = '' // If separate polyfill files enabled if (settings.polyfills) { @@ -184,7 +175,7 @@ var buildScripts = function (done) { } // Lint scripts -var lintScripts = function (done) { +const lintScripts = function (done) { // Make sure this feature is activated before running if (!settings.scripts) return done() @@ -201,7 +192,7 @@ var lintScripts = function (done) { // pretty print all xml listings // articles not yet decided -var prettyXml = function (done) { +const prettyXml = function (done) { src(paths.xml.listings, { base: "./" }) .pipe(muxml({ stripComments: false, @@ -218,7 +209,7 @@ var prettyXml = function (done) { } // Process, lint, and minify Sass files -var buildStyles = function (done) { +const buildStyles = function (done) { // Make sure this feature is activated before running if (!settings.styles) return done() @@ -258,7 +249,7 @@ var buildStyles = function (done) { } // Optimize SVG files -var buildSVGs = function (done) { +const buildSVGs = function (done) { // Make sure this feature is activated before running if (!settings.svgs) return done() @@ -272,13 +263,13 @@ var buildSVGs = function (done) { } // Copy third-party dependencies from node_modules into resources -var vendorFiles = function (done) { +const vendorFiles = function (done) { // Make sure this feature is activated before running if (!settings.vendor) return done() // TODO ensure each declared third-parrty dep has a corresponding command below // TODO modernizr@2 needs refactor via npm or gulp-modernizr - var deps = pkg.dependencies.length + const deps = pkg.dependencies.length // copy vendor scripts @@ -294,23 +285,6 @@ var vendorFiles = function (done) { src(['node_modules/bootstrap/dist/css/bootstrap.min.*', 'node_modules/@highlightjs/cdn-assets/styles/atom-one-dark.min.css']) .pipe(dest(paths.styles.output)) - // copy vendor fonts - src('node_modules/@neos21/bootstrap3-glyphicons/dist/fonts/*') - .pipe(dest(paths.fonts.output)) - // Signal completion - done() -} - - -// Copy static files into output folder -var copyFiles = function (done) { - // Make sure this feature is activated before running - if (!settings.copy) return done() - - // Copy static files - src(paths.copy.input) - .pipe(dest(paths.copy.output)) - // Signal completion done() } @@ -329,7 +303,6 @@ exports.default = series( lintScripts, buildStyles, buildSVGs, - copyFiles, prettyXml ) ) diff --git a/package-lock.json b/package-lock.json index 294d8d6f..55d3d4aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,6 @@ "license": "LGPL-2.1-only", "dependencies": { "@highlightjs/cdn-assets": "^11.11.1", - "@neos21/bootstrap3-glyphicons": "^1.0.7", "@popperjs/core": "^2.11.8", "bootstrap": "^5.3.3" }, @@ -405,15 +404,6 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/@neos21/bootstrap3-glyphicons": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@neos21/bootstrap3-glyphicons/-/bootstrap3-glyphicons-1.0.7.tgz", - "integrity": "sha512-JfvPdx8W2+kVhW+8fj2kIJNS0tesU21hrWF7TBHtYDHpVfcFGU/yn3Eh02sJiNfZABkutP3oU0Ftw8LGF43Jng==", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/Neos21" - } - }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -1564,9 +1554,9 @@ "dev": true }, "node_modules/caniuse-lite": { - "version": "1.0.30001570", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001570.tgz", - "integrity": "sha512-+3e0ASu4sw1SWaoCtvPeyXp+5PsjigkSt8OXZbF9StH5pQWbxEjLAZE3n8Aup5udop1uRiKA7a4utUk/uoSpUw==", + "version": "1.0.30001690", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001690.tgz", + "integrity": "sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==", "dev": true, "funding": [ { @@ -1581,7 +1571,8 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ] + ], + "license": "CC-BY-4.0" }, "node_modules/caseless": { "version": "0.12.0", @@ -13531,11 +13522,6 @@ } } }, - "@neos21/bootstrap3-glyphicons": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@neos21/bootstrap3-glyphicons/-/bootstrap3-glyphicons-1.0.7.tgz", - "integrity": "sha512-JfvPdx8W2+kVhW+8fj2kIJNS0tesU21hrWF7TBHtYDHpVfcFGU/yn3Eh02sJiNfZABkutP3oU0Ftw8LGF43Jng==" - }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -14246,9 +14232,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001570", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001570.tgz", - "integrity": "sha512-+3e0ASu4sw1SWaoCtvPeyXp+5PsjigkSt8OXZbF9StH5pQWbxEjLAZE3n8Aup5udop1uRiKA7a4utUk/uoSpUw==", + "version": "1.0.30001690", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001690.tgz", + "integrity": "sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==", "dev": true }, "caseless": { diff --git a/package.json b/package.json index eb2075d3..45f0cf96 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,6 @@ }, "dependencies": { "@highlightjs/cdn-assets": "^11.11.1", - "@neos21/bootstrap3-glyphicons": "^1.0.7", "@popperjs/core": "^2.11.8", "bootstrap": "^5.3.3" } diff --git a/src/main/frontend/copy/fonts/Quicksand_Book-webfont.eot b/src/main/frontend/copy/fonts/Quicksand_Book-webfont.eot deleted file mode 100644 index ffe8e419..00000000 Binary files a/src/main/frontend/copy/fonts/Quicksand_Book-webfont.eot and /dev/null differ diff --git a/src/main/frontend/copy/fonts/Quicksand_Book-webfont.svg b/src/main/frontend/copy/fonts/Quicksand_Book-webfont.svg deleted file mode 100644 index 370af648..00000000 --- a/src/main/frontend/copy/fonts/Quicksand_Book-webfont.svg +++ /dev/null @@ -1,149 +0,0 @@ - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c Andrew Paglinawan 2008 All rights reserved -Designer : Andrew Paglinawan -Foundry : Andrew Paglinawan - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/frontend/copy/fonts/Quicksand_Book-webfont.ttf b/src/main/frontend/copy/fonts/Quicksand_Book-webfont.ttf deleted file mode 100644 index 39338fc6..00000000 Binary files a/src/main/frontend/copy/fonts/Quicksand_Book-webfont.ttf and /dev/null differ diff --git a/src/main/frontend/copy/fonts/Quicksand_Book-webfont.woff b/src/main/frontend/copy/fonts/Quicksand_Book-webfont.woff deleted file mode 100644 index 6e7317c3..00000000 Binary files a/src/main/frontend/copy/fonts/Quicksand_Book-webfont.woff and /dev/null differ diff --git a/src/main/frontend/copy/fonts/glyphicons-halflings-regular.eot b/src/main/frontend/copy/fonts/glyphicons-halflings-regular.eot deleted file mode 100644 index b93a4953..00000000 Binary files a/src/main/frontend/copy/fonts/glyphicons-halflings-regular.eot and /dev/null differ diff --git a/src/main/frontend/copy/fonts/glyphicons-halflings-regular.svg b/src/main/frontend/copy/fonts/glyphicons-halflings-regular.svg deleted file mode 100644 index 94fb5490..00000000 --- a/src/main/frontend/copy/fonts/glyphicons-halflings-regular.svg +++ /dev/null @@ -1,288 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/frontend/copy/fonts/glyphicons-halflings-regular.ttf b/src/main/frontend/copy/fonts/glyphicons-halflings-regular.ttf deleted file mode 100644 index 1413fc60..00000000 Binary files a/src/main/frontend/copy/fonts/glyphicons-halflings-regular.ttf and /dev/null differ diff --git a/src/main/frontend/copy/fonts/glyphicons-halflings-regular.woff b/src/main/frontend/copy/fonts/glyphicons-halflings-regular.woff deleted file mode 100644 index 9e612858..00000000 Binary files a/src/main/frontend/copy/fonts/glyphicons-halflings-regular.woff and /dev/null differ diff --git a/src/main/frontend/copy/fonts/glyphicons-halflings-regular.woff2 b/src/main/frontend/copy/fonts/glyphicons-halflings-regular.woff2 deleted file mode 100644 index 64539b54..00000000 Binary files a/src/main/frontend/copy/fonts/glyphicons-halflings-regular.woff2 and /dev/null differ diff --git a/src/main/frontend/copy/images/bgmenu.gif b/src/main/frontend/copy/images/bgmenu.gif deleted file mode 100644 index 653aa343..00000000 Binary files a/src/main/frontend/copy/images/bgmenu.gif and /dev/null differ diff --git a/src/main/frontend/copy/images/bgmenuhi.gif b/src/main/frontend/copy/images/bgmenuhi.gif deleted file mode 100644 index 0fabe0a6..00000000 Binary files a/src/main/frontend/copy/images/bgmenuhi.gif and /dev/null differ diff --git a/src/main/frontend/copy/images/body-base.gif b/src/main/frontend/copy/images/body-base.gif deleted file mode 100644 index 4f297e07..00000000 Binary files a/src/main/frontend/copy/images/body-base.gif and /dev/null differ diff --git a/src/main/frontend/copy/images/body.gif b/src/main/frontend/copy/images/body.gif deleted file mode 100644 index 91c9a3dc..00000000 Binary files a/src/main/frontend/copy/images/body.gif and /dev/null differ diff --git a/src/main/frontend/copy/images/exist_icon_16x16.ico b/src/main/frontend/copy/images/exist_icon_16x16.ico deleted file mode 100644 index 369b350f..00000000 Binary files a/src/main/frontend/copy/images/exist_icon_16x16.ico and /dev/null differ diff --git a/src/main/frontend/copy/images/existdb.png b/src/main/frontend/copy/images/existdb.png deleted file mode 100644 index ea553a6c..00000000 Binary files a/src/main/frontend/copy/images/existdb.png and /dev/null differ diff --git a/src/main/frontend/copy/images/header.gif b/src/main/frontend/copy/images/header.gif deleted file mode 100644 index dbb49a3e..00000000 Binary files a/src/main/frontend/copy/images/header.gif and /dev/null differ diff --git a/src/main/frontend/copy/images/horizontal.gif b/src/main/frontend/copy/images/horizontal.gif deleted file mode 100644 index 970d0e53..00000000 Binary files a/src/main/frontend/copy/images/horizontal.gif and /dev/null differ diff --git a/src/main/frontend/copy/images/noise.png b/src/main/frontend/copy/images/noise.png deleted file mode 100644 index 210e5e38..00000000 Binary files a/src/main/frontend/copy/images/noise.png and /dev/null differ diff --git a/src/main/frontend/copy/xhtml-lat1.ent b/src/main/frontend/copy/xhtml-lat1.ent deleted file mode 100644 index ffee223e..00000000 --- a/src/main/frontend/copy/xhtml-lat1.ent +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/frontend/copy/xhtml-special.ent b/src/main/frontend/copy/xhtml-special.ent deleted file mode 100644 index ca358b2f..00000000 --- a/src/main/frontend/copy/xhtml-special.ent +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/frontend/copy/xhtml-symbol.ent b/src/main/frontend/copy/xhtml-symbol.ent deleted file mode 100644 index 63c2abfa..00000000 --- a/src/main/frontend/copy/xhtml-symbol.ent +++ /dev/null @@ -1,237 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/frontend/copy/xhtml1-transitional.dtd b/src/main/frontend/copy/xhtml1-transitional.dtd deleted file mode 100644 index 628f27ac..00000000 --- a/src/main/frontend/copy/xhtml1-transitional.dtd +++ /dev/null @@ -1,1201 +0,0 @@ - - - - - -%HTMLlat1; - - -%HTMLsymbol; - - -%HTMLspecial; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/frontend/sass/_colors.scss b/src/main/frontend/sass/_colors.scss new file mode 100644 index 00000000..c500de44 --- /dev/null +++ b/src/main/frontend/sass/_colors.scss @@ -0,0 +1,17 @@ +:root { + --primary: #3B86C6; + --grey: #737577; + --darkgrey: #4D4C4E; + + --lighterprimary: #d3e1ec; + + --secondary: color-mix(in oklab, var(--primary) 80%, var(--black)); + --darktext: #47453f; + --lightgrey: #dfdfe0; + + --white: #f3f3f3; + --black: #232528; + + --yell: #ffcb05; + --whisper: #fef8c4; +} \ No newline at end of file diff --git a/src/main/frontend/sass/_doc.scss b/src/main/frontend/sass/_doc.scss new file mode 100644 index 00000000..89c57018 --- /dev/null +++ b/src/main/frontend/sass/_doc.scss @@ -0,0 +1,191 @@ +@charset "utf-8"; + +table a { + padding-left: 3px; + padding-right: 3px; +} + +span.score { + color: var(--lightgrey); +} + +.section { + margin-block-end: 1rem; + color: var(--darktext); +} + +div.headings, td.headings { + background: var(--lightgrey); + font-size: 1.5rem; + color: var(--grey); +} + +td.previous { + text-align: right; +} + +.kwic .hi { + margin: 0 .5em 0 .5em; + text-align: center; +} + +table[class="kwic"] { + border-collapse: separate; + border-spacing: 0 .5em; +} + +section dl.dl-horizontal { + dt { + overflow-x: inherit; + overflow-y: inherit; + clear: inherit; + float: inherit; + } + dd { + margin-left: 2em !important; + } +} + +.entry th { + padding: 6px 4px; +} + +#content .content dt { + font-weight: bold; + word-wrap: break-word; +} + +.content { + font: 16px/24px Georgia, "Times New Roman", Times, serif; + color: #555; + section { + clear: both; + } + h1 { + font-family: "QuicksandBook", "Arial", Helvetica, sans-serif; + font-size: 1.75em; + font-weight: bold; + margin: .8em 0 0 0; + } + h2 { + color: var(--primary); + font-family: "QuicksandBook", "Arial", Helvetica, sans-serif; + font-size: 1.33em; + font-weight: bold; + margin: .3em 0 0; + padding: 10px 0 5px; + } + h3 { + font-size: 1em; + font-weight: bold; + } + table { + margin: .5em 1em; + } + td { + padding: 6px 4px; + } + .strong { + font-weight: bold; + } + em { + font-style: italic; + } + + pre > code { + background-color: var(--black); + color: var(--white); + font-size: .92em; + } + + code { + background-color: inherit; + color: inherit; + border: 0; + } + + .option { + font-weight: bold; + font-style: italic; + } + + blockquote { + font-style: italic; + text-align: justify; + padding: 10px 15px 0 15px; + border: 1px solid #abe1ff; + background: var(--white); + margin: 5px 0 10px; + h3 { + padding: 0; + border: 0; + margin: 0; + font-size: 12px; + color: var(--primary); + } + p { + padding: 0 0 10px; + } + } + ul, ol { + margin: 0 1.5em; + } + ul li { + list-style: disc; + margin-bottom: .4em; + } + ol li { + list-style: decimal; + margin-bottom: .4em; + } + dl.wide { + dt { + width: 35em; + word-wrap: break-word; + } + dd { + margin-left: 1.5em; + } + } + img { + margin: 8px auto; + max-width: 100%; + } + td img { + max-width: inherit; + } + figure { + margin: 0 1em 1em 1em; + &.float-left { + float: left; + margin-right: 1em; + width: 50%; + } + &.float-right { + float: right; + margin-left: 1em; + width: 50%; + } + } + .img-float-left { + float: left; + margin-right: 10px; + } + .img-float-right { + float: right; + width: inherit; + margin-left: 10px; + } + pre.prettyprint { + padding: 10px 16px; + margin-bottom: .85em; + } + .guimenuitem { + background: var(--whisper); + } + .example { + margin: .25em 0 .25em 1em; + padding: 10px 10px; + border: 1px solid #707070; + } +} diff --git a/src/main/frontend/sass/_general.scss b/src/main/frontend/sass/_general.scss index 63afecbf..6f742188 100644 --- a/src/main/frontend/sass/_general.scss +++ b/src/main/frontend/sass/_general.scss @@ -1,46 +1,55 @@ -h1 { - font-size: 1.75em; +@font-face { + font-family: 'QuicksandBook'; + src: url('../fonts/Quicksand_Book-webfont.eot'); + src: url('../fonts/Quicksand_Book-webfont.eot?#iefix') format("embedded-opentype"), url('../fonts/Quicksand_Book-webfont.woff') format("woff"), url('../fonts/Quicksand_Book-webfont.ttf') format("truetype"), url('Quicksand_Book-webfont.svg#QuicksandBook') format("svg"); + font-weight: normal; + font-style: normal; +} + +h1, h2 { + font-family: "QuicksandBook", "Arial", Helvetica, sans-serif; font-weight: bold; - margin: .8em 0 0 0; +} + +h1 { + font-size: 1.75rem; padding: 0px 0 5px; margin: 0; - font-family: "QuicksandBook", "Arial", Helvetica, sans-serif; - color: #0083cb; + color: var(--primary); } h2 { - font-size: 1.2em; + font-size: 1.25rem; padding: 10px 0; - font-weight: bold; - font-family: "QuicksandBook", "Arial", Helvetica, sans-serif; letter-spacing: 1px; } h3 { - font-size: 1.2em; + font-size: 1.125rem; padding: 10px 0 5px; margin: 0 0 5px; font-weight: bold; } h4 { - font-size: 1.0em; + font-size: 1rem; padding: 10px 0; font-style: italic; font-weight: normal; } h5 { - font-size: 1.0em; + font-size: 1rem; padding: 10px 0; font-weight: normal; } a { - color: #0083cb; + color: var(--primary); text-decoration: none; &:hover { - color: #ffcb05; + color: var(--secondary); + text-decoration: underline; } } @@ -49,14 +58,13 @@ a { } .imgborder { - border: 1px solid #CCC; + border: 1px solid var(--white); padding: 3px; margin: 3px; } .code { font: 14px/20px "Ubuntu Mono", Menlo, Consolas, "Courier New", Courier, monospace; - /* background: #444444 url(../images/noise.png); */ padding: 8.5px; width: 100%; margin: 18px 0 18px; @@ -76,10 +84,6 @@ figcaption { text-align: center; } -form { - margin: 20px 0; -} - input:required:invalid, fieldset input:focus:invalid { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAAwBQTFRFvy8atzQfvzEWvDEXuzEZujIbuzEdvzAZvTAbvjAcvDAdvTIdrzcnszQisTQltTIitzQgtjUhsTssuDEguTIgujQgvD0nqkAutkM2tko5u0c4ul5Qwi8Zwy8awC8bxS4ZxiwcwTEZwDEawTAbwDAcwDEdwzIexjAaxTIZyDAbyjAcyTMdzzEazjEbzzAe0TIb0zMd0zQb1DIc1TQb1TQc1jYc1jYd1zgc2jQb2DUd2TQe2zYc3DUc3jgbxzYh1j4m4DYZ5jcZ5zYb5jYc5Dga5Dgd6TYf7Dcd7zce6zgZ6Dga7Dse7j0e8jcd8zYe8DYf8Tkb8zgd8joc8Toe8Dwf9jkb9Doc4zki5j4n6T0h7jghxkIsx0MuzUUt00Ep2kIt1kg13VE97EEm6Ugu4E064FQ98UIn8kMo80Mp90Ep9UMq3VpD3F1KxmdZw2haw2hbxGhaxGhbwW1hwHdpxndp2H1u4FlH4mVT63Jb9mZO92ZP9WhN+GVN+2RQ4HVlvIB13odx4oNv5IZy54h29o55+4p6+4t7+Y14/Yl6yI+Ew5aPxpuTxqCXyaWe3baq5JSI65CB7pKC9JKK66WX6rGb57ut6rOo7res5b6767yz+62i+q6j/qug/a2i87Cl9rGh9rOq8b+19L+z+L2x48G48MO68sa/8ci96tDK8sbB/crE/crF/srG+87K/svJ/M3I99bR99fS+9bV+93Z8ebe+OHd+eXd/OTd8ebh9e3m9u3r+ufl/eXj/ubg/ufh/efi/ufj/uXk+ujj++nl+uvl+urm/ejh++7q+u/r+vDu+vLt/PDv/fPv/vTy+/j3/Pj0//j2//n3/vv0/vr1/vv2/fr3+/39+/79/vr4/vv6/v37/f77/v38/v39/f78/f79AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOe7jtQAAABl0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuODc7gF0AAAEbSURBVChTARAB7/4A1rmNdG5xb3BwcG5tc4y43QC6isjT0NDR1djY1NLTzIu4AImVvL/Gxsa+vr7BwL29qX8AGp6rqrPDsqyurbu8r6ujFwALg5ybotjLoJqw37GfnZEOAAlsiIaEp9qmk8/FkoWHdw8AIj98eX14tc601ZB7eXpfEQAjNGJoaWd+z9uWY2pmZjYQACEzQlJUVWvK149MVlNKORUAIzFDSFBYodnJx3ZRTkEzAQAkLUBHS4HYmXXVpVhPPS8NAAInNUVkwsRlWZfVgEQ6KA8AFh0uN5TNgk1aYba3YCwHDAByAyArW11XRklGXlw+HwAbAKgSBRwpMDo8OzgyKh4EFaQA3pgZEwYIJCYmJQgKFBiO3JMVcr8Z+l4TAAAAAElFTkSuQmCC'); background-position: right; @@ -115,3 +119,74 @@ input:required:valid { .hidden { display: none; } + +.btn-primary { + --bs-btn-color: var(--white); + --bs-btn-bg: var(--primary); + --bs-btn-border-color: rgba(0, 0, 0, 0.125); + --bs-btn-hover-color: white; + --bs-btn-hover-bg: var(--primary); + --bs-btn-hover-border-color: var(--primary); + --bs-btn-focus-shadow-rgb: 49,132,253; + --bs-btn-active-color: var(--white); + --bs-btn-active-bg: var(--primary); + --bs-btn-active-border-color: var(--primary); + --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + --bs-btn-disabled-color: (--white); + --bs-btn-disabled-bg: var(--primary); + --bs-btn-disabled-border-color: var(--primary); +} + +.btn-outline-primary { + --bs-btn-color: var(--primary); + --bs-btn-border-color: rgba(0, 0, 0, 0.125); + --bs-btn-hover-color: white; + --bs-btn-hover-bg: var(--primary); + --bs-btn-hover-border-color: var(--primary); + --bs-btn-focus-shadow-rgb: 13,110,253; + --bs-btn-active-color: var(--white); + --bs-btn-active-bg: var(--primary); + --bs-btn-active-border-color: var(--primary); + --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + --bs-btn-disabled-color: var(--primary); + --bs-btn-disabled-bg: transparent; + --bs-btn-disabled-border-color: var(--primary); + --bs-gradient: none; +} + +.btn-info { + --bs-btn-color: var(--black); + --bs-btn-bg: var(--yell); + --bs-btn-border-color: var(--yell); + --bs-btn-hover-color: var(--black); + --bs-btn-hover-bg: var(--yell); + --bs-btn-hover-border-color: var(--yell); + --bs-btn-focus-shadow-rgb: 11,172,204; + --bs-btn-active-color: var(--black); + --bs-btn-active-bg: var(--yell); + --bs-btn-active-border-color: var(--yell); + --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + --bs-btn-disabled-color: var(--black); + --bs-btn-disabled-bg: var(--yell); + --bs-btn-disabled-border-color: var(--yell); +} + +.btn-outline-info { + --bs-btn-color: var(--yell); + --bs-btn-border-color: var(--yell); + --bs-btn-hover-color: var(--black); + --bs-btn-hover-bg: var(--yell); + --bs-btn-hover-border-color: var(--yell); + --bs-btn-focus-shadow-rgb: 13,202,240; + --bs-btn-active-color: var(--black); + --bs-btn-active-bg: var(--yell); + --bs-btn-active-border-color: var(--yell); + --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + --bs-btn-disabled-color: var(--yell); + --bs-btn-disabled-border-color: var(--yell); +} + +.toc { + list-style-type: none; + padding-inline-start: 0; +} diff --git a/src/main/frontend/sass/_layout.scss b/src/main/frontend/sass/_layout.scss index e24c0b38..757ba3d7 100644 --- a/src/main/frontend/sass/_layout.scss +++ b/src/main/frontend/sass/_layout.scss @@ -1,41 +1,33 @@ -body { - color: #222; - background: url(../images/body.gif) repeat 50% 100%; -} - .grey-bot { - /* background: url(../images/body-base.gif) repeat-x 50% 100%;*/ - padding-bottom: 2em; + padding-bottom: 2rem; } -#container { - margin: 0 auto 30px auto; +#container-body { + margin-block-start: 1.25rem; } @media (min-width: 767px) { #grey-top { - background: #f3f3f3 url(../images/horizontal.gif) repeat-x 50% 0; + background: var(--white); height: 100%; position: relative; } #header { - background: #f3f3f3 url(../images/header.gif) top right no-repeat; - width: 100%; + background: var(--white) url(../images/header.gif) top right no-repeat; a#logo { - background: url(../images/existdb.png) center left no-repeat; + background: url(../images/existdb-web.svg) center left no-repeat; display: block; width: 220px; height: 100px; text-indent: -999em; outline: 0; - margin: 10px 0; } } } @media (max-width: 767px) { #grey-top { - background: #f3f3f3; + background: var(--white); height: 100%; } #header { @@ -43,69 +35,64 @@ body { } } -.navbar .container { - padding-left: 0; - padding-right: 0; +.navbar-dark { + background-color: var(--black); +} + +#header-search { + margin: 0; +} + +.navbar-container { + padding-inline-start: .25rem; +} + +.breadcrumb-bar { + background-color: var(--lightgrey); + height: 2rem; + padding-block-start: .2rem; +} + +main { + margin-block-start: 1rem; } #content { min-height: 600px; } -#sourceforge { - background: url(../images/sourceforge.gif) no-repeat 50%; - width: 130px; - height: 30px; - display: block; - margin: 30px auto; - text-indent: -999em; - overflow: hidden; +#poweredby { + float: right; + width: 120px; + height: 56px; + margin-bottom: 10px; + background: url(../images/powered-by.svg) no-repeat 50%; + background-size: 100% 100%; } + #footer { - clear: both; - margin: 0 auto; - height: 50px; - color: #222; - background: url(../images/body.gif) repeat 50% 100%; - .container { - padding-left: 0; - padding-right: 0; - } - ul { - float: left; - margin: 0 0 0 -4px; - padding: 1em 1em 1em 0; - li { - display: inline; - a { - padding: 2px 4px; - color: #ffcb05; - &:hover { - background: #333; - } + display: grid; + padding-block-start: 1rem; + color: var(--white); + background-color: var(--black); + + li { + display: inline-block; + a { + padding: .1rem .2rem; + color: var(--yell); + &:hover { + color: var(--whisper); } } } } #copyright { - float: right; width: 240px; text-align: right; - padding-top: 1em; p { padding: 0; - color: #F3F3F3; } } - -#poweredby { - float: right; - width: 120px; - height: 56px; - margin-bottom: 10px; - display: inline-block; - background: url(../images/powered-by.svg) no-repeat 50%; - background-size: 100% 100%; -} diff --git a/src/main/frontend/sass/_variables.scss b/src/main/frontend/sass/_variables.scss index a97d4c81..e69de29b 100644 --- a/src/main/frontend/sass/_variables.scss +++ b/src/main/frontend/sass/_variables.scss @@ -1,143 +0,0 @@ -.content { - font: 16px/24px Georgia, "Times New Roman", Times, serif; - color: #555; - section { - clear: both; - } - h1 { - font-family: "QuicksandBook", "Arial", Helvetica, sans-serif; - font-size: 1.75em; - font-weight: bold; - margin: .8em 0 0 0; - } - h2 { - color: #0083cb; - font-family: "QuicksandBook", "Arial", Helvetica, sans-serif; - font-size: 1.33em; - font-weight: bold; - margin: .3em 0 0; - padding: 10px 0 5px; - } - h3 { - font-size: 1em; - font-weight: bold; - } - table { - margin: .5em 1em; - } - td { - padding: 6px 4px; - } -} - -.entry th { - padding: 6px 4px; -} - -.content { - .strong { - font-weight: bold; - } - em { - font-style: italic; - } - code { - font-size: .92em; - background-color: inherit; - border: 0; - color: inherit; - } - .option { - font-weight: bold; - font-style: italic; - } - blockquote { - font-style: italic; - text-align: justify; - padding: 10px 15px 0 15px; - border: 1px solid #abe1ff; - background: #FFF; - margin: 5px 0 10px; - h3 { - padding: 0; - border: 0; - margin: 0; - font-size: 12px; - color: #0083cb; - } - p { - padding: 0 0 10px; - } - } - ul, ol { - margin: 0 1.5em; - } - ul li { - list-style: disc; - margin-bottom: .4em; - } - ol li { - list-style: decimal; - margin-bottom: .4em; - } - dl.wide { - dt { - width: 35em; - word-wrap: break-word; - } - dd { - margin-left: 1.5em; - } - } -} - -#content .content dt { - font-weight: bold; - word-wrap: break-word; -} - -.content { - img { - margin: 8px auto; - max-width: 100%; - } - td img { - max-width: inherit; - } - figure { - margin: 0 1em 1em 1em; - &.float-left { - float: left; - margin-right: 1em; - width: 50%; - display: inline-block; - } - &.float-right { - float: right; - margin-left: 1em; - width: 50%; - display: inline-block; - } - } - .img-float-left { - float: left; - margin-right: 10px; - } - .img-float-right { - float: right; - width: inherit; - margin-left: 10px; - } - pre.prettyprint { - padding: 10px 16px; - margin-bottom: .85em; - } - .guimenuitem { - background: #fef8c4; - } - .example { - margin: .25em 0 .25em 1em; - padding: 10px 10px; - border: 1px solid #707070; - } -} diff --git a/src/main/frontend/sass/doc.scss b/src/main/frontend/sass/doc.scss deleted file mode 100644 index e68b8da8..00000000 --- a/src/main/frontend/sass/doc.scss +++ /dev/null @@ -1,62 +0,0 @@ -@charset "utf-8"; - -/* CSS Document */ - -.form-group { - select { - width: 8em; - padding-right: 4px; - } - input { - width: 20em; - } - select { - width: 10em; - } -} - -table a { - padding-left: 3px; - padding-right: 3px; -} - -span.score { - color: #B2B2B2; -} - -div.headings { - background: #EBEBEB; - font-size: 110%; -} - -td { - &.headings { - background: #EBEBEB; - font-size: 110%; - } - &.previous { - text-align: right; - } -} - -.kwic .hi { - margin: 0 .5em 0 .5em; - text-align: center; -} - -table[class="kwic"] { - border-collapse: separate; - border-spacing: 0 .5em; -} - -section dl.dl-horizontal { - dt { - overflow-x: inherit; - overflow-y: inherit; - clear: inherit; - float: inherit; - } - dd { - margin-left: 2em !important; - } -} diff --git a/src/main/frontend/sass/documentation.scss b/src/main/frontend/sass/documentation.scss new file mode 100644 index 00000000..14d5cd2b --- /dev/null +++ b/src/main/frontend/sass/documentation.scss @@ -0,0 +1,5 @@ +@use 'colors'; +@use 'variables'; +@use 'layout'; +@use 'general'; +@use 'doc'; diff --git a/src/main/frontend/sass/exist-2.2.scss b/src/main/frontend/sass/exist-2.2.scss deleted file mode 100644 index 11226ce1..00000000 --- a/src/main/frontend/sass/exist-2.2.scss +++ /dev/null @@ -1,24 +0,0 @@ -@import url('bootstrap.min.css'); - -@charset "utf-8"; - -/* ---------------------------------------- FONTS ---------------------------------------- */ -@font-face { - font-family: 'QuicksandBook'; - src: url('../fonts/Quicksand_Book-webfont.eot'); - src: url('../fonts/Quicksand_Book-webfont.eot?#iefix') format("embedded-opentype"), url('../fonts/Quicksand_Book-webfont.woff') format("woff"), url('../fonts/Quicksand_Book-webfont.ttf') format("truetype"), url('Quicksand_Book-webfont.svg#QuicksandBook') format("svg"); - font-weight: normal; - font-style: normal; -} - - - -/* ------------------------------------ Documentation styles ---------------------------------- */ - -@import 'variables'; -@import 'layout'; -@import 'general'; - -.row { - margin-left: 0rem; -} diff --git a/src/main/frontend/sass/style.scss b/src/main/frontend/sass/style.scss deleted file mode 100644 index c32d89c2..00000000 --- a/src/main/frontend/sass/style.scss +++ /dev/null @@ -1,100 +0,0 @@ -body { - font-style: normal; - color: #000000; - background-color: #FFFFFF; - text-align: left; - alignment: left; -} - -p { - text-align: left; - alignment: left; - &.sectstart { - margin-before: 20; - } -} - -h1 { - font-family: Arial, Helvetica, sans-serif; - font-size: large; - color: #0033CC; -} - -h2, h3 { - font-family: Arial, Helvetica, sans-serif; - color: #0033CC; -} - -b { - font-weight: bold; -} - -a { - text-decoration: none; - color: #0033CC; -} - -.sect1 { - font-family: Arial, Helvetica, sans-serif; - font-style: bold; - font-size: 125%; -} - -.sect2 { - font-family: Arial, Helvetica, sans-serif; - font-style: bold; -} - -.emph { - font-style: italic; -} - -.email { - font-size: smaller; - font-style: italic; -} - -.heading { - font-family: Arial, Helvetica, sans-serif; - font-size: 125%; - font-weight: bold; - color: #0033CC; -} - -.code, .codeblock { - font-family: Courier, mono; -} - -.navheading { - font-family: Arial, Helvetica, sans-serif; - font-weight: bold; - font-size: smaller; - text-decoration: none; - color: #993333; -} - -.navbody { - margin-left: 0.5cm; - font-family: Arial, Helvetica, sans-serif; - font-size: smaller; - text-decoration: none; -} - -.navitem { - font-family: Arial, Helvetica, sans-serif; - text-decoration: none; - font-size: smaller; - color: #666699; -} - -.itemdef { - font-family: "Times New Roman", Times, serif; - font-size: smaller; - color: #000000; -} - -.fineprint { - font-family: Arial, Helvetica, sans-serif; - font-size: smaller; - color: #000000; -} diff --git a/src/main/frontend/img/existdb-web.svg b/src/main/frontend/svg/existdb-web.svg similarity index 100% rename from src/main/frontend/img/existdb-web.svg rename to src/main/frontend/svg/existdb-web.svg diff --git a/src/main/frontend/img/powered-by-whiteglass.svg b/src/main/frontend/svg/powered-by-whiteglass.svg similarity index 100% rename from src/main/frontend/img/powered-by-whiteglass.svg rename to src/main/frontend/svg/powered-by-whiteglass.svg diff --git a/src/main/frontend/img/powered-by.svg b/src/main/frontend/svg/powered-by.svg similarity index 100% rename from src/main/frontend/img/powered-by.svg rename to src/main/frontend/svg/powered-by.svg diff --git a/src/main/xar-resources/modules/app.xql b/src/main/xar-resources/modules/app.xql index ea0556df..5e0e6b0c 100644 --- a/src/main/xar-resources/modules/app.xql +++ b/src/main/xar-resources/modules/app.xql @@ -16,10 +16,12 @@ declare function app:bread-nav($node as node(), $model as map(*)) as element(nav return - +
+
+
- +
-