From 16c47eea9dbe740a6e757cf872434d3c57412900 Mon Sep 17 00:00:00 2001 From: Fredrik Jonsson Date: Thu, 28 May 2026 08:18:04 +0200 Subject: [PATCH] Using color-scheme and light-dark() to implement dark mode (#154) * Lint fixes. * Implement light-dark(). * Lint css with biome, remove stylelint. * Biome lint fixes. * Dark mode adjustments. * Style bug fixes. * Colour adjustments. * Move header and footer styles to base. * Site header adjustments. * Removing jQuery and umbrella libs. They where great but not needed anymore. * Add colorScheme to optionally lock light/dark. * Update README. * Biome adjustments. --- .pre-commit-config.yaml | 13 +- .stylelintignore | 1 - .stylelintrc.yaml | 24 - README.md | 44 +- assets/css/_colors.css | 175 +- assets/css/_variables.css | 5 +- assets/css/_zen.css | 8 - assets/css/base/_document.css | 22 +- assets/css/{components => base}/_footer.css | 0 assets/css/base/_forms.css | 2 +- assets/css/{components => base}/_header.css | 4 +- assets/css/base/_headings.css | 10 +- assets/css/base/_images.css | 2 +- assets/css/base/_links.css | 22 - assets/css/components/_anchor.css | 4 +- assets/css/components/_box.css | 29 - assets/css/components/_button.css | 19 +- assets/css/components/_cards.css | 24 - assets/css/components/_cookieconsent.css | 4 +- assets/css/components/_disabled.css | 4 +- assets/css/components/_flex-inline.css | 2 +- assets/css/components/_htmx-indicator.css | 45 + assets/css/components/_icon-inline.css | 2 +- assets/css/components/_messages.css | 41 +- assets/css/components/_pager.css | 9 +- assets/css/components/_tables.css | 6 +- assets/css/layouts/_layouts.css | 2 +- assets/css/mobilemenu.css | 8 +- assets/css/reset/_reset.css | 2 - assets/css/styles.css | 5 +- assets/js/codeblocks.js | 1 - assets/libs/jquery.min.js | 2 - assets/libs/jquery.slim.min.js | 2 - assets/libs/umbrella.min.js | 3 - biome.json | 26 +- layouts/_partials/head/scripts.html | 10 - layouts/_partials/mobilemenu.html | 2 +- layouts/baseof.html | 2 +- package-lock.json | 1789 ------------------- package.json | 31 - 40 files changed, 276 insertions(+), 2130 deletions(-) delete mode 100644 .stylelintignore delete mode 100644 .stylelintrc.yaml rename assets/css/{components => base}/_footer.css (100%) rename assets/css/{components => base}/_header.css (93%) create mode 100644 assets/css/components/_htmx-indicator.css delete mode 100644 assets/libs/jquery.min.js delete mode 100644 assets/libs/jquery.slim.min.js delete mode 100644 assets/libs/umbrella.min.js delete mode 100644 package-lock.json delete mode 100644 package.json diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a4a1b1b..f0b2408 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,16 +1,7 @@ repos: - - repo: https://github.com/awebdeveloper/pre-commit-stylelint - rev: "0.0.2" - hooks: - - id: stylelint - files: assets/css/.*\.css$ - additional_dependencies: - - "stylelint@17.4.0" - - "stylelint-config-standard@40.0.0" - repo: https://github.com/biomejs/pre-commit - rev: "v2.4.6" + rev: "v2.4.15" hooks: - id: biome-check - files: assets/js/.*\.js$ additional_dependencies: - - "@biomejs/biome@2.4.6" + - "@biomejs/biome@2.4.15" diff --git a/.stylelintignore b/.stylelintignore deleted file mode 100644 index 2fd4c3b..0000000 --- a/.stylelintignore +++ /dev/null @@ -1 +0,0 @@ -libs/ diff --git a/.stylelintrc.yaml b/.stylelintrc.yaml deleted file mode 100644 index 400f9c4..0000000 --- a/.stylelintrc.yaml +++ /dev/null @@ -1,24 +0,0 @@ -extends: - - stylelint-config-standard -rules: - alpha-value-notation: number - block-no-empty: null - declaration-block-no-redundant-longhand-properties: null - declaration-empty-line-before: null - comment-empty-line-before: - - always - - except: - - first-nested - ignore: - - stylelint-commands - - after-comment - hue-degree-notation: number - import-notation: null - keyframes-name-pattern: - - "--.+" - - message: Keyframe name should be written as - media-feature-range-notation: prefix - no-descending-specificity: null - selector-class-pattern: - - "^[a-z0-9\\-\\_]+$" - - message: Selector should be written in lowercase with hyphens or underscore (selector-class-pattern) diff --git a/README.md b/README.md index 5981e2e..e6a7d43 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,6 @@ Quickstart a new site with the Zen theme by using the [Zen demo repo as a templa * [Podcast](#podcast) * [Shortcodes](#shortcodes) * [Content security policy headers](#Content-security-policy-headers) -* [Use npm to lint CSS and JavaScript](#use-npm-to-lint-css-and-javascript) * [Repository links](#repository-links) * [Math typesetting with KaTeX](#math-typesetting-with-katex) * [Getting help](#getting-help) @@ -58,6 +57,7 @@ Quickstart a new site with the Zen theme by using the [Zen demo repo as a templa * Commands for linting of css and js * Contact form (PHP) * CSS grid and flex throughout +* Dark and light mode * HTML5 * Hugo Pipes for images, js and css * Math typesetting with KaTeX @@ -245,8 +245,8 @@ hugo server --themesDir ../.. Performance should be excellent. * Minimal and compliant HTML5 -* Styles 23,2 kB (6,7 kB when gzipped) -* JavaScript 1 kB (with only mobile menu active, 4 Kb with all features active) +* Styles 28 kB (8 kB when gzipped) +* JavaScript 6 kB (with everything active, otherwise near zero) * All scripts loaded in head with "defer" * Optimised for HTTP/2 @@ -292,6 +292,7 @@ params: - section2 # in the `JSON+LD` in the page's ``. - section3 # This theme requires Hugo `v0.109.0` or higher to # generate the `BreadcrumbListing`. + colorScheme: "light" # "light/dark" to lock, omit for user system preference. cookieConsent: true # Show cookie consent form, default false. contact: "info@example.org" dateformat: "" # Set the date format, default to "2 January, 2006" @@ -303,7 +304,6 @@ params: image: "" # Relative path to site image in JSON-LD, no leading slash. imageMaxWidth: "" # Max width for images added via figure shortcode. internalPagination: true # Use Hugo's internal pagination template, default false. - jquery: true # Add jQuery, default false. languageDir: "" # Set ltr or rtl, defaults to ltr. logo: false # Turn off the logo, defaults to true. logoPath: # Relative path to site logo, defaults to "images/logo.png", no leading slash. @@ -329,7 +329,6 @@ params: siteName: false # Hide the site name (visually-hidden), default true. submitted: true # Show author and date information for a post. themeColor: # Hex color value, used in meta tags, default "#ffffff". - umbrella: true # Add Umbrella JS, default false. podcast: title: # * Feed title, defaults to site title (iTunes). @@ -374,7 +373,7 @@ They are found in the theme `assets/css/_colors.css` and `assets/css/_variables. In most cases you likely only need to override a few values and then it is easier to set these in the custom css files. -Root `assets/css/_custom.css`: Loaded last so use to override css variables and add any custom styles you need. +Root `assets/css/_custom.css`: Loaded last so use it to override css variables and add any custom styles you need. ### Logo @@ -390,13 +389,11 @@ Upload your image to [RealFaviconGenerator](https://realfavicongenerator.net/) t The theme will autodetect them and add the needed code. -### Head and footer partials +### Dark and light mode -If you create partials named `head/extra.html` and/or `footer.html` they will be used. They do not exist or are empty in the theme but are supported as a convenience. +Colors are set with the css function `light-dark()`. The first colour is used in light mode and the other colour is used in dark mode. See `assets/css/_colors.css`. -Content in the "head/extra" partial will be added to the end of the "head" tag, perhaps some extra css or javascript. - -Content in the "footer" partial will replace all the default content in the "footer" tag. +Use the param `colorScheme` to lock your site to either light or dark mode. By default the mode will follow the users system preferences. ### Layouts @@ -432,10 +429,6 @@ There is an `assets/css/_custom.css` file meant for your custom styles. Copy it The default styles in `assets/css/_zen.css` are boring but functional. You can easily override them completely by placing an empty file named "_zen.css" in root assets/css directory. -The css files are by default built for production, compressed with fingerprint. - -By setting the Hugo environment variable to "development" (default when running `hugo server`) they will instead be nested with sourcemaps. - ## Render hook templates @@ -835,27 +828,6 @@ The **content** that should be wrapped. Some more content. Includes tracking code for Matomo or Google in a way that supports Content security policy headers. Read more in my blog post [Content security policy headers when using Matomo or Google analytics](https://xdeb.org/post/2020/01/14/content-security-policy-headers-when-using-matomo-or-google-analytics/). -## Use npm to lint CSS and JavaScript - -* Lint your CSS using stylelint. -* Lint your JavaScript using biome. -* Can lint files in the theme as well as the project assets directory. - -Set up your front-end development build tools: - -1. Install Node.js and npm, the Node.js package manager. -2. The package.json file in your new sub-theme contains the versions of all the -Node.js software you need. To install them run: - - npm install - -3. Run the following commands to lint your theme and projects CSS and JavaScript code. - - npm run lint-theme - npm run lint-project - nmp run lint (project + theme) - - ## Repository links Add view and edit repo links on your post. Activates when you add repository settings, see example for GitHub below. See more in the partial `repository-links.html`. diff --git a/assets/css/_colors.css b/assets/css/_colors.css index 18cd93c..b577f55 100644 --- a/assets/css/_colors.css +++ b/assets/css/_colors.css @@ -1,97 +1,152 @@ +/* biome-ignore-all format: aligned columns for readability */ + /* Theme colours. */ /* Override css variables in "assets/css/_custom.css" */ :root { + /* Brand colours. */ + --color-brand: var(--color-grey-900); + --color-brand-alt: var(--color-grey-500); + + /* Brand variations */ + --color-brand-900: oklch(from var(--color-brand) calc(l - 0.5) c h); + --color-brand-800: oklch(from var(--color-brand) calc(l - 0.4) c h); + --color-brand-700: oklch(from var(--color-brand) calc(l - 0.3) c h); + --color-brand-600: oklch(from var(--color-brand) calc(l - 0.2) c h); + --color-brand-500: oklch(from var(--color-brand) calc(l - 0.1) c h); + --color-brand-400: oklch(from var(--color-brand) l c h); + --color-brand-300: oklch(from var(--color-brand) calc(l + 0.1) c h); + --color-brand-200: oklch(from var(--color-brand) calc(l + 0.2) c h); + --color-brand-100: oklch(from var(--color-brand) calc(l + 0.3) c h); + + /* Brand alt variations */ + --color-brand-alt-900: oklch(from var(--color-brand-alt) calc(l - 0.5) c h); + --color-brand-alt-800: oklch(from var(--color-brand-alt) calc(l - 0.4) c h); + --color-brand-alt-700: oklch(from var(--color-brand-alt) calc(l - 0.3) c h); + --color-brand-alt-600: oklch(from var(--color-brand-alt) calc(l - 0.2) c h); + --color-brand-alt-500: oklch(from var(--color-brand-alt) calc(l - 0.1) c h); + --color-brand-alt-400: oklch(from var(--color-brand-alt) l c h); + --color-brand-alt-300: oklch(from var(--color-brand-alt) calc(l + 0.1) c h); + --color-brand-alt-200: oklch(from var(--color-brand-alt) calc(l + 0.2) c h); + --color-brand-alt-100: oklch(from var(--color-brand-alt) calc(l + 0.3) c h); + /* Base colours. */ --color-black: oklch(1% 0.01 0); - --color-nearblack: oklch(25% 0.01 0); - --color-grey-700: oklch(38% 0 0); - --color-grey-600: oklch(49% 0 0); - --color-grey-500: oklch(60% 0 0); - --color-grey-400: oklch(71% 0 0); - --color-grey-300: oklch(80% 0 0); - --color-grey-200: oklch(89% 0 0); + --color-grey-900: oklch(21% 0.01 0); + --color-grey-800: oklch(28% 0.01 0); + --color-grey-700: oklch(37% 0.01 0); + --color-grey-600: oklch(45% 0.01 0); + --color-grey-500: oklch(55% 0.01 0); + --color-grey-400: oklch(71% 0.01 0); + --color-grey-300: oklch(87% 0.01 0); + --color-grey-200: oklch(93% 0.01 0); --color-grey-100: oklch(95% 0 0); - --color-nearwhite: oklch(98% 0 0); - --color-white: oklch(100% 0 0); + --color-white: oklch(99% 0 0); --color-red: oklch(65% 0.2 24); --color-yellow: oklch(65% 0.12 80); --color-green: oklch(65% 0.19 138); --color-blue: oklch(65% 0.16 247); /* Transparent colours. */ - --color-black-60: oklch(0% 0 0 / 0.6); - --color-black-40: oklch(0% 0 0 / 0.4); - --color-black-20: oklch(0% 0 0 / 0.2); - --color-black-10: oklch(0% 0 0 / 0.1); - --color-white-20: oklch(100% 0 0 / 0.2); - --color-white-10: oklch(100% 0 0 / 0.1); - - /* Brand colours. */ - --color-brand: var(--color-nearblack); - --color-brand-alt: var(--color-grey-500); - --color-brand-light: var(--color-grey-300); - --color-brand-dark: var(--color-grey-700); + --color-black-90: oklch(1% 0.01 0 / 0.9); + --color-black-80: oklch(1% 0.01 0 / 0.8); + --color-black-70: oklch(1% 0.01 0 / 0.7); + --color-black-60: oklch(1% 0.01 0 / 0.6); + --color-black-50: oklch(1% 0.01 0 / 0.5); + --color-black-40: oklch(1% 0.01 0 / 0.4); + --color-black-30: oklch(1% 0.01 0 / 0.3); + --color-black-20: oklch(1% 0.01 0 / 0.2); + --color-black-10: oklch(1% 0.01 0 / 0.1); + --color-white-20: oklch(99% 0 0 / 0.2); + --color-white-10: oklch(99% 0 0 / 0.1); /* Text colours. */ - --color-text: var(--color-black); - --color-text-bg: var(--color-white); - --color-text-meta: var(--color-grey-600); - --color-headings: var(--color-nearblack); - --color-code: var(--color-nearblack); + --color-text: light-dark(var(--color-black), var(--color-white)); + --color-text-bg: light-dark(var(--color-white), var(--color-black)); + --color-text-meta: light-dark(var(--color-grey-600), var(--color-grey-300)); + --color-headings: light-dark(var(--color-grey-900), var(--color-grey-100)); + --color-code: light-dark(var(--color-grey-900), var(--color-grey-100)); /* Link colours. */ - --color-link: var(--color-brand); - --color-link-visited: var(--color-brand); - --color-link-hover: var(--color-brand-alt); - --color-link-active: var(--color-red); - --color-link-inverted: var(--color-white); - --color-link-visited-inverted: var(--color-white); - --color-link-hover-inverted: var(--color-white); - --color-link-active-inverted: var(--color-red); + --color-link: light-dark(var(--color-brand-500), var(--color-grey-100)); + --color-link-visited: light-dark(var(--color-brand-500), var(--color-grey-100)); + --color-link-hover: light-dark(var(--color-brand-200), var(--color-brand-400)); + --color-link-active: light-dark(var(--color-red), var(--color-red)); /* Button colours. */ - --color-button: var(--color-brand); - --color-button-hover: var(--color-brand-alt); - --color-button-text: var(--color-white); - --color-button-text-hover: var(--color-white); - --color-button-disabled: var(--color-grey-400); + --color-button: light-dark(var(--color-brand-400), var(--color-brand-100)); + --color-button-text: light-dark(var(--color-white), var(--color-white)); + --color-button-hover: light-dark(var(--color-brand-200), var(--color-brand-300)); + --color-button-text-hover: light-dark(var(--color-white), var(--color-white)); + + /* Disabled colours. */ + --color-disabled: light-dark(var(--color-grey-400), var(--color-grey-600)); + --color-disabled-alt: light-dark(var(--color-grey-100), var(--color-grey-800)); /* Border colours. */ - --color-border: var(--color-brand); - --color-border-light: var(--color-brand-light); - --color-border-dark: var(--color-brand-dark); + --color-border: light-dark(var(--color-brand-400), var(--color-brand-200)); + --color-border-light: light-dark(var(--color-brand-200), var(--color-brand-400)); + --color-border-dark: light-dark(var(--color-brand-600), var(--color-brand-300)); /* Background colours. */ - --color-header-bg: var(--color-white); - --color-body-bg: var(--color-white); - --color-footer-bg: var(--color-white); - --color-backdrop: var(--color-grey-100); + --color-body-bg: light-dark(var(--color-white), var(--color-black)); + --color-page-bg: light-dark(transparent, transparent); + --color-header-bg: light-dark(transparent, transparent); + --color-footer-bg: light-dark(transparent, transparent); + --color-backdrop: light-dark(var(--color-black-60), var(--color-black-80)); /* Mobil menu colours. */ - --color-mobile-menu: var(--color-brand); - --color-mobile-menu-cover: var(--color-black-20); + --color-mobile-menu: light-dark(var(--color-brand-400), var(--color-brand-400)); + --color-mobile-menu-cover: light-dark(var(--color-black-20), var(--color-black-20)); /* Form colours. */ - --color-accent: var(--color-brand); + --color-accent: light-dark(var(--color-brand-400), var(--color-brand-200)); /* Row (e.g. in table) colours. */ - --color-row-header: transparent; - --color-row-odd: var(--color-nearwhite); - --color-row-even: transparent; + --color-row-header: light-dark(transparent, transparent); + --color-row-odd: light-dark(var(--color-grey-100), var(--color-grey-900)); + --color-row-even: light-dark(transparent, transparent); + + /* Highlight colours. */ + --color-highlight: light-dark(var(--color-brand-400), var(--color-brand-100)); + --color-mark-highlight: light-dark(var(--color-red), var(--color-red)); /* Status colours. */ --color-info: var(--color-blue); - --color-info-bg: oklch(from var(--color-blue) 100% 0.03 h); - --color-success: var(--color-green); - --color-success-bg: oklch(from var(--color-green) 100% 0.03 h); + --color-success: var(--color-green); --color-warning: var(--color-yellow); - --color-warning-bg: oklch(from var(--color-yellow) 100% 0.03 h); --color-error: var(--color-red); - --color-error-bg: oklch(from var(--color-red) 100% 0.03 h); - /* Highlight colours. */ - --color-highlight: var(--color-brand-alt); - --color-mark-highlight: var(--color-red); + + + /* Follow user system dark/light setting. */ + color-scheme: light dark; + + /* Initialize the theme variable */ + --theme: light; + + @media (prefers-color-scheme: dark) { + --theme: dark; + } +} + +[data-theme="light"] { + color-scheme: light; +} + +[data-theme="dark"] { + color-scheme: dark; +} + +@container style(--theme: light) { + [data-theme="inverted"] { + color-scheme: dark; + } +} + +@container style(--theme: dark) { + [data-theme="inverted"] { + color-scheme: light; + } } diff --git a/assets/css/_variables.css b/assets/css/_variables.css index 84669bf..d60e8f6 100644 --- a/assets/css/_variables.css +++ b/assets/css/_variables.css @@ -1,3 +1,5 @@ +/* biome-ignore-all format: aligned columns for readability */ + :root { /* Set theme css variables. Override css variables in "assets/css/_custom.css" */ @@ -39,8 +41,6 @@ monospace) hints at what type of font to use if the web browser doesn't find any of the fonts in the list. */ - /* stylelint-disable value-keyword-case */ - /* Emojis font stack. Add to end of other stacks when needed. */ --emojis: 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'; @@ -69,7 +69,6 @@ /* Monospace font stacks. */ --ui-monospace: ui-monospace, 'Cascadia Code', 'Source Code Pro', Menlo, Consolas, 'DejaVu Sans Mono', monospace; - /* stylelint-enable value-keyword-case */ /* Font family. */ --ff-body: var(--ui-serif); diff --git a/assets/css/_zen.css b/assets/css/_zen.css index 9237cae..b2aef15 100644 --- a/assets/css/_zen.css +++ b/assets/css/_zen.css @@ -2,14 +2,6 @@ /* Page */ -body { - background-color: var(--color-backdrop); -} - -.page { - background-color: var(--color-body-bg); -} - .footer { border-block-start: 2px solid var(--color-border); } diff --git a/assets/css/base/_document.css b/assets/css/base/_document.css index 4c27a5a..cc6538d 100644 --- a/assets/css/base/_document.css +++ b/assets/css/base/_document.css @@ -1,21 +1,31 @@ /* Document */ html { - /* Change the default font family in all browsers. */ - font-family: var(--ff-body); - /* Set base font size in percent. */ font-size: calc(var(--base-font-size) / 16 * 100%); - - /* Set text colour. */ - color: var(--color-text); } body { + /* Change the default font family in all browsers. */ + font-family: var(--ff-body); + /* Correct the line height in all browsers. */ line-height: var(--base-line-height); + /* Set text colour. */ + color: var(--color-text); + /* Accent colour for forms. */ accent-color: var(--color-accent); + + /* Set background colour. */ + background-color: var(--color-body-bg); } +.page { + background-color: var(--color-page-bg); +} + +::backdrop { + background-color: var(--color-backdrop); +} diff --git a/assets/css/components/_footer.css b/assets/css/base/_footer.css similarity index 100% rename from assets/css/components/_footer.css rename to assets/css/base/_footer.css diff --git a/assets/css/base/_forms.css b/assets/css/base/_forms.css index 80ac871..a45b91e 100644 --- a/assets/css/base/_forms.css +++ b/assets/css/base/_forms.css @@ -16,7 +16,7 @@ label { /* Display as block if before input. */ &:has(+ input), - &:has(+ textarea){ + &:has(+ textarea) { display: block; } diff --git a/assets/css/components/_header.css b/assets/css/base/_header.css similarity index 93% rename from assets/css/components/_header.css rename to assets/css/base/_header.css index 53424f1..f868d50 100644 --- a/assets/css/components/_header.css +++ b/assets/css/base/_header.css @@ -5,7 +5,8 @@ padding-block: min(var(--gutters), var(--spacing-m)); display: flex; - flex-direction: column; + flex-direction: row; + align-items: center; gap: var(--header-gap); background-color: var(--color-header-bg); @@ -23,6 +24,7 @@ /* Logo image. */ .header__logo-image { vertical-align: bottom; + min-width: 32px; } /* The name of the website. */ diff --git a/assets/css/base/_headings.css b/assets/css/base/_headings.css index d2ab2db..f491a1c 100644 --- a/assets/css/base/_headings.css +++ b/assets/css/base/_headings.css @@ -8,7 +8,7 @@ h3, h4, h5, h6 { - margin-block: 1.5em .5em; + margin-block: 1.5em 0.5em; color: var(--color-headings); font-family: var(--ff-headings); font-weight: var(--fw-headings); @@ -17,7 +17,7 @@ h6 { /* Smaller margin when a headeing is right after another heading. */ & + & { - margin-block-start: .75em; + margin-block-start: 0.75em; } /* Set max text line width in main for readability. */ @@ -31,17 +31,17 @@ h1 { margin-block-start: var(--spacing-m); margin-block-end: var(--spacing-xs); font-size: var(--fs-xxl); - letter-spacing: -.01em; + letter-spacing: -0.01em; } h2 { font-size: var(--fs-xl); - letter-spacing: -.01em; + letter-spacing: -0.01em; } h3 { font-size: var(--fs-l); - letter-spacing: -.01em; + letter-spacing: -0.01em; } h4 { diff --git a/assets/css/base/_images.css b/assets/css/base/_images.css index 0d6b12b..fc00207 100644 --- a/assets/css/base/_images.css +++ b/assets/css/base/_images.css @@ -3,7 +3,7 @@ figure, img { &.image { - --image-padding: .75rem; + --image-padding: 0.75rem; @media (min-width: 666px) { &.center { diff --git a/assets/css/base/_links.css b/assets/css/base/_links.css index 4443aee..7878ab4 100644 --- a/assets/css/base/_links.css +++ b/assets/css/base/_links.css @@ -55,25 +55,3 @@ a:active { } } } - -/* Inverted links, for dark backgrounds. */ -.link-inverted { - a { - &:link { - color: var(--color-link-inverted); - } - - &:visited { - color: var(--color-link-visited-inverted); - } - - &:hover, - &:focus { - color: var(--color-link-hover-inverted); - } - - &:active { - color: var(--color-link-active-inverted); - } - } -} diff --git a/assets/css/components/_anchor.css b/assets/css/components/_anchor.css index f0e0bb5..4b303ec 100644 --- a/assets/css/components/_anchor.css +++ b/assets/css/components/_anchor.css @@ -1,8 +1,8 @@ /* Anchor */ .anchor { - --anchor-gap: .5rem; - --anchor-opacity: .4; + --anchor-gap: 0.5rem; + --anchor-opacity: 0.4; display: grid; grid-template-columns: auto auto; diff --git a/assets/css/components/_box.css b/assets/css/components/_box.css index 2d0d53c..b45eec6 100644 --- a/assets/css/components/_box.css +++ b/assets/css/components/_box.css @@ -33,32 +33,3 @@ .box--gutter { padding-inline: var(--gutters); } - -.box--inverted { - background: var(--color-border); - color: var(--color-text-bg); - - /* Make sure headings etc. also gets inverted. */ - * { - color: var(--color-text-bg); - } - - a { - &:link { - color: var(--color-link-inverted); - } - - &:visited { - color: var(--color-link-visited-inverted); - } - - &:hover, - &:focus { - color: var(--color-link-hover-inverted); - } - - &:active { - color: var(--color-link-active-inverted); - } - } -} diff --git a/assets/css/components/_button.css b/assets/css/components/_button.css index e66e6a5..3285751 100644 --- a/assets/css/components/_button.css +++ b/assets/css/components/_button.css @@ -1,5 +1,3 @@ -/* stylelint-disable no-duplicate-selectors */ - /* Button */ .button, @@ -11,7 +9,7 @@ text-decoration: none; text-align: center; width: fit-content; - padding: .2rem 1rem; + padding: 0.2rem 1rem; /* Improve usability and consistency of cursor style between image-type `input` and others. */ cursor: pointer; @@ -36,7 +34,7 @@ .button--small { font-size: var(--fs-xs); - padding: .2rem .75rem; + padding: 0.2rem 0.75rem; } .button--alt { @@ -65,7 +63,7 @@ &:active { color: var(--color-button-text); background: var(--color-success); -} + } } .button--decline { @@ -98,18 +96,19 @@ other variations. */ [type='button'], [type='submit'] { &:disabled { - background-color: var(--color-grey-200); - border: 1px solid var(--color-button-disabled); + color: var(--color-disabled); + background-color: var(--color-disabled-alt); + border: 1px solid var(--color-disabled); background-image: none; text-shadow: none; cursor: default; - color: var(--color-button-disabled); &:hover, &:focus, &:active { /* Override any link underlines and color changes. */ - color: var(--color-button-disabled); + color: var(--color-disabled); + background-color: var(--color-disabled-alt); text-decoration: none; } } @@ -127,7 +126,7 @@ textarea { @media (min-width: 666px) { input:only-of-type { &:has(+ [type='submit']) { - margin-inline-end: .5rem; + margin-inline-end: 0.5rem; } } } diff --git a/assets/css/components/_cards.css b/assets/css/components/_cards.css index 63e7eb5..45406b2 100644 --- a/assets/css/components/_cards.css +++ b/assets/css/components/_cards.css @@ -42,27 +42,3 @@ A simple cards style. */ .card--gutter { padding-inline: var(--gutters); } - -.card--inverted { - background: var(--color-border); - color: var(--color-text-bg); - - a { - &:link { - color: var(--color-link-inverted); - } - - &:visited { - color: var(--color-link-visited-inverted); - } - - &:hover, - &:focus { - color: var(--color-link-hover-inverted); - } - - &:active { - color: var(--color-link-active-inverted); - } - } -} diff --git a/assets/css/components/_cookieconsent.css b/assets/css/components/_cookieconsent.css index a3e5760..d1784d7 100644 --- a/assets/css/components/_cookieconsent.css +++ b/assets/css/components/_cookieconsent.css @@ -4,7 +4,7 @@ display: flex; flex-flow: wrap; justify-content: center; - gap: .5rem; + gap: 0.5rem; position: sticky; bottom: 0; width: 100%; @@ -19,7 +19,7 @@ .cookieconsent__actions { display: flex; - gap: .5rem; + gap: 0.5rem; } &[hidden] { diff --git a/assets/css/components/_disabled.css b/assets/css/components/_disabled.css index 56f572a..c36f801 100644 --- a/assets/css/components/_disabled.css +++ b/assets/css/components/_disabled.css @@ -1,13 +1,13 @@ .disabled { /* Re-set default cursor for disabled elements. */ cursor: default; - color: var(--color-button-disabled); + color: var(--color-disabled); &:hover, &:focus, &:active { /* Override any link underlines and color changes. */ - color: var(--color-button-disabled); + color: var(--color-disabled); text-decoration: none; } } diff --git a/assets/css/components/_flex-inline.css b/assets/css/components/_flex-inline.css index 2ca864d..6d71d63 100644 --- a/assets/css/components/_flex-inline.css +++ b/assets/css/components/_flex-inline.css @@ -1,5 +1,5 @@ .flex-inline { - --flex-inline-gap: .5rem; + --flex-inline-gap: 0.5rem; display: flex; flex-wrap: wrap; diff --git a/assets/css/components/_htmx-indicator.css b/assets/css/components/_htmx-indicator.css new file mode 100644 index 0000000..be94933 --- /dev/null +++ b/assets/css/components/_htmx-indicator.css @@ -0,0 +1,45 @@ +.htmx-indicator { + position: fixed; + inset: 0; + width: 100%; + height: 4px; + background: linear-gradient( + 90deg, + transparent, + var(--color-accent), + transparent, + var(--color-accent), + transparent + ); + opacity: 0; + visibility: hidden; + + &.htmx-request { + opacity: 1; + visibility: visible; + animation: + --fadein 2s linear forwards, + --slide 1.2s ease-in-out infinite; + } +} + +@keyframes --slide { + 0% { + transform: translateX(-100%); + } + 100% { + transform: translateX(100%); + } +} + +@keyframes --fadein { + 0% { + opacity: 0; + } + 50% { + opacity: 0; + } + 100% { + opacity: 1; + } +} diff --git a/assets/css/components/_icon-inline.css b/assets/css/components/_icon-inline.css index cc1ba6c..271a574 100644 --- a/assets/css/components/_icon-inline.css +++ b/assets/css/components/_icon-inline.css @@ -10,7 +10,7 @@ &:focus-visible, &:hover { .icon-link { - opacity: .3; + opacity: 0.3; &:focus-visible, &:hover { diff --git a/assets/css/components/_messages.css b/assets/css/components/_messages.css index 2e1704d..7e8443e 100644 --- a/assets/css/components/_messages.css +++ b/assets/css/components/_messages.css @@ -1,33 +1,42 @@ /* Messages */ .message { - padding: .5rem; + --color-message: var(--color-grey-600); + --color-message-text: light-dark( + oklch(from var(--color-message) l c h), + oklch(from var(--color-message) 100% 0.03 h) + ); + --color-message-bg: light-dark( + oklch(from var(--color-message) 100% 0.03 h), + oklch(from var(--color-message) calc(l + 0.07) c h) + ); + --color-message-border: light-dark( + oklch(from var(--color-message) calc(l + 0.2) c h), + oklch(from var(--color-message) calc(l - 0.07) c h) + ); + + padding: 0.5rem; + color: var(--color-message-text); + background-color: var(--color-message-bg); + outline-color: var(--color-message-border); outline-width: 2px; outline-style: solid; width: 95%; - &.success { - background-color: var(--color-success-bg); - color: var(--color-success); - outline-color: var(--color-success); + &.info { + --color-message: var(--color-info); } - &.info { - background-color: var(--color-info-bg); - color: var(--color-info); - outline-color: var(--color-info); + &.success { + --color-message: var(--color-success); } &.warning { - background-color: var(--color-warning-bg); - color: var(--color-warning); - outline-color: var(--color-warning); + --color-message: var(--color-warning); } &.error { - background-color: var(--color-error-bg); - color: var(--color-error); - outline-color: var(--color-error); + --color-message: var(--color-error); } } @@ -37,6 +46,6 @@ @keyframes --outline-highlight { 50% { - outline-width: .3rem; + outline-width: 0.3rem; } } diff --git a/assets/css/components/_pager.css b/assets/css/components/_pager.css index 2957564..77a7c5b 100644 --- a/assets/css/components/_pager.css +++ b/assets/css/components/_pager.css @@ -5,7 +5,7 @@ is available. */ .pagination, .pager { - --flex-inline-gap: .5rem; + --flex-inline-gap: 0.5rem; display: flex; flex-wrap: wrap; @@ -31,9 +31,6 @@ is available. */ padding-inline: 2px; } - .page-item { - } - .active { font-weight: var(--fw-bold); } @@ -42,13 +39,13 @@ is available. */ .page-link { /* Re-set default cursor for disabled elements. */ cursor: default; - color: var(--color-button-disabled); + color: var(--color-disabled); &:hover, &:focus, &:active { /* Override any link underlines and color changes. */ - color: var(--color-button-disabled); + color: var(--color-disabled); text-decoration: none; } } diff --git a/assets/css/components/_tables.css b/assets/css/components/_tables.css index 259a90a..22edf53 100644 --- a/assets/css/components/_tables.css +++ b/assets/css/components/_tables.css @@ -1,8 +1,8 @@ .zebra-table { - --table-cell-padding: .5rem; + --table-cell-padding: 0.5rem; @media (max-width: 666px) { - --table-cell-padding: .3rem; + --table-cell-padding: 0.3rem; } th, @@ -30,7 +30,7 @@ } .responsive-table { - --table-gap: .5rem; + --table-gap: 0.5rem; @media (max-width: 666px) { th { diff --git a/assets/css/layouts/_layouts.css b/assets/css/layouts/_layouts.css index 5600ed3..8b0424f 100644 --- a/assets/css/layouts/_layouts.css +++ b/assets/css/layouts/_layouts.css @@ -1,4 +1,4 @@ -/* stylelint-disable no-duplicate-selectors */ +/* biome-ignore-all format: aligned columns for readability */ /* Initial layout setup. */ .layout__page { diff --git a/assets/css/mobilemenu.css b/assets/css/mobilemenu.css index dd64160..cebe93c 100644 --- a/assets/css/mobilemenu.css +++ b/assets/css/mobilemenu.css @@ -41,7 +41,7 @@ position: absolute; top: var(--gutters); right: var(--gutters); - padding: 0 .3rem; + padding: 0 0.3rem; border-color: var(--color-button-text-hover); z-index: 22; pointer-events: auto; @@ -58,7 +58,7 @@ .mobile-nav__hamburger { fill: var(--color-button-text); width: 1.6rem; - margin-inline-start: .1rem; + margin-inline-start: 0.1rem; .button--outline & { fill: var(--color-button); @@ -106,7 +106,7 @@ .mobile-nav__region { &:not(:empty) { - margin-block-end: .5rem; + margin-block-end: 0.5rem; } } @@ -122,7 +122,7 @@ a { display: inline-block; - padding-block: .5rem; + padding-block: 0.5rem; } } diff --git a/assets/css/reset/_reset.css b/assets/css/reset/_reset.css index d972864..8922e25 100644 --- a/assets/css/reset/_reset.css +++ b/assets/css/reset/_reset.css @@ -1,5 +1,3 @@ -/* stylelint-disable property-no-vendor-prefix */ - /* Reset browsers to some sane defaults. */ /* Document */ diff --git a/assets/css/styles.css b/assets/css/styles.css index 403995e..4b3e371 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -7,8 +7,10 @@ @import './reset/_reset.css' layer(reset); @import './layouts/_layouts.css' layer(layouts); @import './base/_document.css' layer(base); +@import './base/_footer.css' layer(base); @import './base/_forms.css' layer(base); @import './base/_grouping.css' layer(base); +@import './base/_header.css' layer(base); @import './base/_headings.css' layer(base); @import './base/_images.css' layer(base); @import './base/_links.css' layer(base); @@ -23,11 +25,10 @@ @import './components/_disabled.css' layer(components); @import './components/_flex-group.css' layer(components); @import './components/_flex-inline.css' layer(components); -@import './components/_footer.css' layer(components); @import './components/_grid-group.css' layer(components); @import './components/_grid-stack.css' layer(components); -@import './components/_header.css' layer(components); @import './components/_hidden.css' layer(components); +@import './components/_htmx-indicator.css' layer(components); @import './components/_icon-inline.css' layer(components); @import './components/_language-selector.css' layer(components); @import './components/_list-straight-left.css' layer(components); diff --git a/assets/js/codeblocks.js b/assets/js/codeblocks.js index 6939b02..ba4f2b0 100644 --- a/assets/js/codeblocks.js +++ b/assets/js/codeblocks.js @@ -16,7 +16,6 @@ copybuttons.forEach(function (button) { button.addEventListener('click', function (e) { const codeblock = e.target.parentElement; - const codeid = e.target.dataset.codebutton; const codesnippet = codeblock.querySelector('[data-codetext]').getAttribute('content'); const codearea = codeblock.querySelector('pre'); codearea.classList.add('flash-item'); diff --git a/assets/libs/jquery.min.js b/assets/libs/jquery.min.js deleted file mode 100644 index 7f37b5d..0000000 --- a/assets/libs/jquery.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jQuery v3.7.1 | (c) OpenJS Foundation and other contributors | jquery.org/license */ -!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(ie,e){"use strict";var oe=[],r=Object.getPrototypeOf,ae=oe.slice,g=oe.flat?function(e){return oe.flat.call(e)}:function(e){return oe.concat.apply([],e)},s=oe.push,se=oe.indexOf,n={},i=n.toString,ue=n.hasOwnProperty,o=ue.toString,a=o.call(Object),le={},v=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},y=function(e){return null!=e&&e===e.window},C=ie.document,u={type:!0,src:!0,nonce:!0,noModule:!0};function m(e,t,n){var r,i,o=(n=n||C).createElement("script");if(o.text=e,t)for(r in u)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[i.call(e)]||"object":typeof e}var t="3.7.1",l=/HTML$/i,ce=function(e,t){return new ce.fn.init(e,t)};function c(e){var t=!!e&&"length"in e&&e.length,n=x(e);return!v(e)&&!y(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+ge+")"+ge+"*"),x=new RegExp(ge+"|>"),j=new RegExp(g),A=new RegExp("^"+t+"$"),D={ID:new RegExp("^#("+t+")"),CLASS:new RegExp("^\\.("+t+")"),TAG:new RegExp("^("+t+"|[*])"),ATTR:new RegExp("^"+p),PSEUDO:new RegExp("^"+g),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ge+"*(even|odd|(([+-]|)(\\d*)n|)"+ge+"*(?:([+-]|)"+ge+"*(\\d+)|))"+ge+"*\\)|)","i"),bool:new RegExp("^(?:"+f+")$","i"),needsContext:new RegExp("^"+ge+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ge+"*((?:-\\d)?\\d*)"+ge+"*\\)|)(?=[^-]|$)","i")},N=/^(?:input|select|textarea|button)$/i,q=/^h\d$/i,L=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,H=/[+~]/,O=new RegExp("\\\\[\\da-fA-F]{1,6}"+ge+"?|\\\\([^\\r\\n\\f])","g"),P=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},M=function(){V()},R=J(function(e){return!0===e.disabled&&fe(e,"fieldset")},{dir:"parentNode",next:"legend"});try{k.apply(oe=ae.call(ye.childNodes),ye.childNodes),oe[ye.childNodes.length].nodeType}catch(e){k={apply:function(e,t){me.apply(e,ae.call(t))},call:function(e){me.apply(e,ae.call(arguments,1))}}}function I(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(V(e),e=e||T,C)){if(11!==p&&(u=L.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return k.call(n,a),n}else if(f&&(a=f.getElementById(i))&&I.contains(e,a)&&a.id===i)return k.call(n,a),n}else{if(u[2])return k.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&e.getElementsByClassName)return k.apply(n,e.getElementsByClassName(i)),n}if(!(h[t+" "]||d&&d.test(t))){if(c=t,f=e,1===p&&(x.test(t)||m.test(t))){(f=H.test(t)&&U(e.parentNode)||e)==e&&le.scope||((s=e.getAttribute("id"))?s=ce.escapeSelector(s):e.setAttribute("id",s=S)),o=(l=Y(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+Q(l[o]);c=l.join(",")}try{return k.apply(n,f.querySelectorAll(c)),n}catch(e){h(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return re(t.replace(ve,"$1"),e,n,r)}function W(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function F(e){return e[S]=!0,e}function $(e){var t=T.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function B(t){return function(e){return fe(e,"input")&&e.type===t}}function _(t){return function(e){return(fe(e,"input")||fe(e,"button"))&&e.type===t}}function z(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&R(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function X(a){return F(function(o){return o=+o,F(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function U(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function V(e){var t,n=e?e.ownerDocument||e:ye;return n!=T&&9===n.nodeType&&n.documentElement&&(r=(T=n).documentElement,C=!ce.isXMLDoc(T),i=r.matches||r.webkitMatchesSelector||r.msMatchesSelector,r.msMatchesSelector&&ye!=T&&(t=T.defaultView)&&t.top!==t&&t.addEventListener("unload",M),le.getById=$(function(e){return r.appendChild(e).id=ce.expando,!T.getElementsByName||!T.getElementsByName(ce.expando).length}),le.disconnectedMatch=$(function(e){return i.call(e,"*")}),le.scope=$(function(){return T.querySelectorAll(":scope")}),le.cssHas=$(function(){try{return T.querySelector(":has(*,:jqfake)"),!1}catch(e){return!0}}),le.getById?(b.filter.ID=function(e){var t=e.replace(O,P);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(O,P);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):t.querySelectorAll(e)},b.find.CLASS=function(e,t){if("undefined"!=typeof t.getElementsByClassName&&C)return t.getElementsByClassName(e)},d=[],$(function(e){var t;r.appendChild(e).innerHTML="",e.querySelectorAll("[selected]").length||d.push("\\["+ge+"*(?:value|"+f+")"),e.querySelectorAll("[id~="+S+"-]").length||d.push("~="),e.querySelectorAll("a#"+S+"+*").length||d.push(".#.+[+~]"),e.querySelectorAll(":checked").length||d.push(":checked"),(t=T.createElement("input")).setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),r.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&d.push(":enabled",":disabled"),(t=T.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||d.push("\\["+ge+"*name"+ge+"*="+ge+"*(?:''|\"\")")}),le.cssHas||d.push(":has"),d=d.length&&new RegExp(d.join("|")),l=function(e,t){if(e===t)return a=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!le.sortDetached&&t.compareDocumentPosition(e)===n?e===T||e.ownerDocument==ye&&I.contains(ye,e)?-1:t===T||t.ownerDocument==ye&&I.contains(ye,t)?1:o?se.call(o,e)-se.call(o,t):0:4&n?-1:1)}),T}for(e in I.matches=function(e,t){return I(e,null,null,t)},I.matchesSelector=function(e,t){if(V(e),C&&!h[t+" "]&&(!d||!d.test(t)))try{var n=i.call(e,t);if(n||le.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){h(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(O,P),e[3]=(e[3]||e[4]||e[5]||"").replace(O,P),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||I.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&I.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return D.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&j.test(n)&&(t=Y(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(O,P).toLowerCase();return"*"===e?function(){return!0}:function(e){return fe(e,t)}},CLASS:function(e){var t=s[e+" "];return t||(t=new RegExp("(^|"+ge+")"+e+"("+ge+"|$)"))&&s(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=I.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function T(e,n,r){return v(n)?ce.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?ce.grep(e,function(e){return e===n!==r}):"string"!=typeof n?ce.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(ce.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||k,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:S.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof ce?t[0]:t,ce.merge(this,ce.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:C,!0)),w.test(r[1])&&ce.isPlainObject(t))for(r in t)v(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=C.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):v(e)?void 0!==n.ready?n.ready(e):e(ce):ce.makeArray(e,this)}).prototype=ce.fn,k=ce(C);var E=/^(?:parents|prev(?:Until|All))/,j={children:!0,contents:!0,next:!0,prev:!0};function A(e,t){while((e=e[t])&&1!==e.nodeType);return e}ce.fn.extend({has:function(e){var t=ce(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,Ce=/^$|^module$|\/(?:java|ecma)script/i;xe=C.createDocumentFragment().appendChild(C.createElement("div")),(be=C.createElement("input")).setAttribute("type","radio"),be.setAttribute("checked","checked"),be.setAttribute("name","t"),xe.appendChild(be),le.checkClone=xe.cloneNode(!0).cloneNode(!0).lastChild.checked,xe.innerHTML="",le.noCloneChecked=!!xe.cloneNode(!0).lastChild.defaultValue,xe.innerHTML="",le.option=!!xe.lastChild;var ke={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function Se(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&fe(e,t)?ce.merge([e],n):n}function Ee(e,t){for(var n=0,r=e.length;n",""]);var je=/<|&#?\w+;/;function Ae(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function Re(e,t){return fe(e,"table")&&fe(11!==t.nodeType?t:t.firstChild,"tr")&&ce(e).children("tbody")[0]||e}function Ie(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function We(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Fe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(_.hasData(e)&&(s=_.get(e).events))for(i in _.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),C.head.appendChild(r[0])},abort:function(){i&&i()}}});var Jt,Kt=[],Zt=/(=)\?(?=&|$)|\?\?/;ce.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Kt.pop()||ce.expando+"_"+jt.guid++;return this[e]=!0,e}}),ce.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Zt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Zt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=v(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Zt,"$1"+r):!1!==e.jsonp&&(e.url+=(At.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||ce.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=ie[r],ie[r]=function(){o=arguments},n.always(function(){void 0===i?ce(ie).removeProp(r):ie[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Kt.push(r)),o&&v(i)&&i(o[0]),o=i=void 0}),"script"}),le.createHTMLDocument=((Jt=C.implementation.createHTMLDocument("").body).innerHTML="
",2===Jt.childNodes.length),ce.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(le.createHTMLDocument?((r=(t=C.implementation.createHTMLDocument("")).createElement("base")).href=C.location.href,t.head.appendChild(r)):t=C),o=!n&&[],(i=w.exec(e))?[t.createElement(i[1])]:(i=Ae([e],t,o),o&&o.length&&ce(o).remove(),ce.merge([],i.childNodes)));var r,i,o},ce.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(ce.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},ce.expr.pseudos.animated=function(t){return ce.grep(ce.timers,function(e){return t===e.elem}).length},ce.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=ce.css(e,"position"),c=ce(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=ce.css(e,"top"),u=ce.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),v(t)&&(t=t.call(e,n,ce.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},ce.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){ce.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===ce.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===ce.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=ce(e).offset()).top+=ce.css(e,"borderTopWidth",!0),i.left+=ce.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-ce.css(r,"marginTop",!0),left:t.left-i.left-ce.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===ce.css(e,"position"))e=e.offsetParent;return e||J})}}),ce.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;ce.fn[t]=function(e){return M(this,function(e,t,n){var r;if(y(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),ce.each(["top","left"],function(e,n){ce.cssHooks[n]=Ye(le.pixelPosition,function(e,t){if(t)return t=Ge(e,n),_e.test(t)?ce(e).position()[n]+"px":t})}),ce.each({Height:"height",Width:"width"},function(a,s){ce.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){ce.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return M(this,function(e,t,n){var r;return y(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?ce.css(e,t,i):ce.style(e,t,n,i)},s,n?e:void 0,n)}})}),ce.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){ce.fn[t]=function(e){return this.on(t,e)}}),ce.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.on("mouseenter",e).on("mouseleave",t||e)}}),ce.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){ce.fn[n]=function(e,t){return 0+~]|"+ge+")"+ge+"*"),b=new RegExp(ge+"|>"),A=new RegExp(g),D=new RegExp("^"+t+"$"),N={ID:new RegExp("^#("+t+")"),CLASS:new RegExp("^\\.("+t+")"),TAG:new RegExp("^("+t+"|[*])"),ATTR:new RegExp("^"+d),PSEUDO:new RegExp("^"+g),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ge+"*(even|odd|(([+-]|)(\\d*)n|)"+ge+"*(?:([+-]|)"+ge+"*(\\d+)|))"+ge+"*\\)|)","i"),bool:new RegExp("^(?:"+f+")$","i"),needsContext:new RegExp("^"+ge+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ge+"*((?:-\\d)?\\d*)"+ge+"*\\)|)(?=[^-]|$)","i")},L=/^(?:input|select|textarea|button)$/i,j=/^h\d$/i,O=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,P=/[+~]/,H=new RegExp("\\\\[\\da-fA-F]{1,6}"+ge+"?|\\\\([^\\r\\n\\f])","g"),q=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},R=function(){V()},M=K(function(e){return!0===e.disabled&&fe(e,"fieldset")},{dir:"parentNode",next:"legend"});try{E.apply(oe=ae.call(ye.childNodes),ye.childNodes),oe[ye.childNodes.length].nodeType}catch(e){E={apply:function(e,t){me.apply(e,ae.call(t))},call:function(e){me.apply(e,ae.call(arguments,1))}}}function I(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,d=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==d&&9!==d&&11!==d)return n;if(!r&&(V(e),e=e||C,T)){if(11!==d&&(u=O.exec(t)))if(i=u[1]){if(9===d){if(!(a=e.getElementById(i)))return n;if(a.id===i)return E.call(n,a),n}else if(f&&(a=f.getElementById(i))&&I.contains(e,a)&&a.id===i)return E.call(n,a),n}else{if(u[2])return E.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&e.getElementsByClassName)return E.apply(n,e.getElementsByClassName(i)),n}if(!(h[t+" "]||p&&p.test(t))){if(c=t,f=e,1===d&&(b.test(t)||m.test(t))){(f=P.test(t)&&X(e.parentNode)||e)==e&&le.scope||((s=e.getAttribute("id"))?s=ce.escapeSelector(s):e.setAttribute("id",s=k)),o=(l=Y(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+G(l[o]);c=l.join(",")}try{return E.apply(n,f.querySelectorAll(c)),n}catch(e){h(t,!0)}finally{s===k&&e.removeAttribute("id")}}}return re(t.replace(ve,"$1"),e,n,r)}function W(){var r=[];return function e(t,n){return r.push(t+" ")>x.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function B(e){return e[k]=!0,e}function F(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function $(t){return function(e){return fe(e,"input")&&e.type===t}}function _(t){return function(e){return(fe(e,"input")||fe(e,"button"))&&e.type===t}}function z(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&M(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function U(a){return B(function(o){return o=+o,B(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function X(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function V(e){var t,n=e?e.ownerDocument||e:ye;return n!=C&&9===n.nodeType&&n.documentElement&&(r=(C=n).documentElement,T=!ce.isXMLDoc(C),i=r.matches||r.webkitMatchesSelector||r.msMatchesSelector,r.msMatchesSelector&&ye!=C&&(t=C.defaultView)&&t.top!==t&&t.addEventListener("unload",R),le.getById=F(function(e){return r.appendChild(e).id=ce.expando,!C.getElementsByName||!C.getElementsByName(ce.expando).length}),le.disconnectedMatch=F(function(e){return i.call(e,"*")}),le.scope=F(function(){return C.querySelectorAll(":scope")}),le.cssHas=F(function(){try{return C.querySelector(":has(*,:jqfake)"),!1}catch(e){return!0}}),le.getById?(x.filter.ID=function(e){var t=e.replace(H,q);return function(e){return e.getAttribute("id")===t}},x.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&T){var n=t.getElementById(e);return n?[n]:[]}}):(x.filter.ID=function(e){var n=e.replace(H,q);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},x.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&T){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),x.find.TAG=function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):t.querySelectorAll(e)},x.find.CLASS=function(e,t){if("undefined"!=typeof t.getElementsByClassName&&T)return t.getElementsByClassName(e)},p=[],F(function(e){var t;r.appendChild(e).innerHTML="",e.querySelectorAll("[selected]").length||p.push("\\["+ge+"*(?:value|"+f+")"),e.querySelectorAll("[id~="+k+"-]").length||p.push("~="),e.querySelectorAll("a#"+k+"+*").length||p.push(".#.+[+~]"),e.querySelectorAll(":checked").length||p.push(":checked"),(t=C.createElement("input")).setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),r.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&p.push(":enabled",":disabled"),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||p.push("\\["+ge+"*name"+ge+"*="+ge+"*(?:''|\"\")")}),le.cssHas||p.push(":has"),p=p.length&&new RegExp(p.join("|")),l=function(e,t){if(e===t)return a=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!le.sortDetached&&t.compareDocumentPosition(e)===n?e===C||e.ownerDocument==ye&&I.contains(ye,e)?-1:t===C||t.ownerDocument==ye&&I.contains(ye,t)?1:o?se.call(o,e)-se.call(o,t):0:4&n?-1:1)}),C}for(e in I.matches=function(e,t){return I(e,null,null,t)},I.matchesSelector=function(e,t){if(V(e),T&&!h[t+" "]&&(!p||!p.test(t)))try{var n=i.call(e,t);if(n||le.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){h(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(H,q),e[3]=(e[3]||e[4]||e[5]||"").replace(H,q),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||I.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&I.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return N.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&A.test(n)&&(t=Y(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(H,q).toLowerCase();return"*"===e?function(){return!0}:function(e){return fe(e,t)}},CLASS:function(e){var t=s[e+" "];return t||(t=new RegExp("(^|"+ge+")"+e+"("+ge+"|$)"))&&s(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=I.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function T(e,n,r){return v(n)?ce.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?ce.grep(e,function(e){return e===n!==r}):"string"!=typeof n?ce.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(ce.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||E,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:k.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof ce?t[0]:t,ce.merge(this,ce.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:m,!0)),C.test(r[1])&&ce.isPlainObject(t))for(r in t)v(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=m.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):v(e)?void 0!==n.ready?n.ready(e):e(ce):ce.makeArray(e,this)}).prototype=ce.fn,E=ce(m);var S=/^(?:parents|prev(?:Until|All))/,A={children:!0,contents:!0,next:!0,prev:!0};function D(e,t){while((e=e[t])&&1!==e.nodeType);return e}ce.fn.extend({has:function(e){var t=ce(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,Ce=/^$|^module$|\/(?:java|ecma)script/i;re=m.createDocumentFragment().appendChild(m.createElement("div")),(be=m.createElement("input")).setAttribute("type","radio"),be.setAttribute("checked","checked"),be.setAttribute("name","t"),re.appendChild(be),le.checkClone=re.cloneNode(!0).cloneNode(!0).lastChild.checked,re.innerHTML="",le.noCloneChecked=!!re.cloneNode(!0).lastChild.defaultValue,re.innerHTML="",le.option=!!re.lastChild;var Te={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function Ee(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&fe(e,t)?ce.merge([e],n):n}function ke(e,t){for(var n=0,r=e.length;n",""]);var Se=/<|&#?\w+;/;function Ae(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),d=[],p=0,h=e.length;p\s*$/g;function Re(e,t){return fe(e,"table")&&fe(11!==t.nodeType?t:t.firstChild,"tr")&&ce(e).children("tbody")[0]||e}function Me(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Ie(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function We(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(_.hasData(e)&&(s=_.get(e).events))for(i in _.remove(t,"handle events"),s)for(n=0,r=s[i].length;n
",2===yt.childNodes.length),ce.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(le.createHTMLDocument?((r=(t=m.implementation.createHTMLDocument("")).createElement("base")).href=m.location.href,t.head.appendChild(r)):t=m),o=!n&&[],(i=C.exec(e))?[t.createElement(i[1])]:(i=Ae([e],t,o),o&&o.length&&ce(o).remove(),ce.merge([],i.childNodes)));var r,i,o},ce.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=ce.css(e,"position"),c=ce(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=ce.css(e,"top"),u=ce.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),v(t)&&(t=t.call(e,n,ce.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},ce.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){ce.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===ce.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===ce.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=ce(e).offset()).top+=ce.css(e,"borderTopWidth",!0),i.left+=ce.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-ce.css(r,"marginTop",!0),left:t.left-i.left-ce.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===ce.css(e,"position"))e=e.offsetParent;return e||K})}}),ce.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;ce.fn[t]=function(e){return R(this,function(e,t,n){var r;if(y(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),ce.each(["top","left"],function(e,n){ce.cssHooks[n]=Qe(le.pixelPosition,function(e,t){if(t)return t=Ve(e,n),$e.test(t)?ce(e).position()[n]+"px":t})}),ce.each({Height:"height",Width:"width"},function(a,s){ce.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){ce.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return R(this,function(e,t,n){var r;return y(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?ce.css(e,t,i):ce.style(e,t,n,i)},s,n?e:void 0,n)}})}),ce.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.on("mouseenter",e).on("mouseleave",t||e)}}),ce.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){ce.fn[n]=function(e,t){return 0 ]/.test(t)?u(document.createElement("table")).html(t).children().children().nodes:/^\s* ]/.test(t)?u(document.createElement("table")).html(t).children().children().children().nodes:/^\s* {{ end -}} -{{ if $.Param "jquery" -}} -{{ $jquery := resources.Get "libs/jquery.slim.min.js" | fingerprint -}} - -{{ end -}} - -{{ if $.Param "umbrella" -}} -{{ $umbrella := resources.Get "libs/umbrella.min.js" | fingerprint -}} - -{{ end -}} - {{ if $.Param "mobilemenu" -}} {{ $mobilemenu := resources.Get "js/mobilemenu.js" | js.Build $opts | fingerprint -}} diff --git a/layouts/_partials/mobilemenu.html b/layouts/_partials/mobilemenu.html index af75110..239dd73 100644 --- a/layouts/_partials/mobilemenu.html +++ b/layouts/_partials/mobilemenu.html @@ -8,7 +8,7 @@ -