From dc43c51b0df43294e017f17be71649314ed0d349 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Sun, 25 Jun 2023 02:27:07 -0400 Subject: [PATCH 01/35] fix(a11y): Change the look and behavior of some file upload fields --- src/assets/css/main.css | 9 ++ .../components/common/image-upload-form.tsx | 50 +++---- src/shared/components/home/emojis-form.tsx | 51 +++---- src/shared/components/home/site-form.tsx | 38 ++--- src/shared/components/post/post-form.tsx | 135 +++++++++--------- 5 files changed, 146 insertions(+), 137 deletions(-) diff --git a/src/assets/css/main.css b/src/assets/css/main.css index cb4a8b81..dde2a503 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -88,6 +88,15 @@ color: var(--bs-gray) !important; } +input[type="file"]::file-selector-button { + font: inherit; + border: 0; + padding: 0.375em 0.75em; + border-radius: var(--bs-border-radius); + background-color: var(--bs-secondary); + color: var(--bs-white); +} + .icon { display: inline-grid; display: inline-flex; diff --git a/src/shared/components/common/image-upload-form.tsx b/src/shared/components/common/image-upload-form.tsx index e8005ccc..107949f6 100644 --- a/src/shared/components/common/image-upload-form.tsx +++ b/src/shared/components/common/image-upload-form.tsx @@ -33,38 +33,34 @@ export class ImageUploadForm extends Component< render() { return (
- + {this.props.imageSrc && ( + + {/* TODO: Create "Current Iamge" translation for alt text */} + + + + )} diff --git a/src/shared/components/home/emojis-form.tsx b/src/shared/components/home/emojis-form.tsx index caf8221c..930bd55c 100644 --- a/src/shared/components/home/emojis-form.tsx +++ b/src/shared/components/home/emojis-form.tsx @@ -87,7 +87,10 @@ export class EmojiForm extends Component { )}
- +
@@ -129,30 +132,30 @@ export class EmojiForm extends Component { /> )} {cv.image_url.length === 0 && ( - - - + /> + )} diff --git a/src/shared/components/person/cake-day.tsx b/src/shared/components/person/cake-day.tsx index ddb12bea..3eeaf75e 100644 --- a/src/shared/components/person/cake-day.tsx +++ b/src/shared/components/person/cake-day.tsx @@ -10,7 +10,7 @@ export class CakeDay extends Component { render() { return (
diff --git a/src/shared/components/person/profile.tsx b/src/shared/components/person/profile.tsx index 70bada82..714b6bed 100644 --- a/src/shared/components/person/profile.tsx +++ b/src/shared/components/person/profile.tsx @@ -647,12 +647,12 @@ export class Profile extends Component< value={this.state.banReason} onInput={linkEvent(this, this.handleModBanReasonChange)} /> -
From 308785b4722567cc595d28a2aa8548b119116e10 Mon Sep 17 00:00:00 2001 From: SleeplessOne1917 Date: Sun, 25 Jun 2023 15:20:06 -0400 Subject: [PATCH 11/35] Only give child comments colored borders --- src/shared/components/comment/comment-nodes.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/shared/components/comment/comment-nodes.tsx b/src/shared/components/comment/comment-nodes.tsx index 02e621b7..495b6bbc 100644 --- a/src/shared/components/comment/comment-nodes.tsx +++ b/src/shared/components/comment/comment-nodes.tsx @@ -79,7 +79,7 @@ export class CommentNodes extends Component { const maxComments = this.props.maxCommentsShown ?? this.props.nodes.length; const borderColor = this.props.depth - ? colorList[this.props.depth % colorList.length] + ? colorList[(this.props.depth - 1) % colorList.length] : colorList[0]; return ( @@ -89,7 +89,11 @@ export class CommentNodes extends Component { "ms-1": !!this.props.isChild, "border-top border-light": !this.props.noBorder, })} - style={`border-left: 2px solid ${borderColor} !important;`} + style={ + this.props.isChild + ? `border-left: 2px solid ${borderColor} !important;` + : undefined + } > {this.props.nodes.slice(0, maxComments).map(node => ( Date: Mon, 26 Jun 2023 10:37:21 -0400 Subject: [PATCH 12/35] chore(DX): Add prettier to eslint config for use with editors --- .eslintrc.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.eslintrc.json b/.eslintrc.json index 81257cb3..ad777401 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -3,7 +3,7 @@ "env": { "browser": true }, - "plugins": ["@typescript-eslint", "jsx-a11y"], + "plugins": ["@typescript-eslint", "jsx-a11y", "prettier"], "extends": [ "eslint:recommended", "plugin:@typescript-eslint/recommended", @@ -41,6 +41,7 @@ "no-var": 0, "prefer-const": 1, "prefer-rest-params": 0, + "prettier/prettier": "error", "quote-props": 0, "unicorn/filename-case": 0 } From cf10bd64ad8fb19090f715c09af6b8e59fee9a38 Mon Sep 17 00:00:00 2001 From: Anansi <72401951+0xAnansi@users.noreply.github.com> Date: Mon, 26 Jun 2023 20:51:04 +0200 Subject: [PATCH 13/35] Fix: missing semantic css classes and html elements (#1583) * Fix: missing semantic css classes and html elements. Now all pages have a main and aside element when a sidebar is present to facilitate custom theming. This does not impact the default behavior of the front. * Fix: re-added communityref on main element --------- Co-authored-by: 0xAnansi <0xAnansi@omageni.com> Co-authored-by: Jay Sitter Co-authored-by: Dessalines --- src/shared/components/app/app.tsx | 4 ++-- src/shared/components/community/community.tsx | 14 +++++++------- src/shared/components/post/post.tsx | 8 +++++--- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/shared/components/app/app.tsx b/src/shared/components/app/app.tsx index 08ba40e8..be0319db 100644 --- a/src/shared/components/app/app.tsx +++ b/src/shared/components/app/app.tsx @@ -59,7 +59,7 @@ export class App extends Component { return ( -
+
{RouteComponent && (isAuthPath(path ?? "") ? ( @@ -68,7 +68,7 @@ export class App extends Component { ) : ( ))} -
+ ); }} diff --git a/src/shared/components/community/community.tsx b/src/shared/components/community/community.tsx index 111b47cd..a18153f5 100644 --- a/src/shared/components/community/community.tsx +++ b/src/shared/components/community/community.tsx @@ -22,7 +22,7 @@ import { } from "@utils/helpers"; import type { QueryParams } from "@utils/types"; import { RouteDataResponse } from "@utils/types"; -import { Component, linkEvent } from "inferno"; +import { Component, RefObject, createRef, linkEvent } from "inferno"; import { RouteComponentProps } from "inferno-router/dist/Route"; import { AddAdmin, @@ -154,7 +154,7 @@ export class Community extends Component< finished: new Map(), isIsomorphic: false, }; - + private readonly mainContentRef: RefObject; constructor(props: RouteComponentProps<{ name: string }>, context: any) { super(props, context); @@ -195,7 +195,7 @@ export class Community extends Component< this.handleSavePost = this.handleSavePost.bind(this); this.handlePurgePost = this.handlePurgePost.bind(this); this.handleFeaturePost = this.handleFeaturePost.bind(this); - + this.mainContentRef = createRef(); // Only fetch the data if coming from another route if (FirstLoadService.isFirstLoad) { const { communityRes, commentsRes, postsRes } = this.isoData.routeData; @@ -317,7 +317,7 @@ export class Community extends Component< />
-
+
{this.communityInfo(res)}
-
+
+
+
); diff --git a/src/shared/components/post/post.tsx b/src/shared/components/post/post.tsx index f0aa3ff5..1aaf50d5 100644 --- a/src/shared/components/post/post.tsx +++ b/src/shared/components/post/post.tsx @@ -348,7 +348,7 @@ export class Post extends Component { const res = this.state.postRes.data; return (
-
+
{ this.commentsTree()} {this.state.commentViewType == CommentViewType.Flat && this.commentsFlat()} -
-
{this.sidebar()}
+ +
); } From f5be909d64c924910fafcf27fa56cfdabe3f0d37 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Mon, 26 Jun 2023 14:53:37 -0400 Subject: [PATCH 14/35] feat(UI): Reduce base font size (#1591) * feat: Reduce base font size * chore: Build themes --------- Co-authored-by: SleeplessOne1917 Co-authored-by: Dessalines --- src/assets/css/themes/_variables.darkly.scss | 1 - src/assets/css/themes/_variables.scss | 1 + src/assets/css/themes/darkly-compact.css | 432 +++++------------ src/assets/css/themes/darkly-red.css | 82 ++-- src/assets/css/themes/darkly.css | 82 ++-- src/assets/css/themes/litely-compact.css | 474 ++++++------------- src/assets/css/themes/litely-red.css | 124 ++--- src/assets/css/themes/litely.css | 124 ++--- 8 files changed, 488 insertions(+), 832 deletions(-) diff --git a/src/assets/css/themes/_variables.darkly.scss b/src/assets/css/themes/_variables.darkly.scss index 48556fe1..e0762a95 100644 --- a/src/assets/css/themes/_variables.darkly.scss +++ b/src/assets/css/themes/_variables.darkly.scss @@ -32,7 +32,6 @@ $yiq-contrasted-threshold: 175; $font-family-sans-serif: "Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; -$font-size-base: 0.9375rem; $h1-font-size: 3rem; $h2-font-size: 2.5rem; $h3-font-size: 2rem; diff --git a/src/assets/css/themes/_variables.scss b/src/assets/css/themes/_variables.scss index e7d7dae8..5b07cf52 100644 --- a/src/assets/css/themes/_variables.scss +++ b/src/assets/css/themes/_variables.scss @@ -1,5 +1,6 @@ $link-decoration: none; $min-contrast-ratio: 3; +$font-size-base: 0.875rem; $container-max-widths: ( lg: 1140px, diff --git a/src/assets/css/themes/darkly-compact.css b/src/assets/css/themes/darkly-compact.css index 38274dce..3b422edb 100644 --- a/src/assets/css/themes/darkly-compact.css +++ b/src/assets/css/themes/darkly-compact.css @@ -115,7 +115,7 @@ hr.my-3 { --bs-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; --bs-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0)); --bs-body-font-family: var(--bs-font-sans-serif); - --bs-body-font-size: 0.9375rem; + --bs-body-font-size: 0.875rem; --bs-body-font-weight: 400; --bs-body-line-height: 1.5; --bs-body-color: #dee2e6; @@ -287,20 +287,20 @@ h3, .h3 { } h4, .h4 { - font-size: calc(1.265625rem + 0.1875vw); + font-size: calc(1.25625rem + 0.075vw); } @media (min-width: 1200px) { h4, .h4 { - font-size: 1.40625rem; + font-size: 1.3125rem; } } h5, .h5 { - font-size: 1.171875rem; + font-size: 1.09375rem; } h6, .h6 { - font-size: 0.9375rem; + font-size: 0.875rem; } p { @@ -309,11 +309,9 @@ p { } abbr[title] { - -webkit-text-decoration: underline dotted; - text-decoration: underline dotted; + text-decoration: underline dotted; cursor: help; - -webkit-text-decoration-skip-ink: none; - text-decoration-skip-ink: none; + text-decoration-skip-ink: none; } address { @@ -628,7 +626,7 @@ progress { } .lead { - font-size: 1.171875rem; + font-size: 1.09375rem; font-weight: 300; } @@ -722,7 +720,7 @@ progress { .blockquote { margin-bottom: 1rem; - font-size: 1.171875rem; + font-size: 1.09375rem; } .blockquote > :last-child { margin-bottom: 0; @@ -2105,13 +2103,13 @@ progress { .col-form-label-lg { padding-top: calc(0.5rem + var(--bs-border-width)); padding-bottom: calc(0.5rem + var(--bs-border-width)); - font-size: 1.171875rem; + font-size: 1.09375rem; } .col-form-label-sm { padding-top: calc(0.25rem + var(--bs-border-width)); padding-bottom: calc(0.25rem + var(--bs-border-width)); - font-size: 0.8203125rem; + font-size: 0.765625rem; } .form-text { @@ -2124,16 +2122,14 @@ progress { display: block; width: 100%; padding: 0.375rem 0.75rem; - font-size: 0.9375rem; + font-size: 0.875rem; font-weight: 400; line-height: 1.5; color: #fff; background-color: #444; background-clip: padding-box; border: var(--bs-border-width) solid #222; - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; + appearance: none; border-radius: var(--bs-border-radius); transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; } @@ -2164,10 +2160,6 @@ progress { display: block; padding: 0; } -.form-control::-moz-placeholder { - color: var(--bs-secondary-color); - opacity: 1; -} .form-control::placeholder { color: var(--bs-secondary-color); opacity: 1; @@ -2179,8 +2171,7 @@ progress { .form-control::file-selector-button { padding: 0.375rem 0.75rem; margin: -0.375rem -0.75rem; - -webkit-margin-end: 0.75rem; - margin-inline-end: 0.75rem; + margin-inline-end: 0.75rem; color: #fff; background-color: var(--bs-tertiary-bg); pointer-events: none; @@ -2222,27 +2213,25 @@ progress { .form-control-sm { min-height: calc(1.5em + 0.5rem + calc(var(--bs-border-width) * 2)); padding: 0.25rem 0.5rem; - font-size: 0.8203125rem; + font-size: 0.765625rem; border-radius: var(--bs-border-radius-sm); } .form-control-sm::file-selector-button { padding: 0.25rem 0.5rem; margin: -0.25rem -0.5rem; - -webkit-margin-end: 0.5rem; - margin-inline-end: 0.5rem; + margin-inline-end: 0.5rem; } .form-control-lg { min-height: calc(1.5em + 1rem + calc(var(--bs-border-width) * 2)); padding: 0.5rem 1rem; - font-size: 1.171875rem; + font-size: 1.09375rem; border-radius: var(--bs-border-radius-lg); } .form-control-lg::file-selector-button { padding: 0.5rem 1rem; margin: -0.5rem -1rem; - -webkit-margin-end: 1rem; - margin-inline-end: 1rem; + margin-inline-end: 1rem; } textarea.form-control { @@ -2283,7 +2272,7 @@ textarea.form-control-lg { display: block; width: 100%; padding: 0.375rem 2.25rem 0.375rem 0.75rem; - font-size: 0.9375rem; + font-size: 0.875rem; font-weight: 400; line-height: 1.5; color: #fff; @@ -2295,9 +2284,7 @@ textarea.form-control-lg { border: var(--bs-border-width) solid #222; border-radius: var(--bs-border-radius); transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; + appearance: none; } @media (prefers-reduced-motion: reduce) { .form-select { @@ -2325,7 +2312,7 @@ textarea.form-control-lg { padding-top: 0.25rem; padding-bottom: 0.25rem; padding-left: 0.5rem; - font-size: 0.8203125rem; + font-size: 0.765625rem; border-radius: var(--bs-border-radius-sm); } @@ -2333,7 +2320,7 @@ textarea.form-control-lg { padding-top: 0.5rem; padding-bottom: 0.5rem; padding-left: 1rem; - font-size: 1.171875rem; + font-size: 1.09375rem; border-radius: var(--bs-border-radius-lg); } @@ -2343,7 +2330,7 @@ textarea.form-control-lg { .form-check { display: block; - min-height: 1.40625rem; + min-height: 1.3125rem; padding-left: 1.5em; margin-bottom: 0.125rem; } @@ -2375,11 +2362,8 @@ textarea.form-control-lg { background-position: center; background-size: contain; border: var(--bs-border-width) solid var(--bs-border-color); - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; - -webkit-print-color-adjust: exact; - print-color-adjust: exact; + appearance: none; + print-color-adjust: exact; } .form-check-input[type=checkbox] { border-radius: 0.25em; @@ -2478,9 +2462,7 @@ textarea.form-control-lg { height: 1.5rem; padding: 0; background-color: transparent; - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; + appearance: none; } .form-range:focus { outline: 0; @@ -2501,14 +2483,11 @@ textarea.form-control-lg { background-color: #00bc8c; border: 0; border-radius: 1rem; - -webkit-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; - -webkit-appearance: none; - appearance: none; + appearance: none; } @media (prefers-reduced-motion: reduce) { .form-range::-webkit-slider-thumb { - -webkit-transition: none; transition: none; } } @@ -2530,14 +2509,11 @@ textarea.form-control-lg { background-color: #00bc8c; border: 0; border-radius: 1rem; - -moz-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; - -moz-appearance: none; - appearance: none; + appearance: none; } @media (prefers-reduced-motion: reduce) { .form-range::-moz-range-thumb { - -moz-transition: none; transition: none; } } @@ -2598,17 +2574,10 @@ textarea.form-control-lg { .form-floating > .form-control-plaintext { padding: 1rem 0.75rem; } -.form-floating > .form-control::-moz-placeholder, .form-floating > .form-control-plaintext::-moz-placeholder { - color: transparent; -} .form-floating > .form-control::placeholder, .form-floating > .form-control-plaintext::placeholder { color: transparent; } -.form-floating > .form-control:not(:-moz-placeholder-shown), .form-floating > .form-control-plaintext:not(:-moz-placeholder-shown) { - padding-top: 1.625rem; - padding-bottom: 0.625rem; -} .form-floating > .form-control:focus, .form-floating > .form-control:not(:placeholder-shown), .form-floating > .form-control-plaintext:focus, .form-floating > .form-control-plaintext:not(:placeholder-shown) { @@ -2624,10 +2593,6 @@ textarea.form-control-lg { padding-top: 1.625rem; padding-bottom: 0.625rem; } -.form-floating > .form-control:not(:-moz-placeholder-shown) ~ label { - color: rgba(var(--bs-body-color-rgb), 0.65); - transform: scale(0.85) translateY(-0.5rem) translateX(0.15rem); -} .form-floating > .form-control:focus ~ label, .form-floating > .form-control:not(:placeholder-shown) ~ label, .form-floating > .form-control-plaintext ~ label, @@ -2635,15 +2600,6 @@ textarea.form-control-lg { color: rgba(var(--bs-body-color-rgb), 0.65); transform: scale(0.85) translateY(-0.5rem) translateX(0.15rem); } -.form-floating > .form-control:not(:-moz-placeholder-shown) ~ label::after { - position: absolute; - inset: 1rem 0.375rem; - z-index: -1; - height: 1.5em; - content: ""; - background-color: #444; - border-radius: var(--bs-border-radius); -} .form-floating > .form-control:focus ~ label::after, .form-floating > .form-control:not(:placeholder-shown) ~ label::after, .form-floating > .form-control-plaintext ~ label::after, @@ -2702,7 +2658,7 @@ textarea.form-control-lg { display: flex; align-items: center; padding: 0.375rem 0.75rem; - font-size: 0.9375rem; + font-size: 0.875rem; font-weight: 400; line-height: 1.5; color: #adb5bd; @@ -2718,7 +2674,7 @@ textarea.form-control-lg { .input-group-lg > .input-group-text, .input-group-lg > .btn { padding: 0.5rem 1rem; - font-size: 1.171875rem; + font-size: 1.09375rem; border-radius: var(--bs-border-radius-lg); } @@ -2727,7 +2683,7 @@ textarea.form-control-lg { .input-group-sm > .input-group-text, .input-group-sm > .btn { padding: 0.25rem 0.5rem; - font-size: 0.8203125rem; + font-size: 0.765625rem; border-radius: var(--bs-border-radius-sm); } @@ -2777,7 +2733,7 @@ textarea.form-control-lg { max-width: 100%; padding: 0.25rem 0.5rem; margin-top: 0.1rem; - font-size: 0.8203125rem; + font-size: 0.765625rem; color: #fff; background-color: var(--bs-success); border-radius: var(--bs-border-radius); @@ -2867,7 +2823,7 @@ textarea.form-control-lg { max-width: 100%; padding: 0.25rem 0.5rem; margin-top: 0.1rem; - font-size: 0.8203125rem; + font-size: 0.765625rem; color: #fff; background-color: var(--bs-danger); border-radius: var(--bs-border-radius); @@ -2945,7 +2901,7 @@ textarea.form-control-lg { --bs-btn-padding-x: 0.75rem; --bs-btn-padding-y: 0.375rem; --bs-btn-font-family: ; - --bs-btn-font-size: 0.9375rem; + --bs-btn-font-size: 0.875rem; --bs-btn-font-weight: 400; --bs-btn-line-height: 1.5; --bs-btn-color: var(--bs-body-color); @@ -2967,9 +2923,7 @@ textarea.form-control-lg { text-align: center; vertical-align: middle; cursor: pointer; - -webkit-user-select: none; - -moz-user-select: none; - user-select: none; + user-select: none; border: var(--bs-btn-border-width) solid var(--bs-btn-border-color); border-radius: var(--bs-btn-border-radius); background-color: var(--bs-btn-bg); @@ -3315,14 +3269,14 @@ textarea.form-control-lg { .btn-lg, .btn-group-lg > .btn { --bs-btn-padding-y: 0.5rem; --bs-btn-padding-x: 1rem; - --bs-btn-font-size: 1.171875rem; + --bs-btn-font-size: 1.09375rem; --bs-btn-border-radius: var(--bs-border-radius-lg); } .btn-sm, .btn-group-sm > .btn { --bs-btn-padding-y: 0.25rem; --bs-btn-padding-x: 0.5rem; - --bs-btn-font-size: 0.8203125rem; + --bs-btn-font-size: 0.765625rem; --bs-btn-border-radius: var(--bs-border-radius-sm); } @@ -3395,7 +3349,7 @@ textarea.form-control-lg { --bs-dropdown-padding-x: 0; --bs-dropdown-padding-y: 0.5rem; --bs-dropdown-spacer: 0.125rem; - --bs-dropdown-font-size: 0.9375rem; + --bs-dropdown-font-size: 0.875rem; --bs-dropdown-color: var(--bs-body-color); --bs-dropdown-bg: #222; --bs-dropdown-border-color: #444; @@ -3653,7 +3607,7 @@ textarea.form-control-lg { display: block; padding: var(--bs-dropdown-header-padding-y) var(--bs-dropdown-header-padding-x); margin-bottom: 0; - font-size: 0.8203125rem; + font-size: 0.765625rem; color: var(--bs-dropdown-header-color); white-space: nowrap; } @@ -3930,15 +3884,15 @@ textarea.form-control-lg { --bs-navbar-hover-color: #fff; --bs-navbar-disabled-color: rgba(var(--bs-emphasis-color-rgb), 0.3); --bs-navbar-active-color: #fff; - --bs-navbar-brand-padding-y: 0.32421875rem; + --bs-navbar-brand-padding-y: 0.3359375rem; --bs-navbar-brand-margin-end: 1rem; - --bs-navbar-brand-font-size: 1.171875rem; + --bs-navbar-brand-font-size: 1.09375rem; --bs-navbar-brand-color: #fff; --bs-navbar-brand-hover-color: #fff; --bs-navbar-nav-link-padding-x: 0.5rem; --bs-navbar-toggler-padding-y: 0.25rem; --bs-navbar-toggler-padding-x: 0.75rem; - --bs-navbar-toggler-font-size: 1.171875rem; + --bs-navbar-toggler-font-size: 1.09375rem; --bs-navbar-toggler-icon-bg: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28222, 226, 230, 0.75%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e"); --bs-navbar-toggler-border-color: rgba(34, 34, 34, 0.1); --bs-navbar-toggler-border-radius: var(--bs-border-radius); @@ -4563,7 +4517,7 @@ textarea.form-control-lg { align-items: center; width: 100%; padding: var(--bs-accordion-btn-padding-y) var(--bs-accordion-btn-padding-x); - font-size: 0.9375rem; + font-size: 0.875rem; color: var(--bs-accordion-btn-color); text-align: left; background-color: var(--bs-accordion-btn-bg); @@ -4707,7 +4661,7 @@ textarea.form-control-lg { .pagination { --bs-pagination-padding-x: 0.75rem; --bs-pagination-padding-y: 0.375rem; - --bs-pagination-font-size: 0.9375rem; + --bs-pagination-font-size: 0.875rem; --bs-pagination-color: #fff; --bs-pagination-bg: #00bc8c; --bs-pagination-border-width: 0; @@ -4786,14 +4740,14 @@ textarea.form-control-lg { .pagination-lg { --bs-pagination-padding-x: 1.5rem; --bs-pagination-padding-y: 0.75rem; - --bs-pagination-font-size: 1.171875rem; + --bs-pagination-font-size: 1.09375rem; --bs-pagination-border-radius: var(--bs-border-radius-lg); } .pagination-sm { --bs-pagination-padding-x: 0.5rem; --bs-pagination-padding-y: 0.25rem; - --bs-pagination-font-size: 0.8203125rem; + --bs-pagination-font-size: 0.765625rem; --bs-pagination-border-radius: var(--bs-border-radius-sm); } @@ -4927,7 +4881,7 @@ textarea.form-control-lg { .progress, .progress-stacked { --bs-progress-height: 1rem; - --bs-progress-font-size: 0.703125rem; + --bs-progress-font-size: 0.65625rem; --bs-progress-bg: #444; --bs-progress-border-radius: var(--bs-border-radius); --bs-progress-box-shadow: var(--bs-box-shadow-inset); @@ -5354,9 +5308,7 @@ textarea.form-control-lg { } .btn-close:disabled, .btn-close.disabled { pointer-events: none; - -webkit-user-select: none; - -moz-user-select: none; - user-select: none; + user-select: none; opacity: var(--bs-btn-close-disabled-opacity); } @@ -5406,7 +5358,6 @@ textarea.form-control-lg { --bs-toast-zindex: 1090; position: absolute; z-index: var(--bs-toast-zindex); - width: -moz-max-content; width: max-content; max-width: 100%; pointer-events: none; @@ -5734,7 +5685,7 @@ textarea.form-control-lg { --bs-tooltip-padding-x: 0.5rem; --bs-tooltip-padding-y: 0.25rem; --bs-tooltip-margin: ; - --bs-tooltip-font-size: 0.8203125rem; + --bs-tooltip-font-size: 0.765625rem; --bs-tooltip-color: var(--bs-body-bg); --bs-tooltip-bg: var(--bs-emphasis-color); --bs-tooltip-border-radius: var(--bs-border-radius); @@ -5833,7 +5784,7 @@ textarea.form-control-lg { .popover { --bs-popover-zindex: 1070; --bs-popover-max-width: 276px; - --bs-popover-font-size: 0.8203125rem; + --bs-popover-font-size: 0.765625rem; --bs-popover-bg: #303030; --bs-popover-border-width: var(--bs-border-width); --bs-popover-border-color: var(--bs-border-color-translucent); @@ -5842,7 +5793,7 @@ textarea.form-control-lg { --bs-popover-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15); --bs-popover-header-padding-x: 1rem; --bs-popover-header-padding-y: 0.5rem; - --bs-popover-header-font-size: 0.9375rem; + --bs-popover-header-font-size: 0.875rem; --bs-popover-header-color: inherit; --bs-popover-header-bg: #444; --bs-popover-body-padding-x: 1rem; @@ -6307,8 +6258,6 @@ textarea.form-control-lg { border-right: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateX(-100%); } -} -@media (max-width: 575.98px) { .offcanvas-sm.offcanvas-end { top: 0; right: 0; @@ -6316,8 +6265,6 @@ textarea.form-control-lg { border-left: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateX(100%); } -} -@media (max-width: 575.98px) { .offcanvas-sm.offcanvas-top { top: 0; right: 0; @@ -6327,8 +6274,6 @@ textarea.form-control-lg { border-bottom: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateY(-100%); } -} -@media (max-width: 575.98px) { .offcanvas-sm.offcanvas-bottom { right: 0; left: 0; @@ -6337,13 +6282,9 @@ textarea.form-control-lg { border-top: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateY(100%); } -} -@media (max-width: 575.98px) { .offcanvas-sm.showing, .offcanvas-sm.show:not(.hiding) { transform: none; } -} -@media (max-width: 575.98px) { .offcanvas-sm.showing, .offcanvas-sm.hiding, .offcanvas-sm.show { visibility: visible; } @@ -6395,8 +6336,6 @@ textarea.form-control-lg { border-right: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateX(-100%); } -} -@media (max-width: 767.98px) { .offcanvas-md.offcanvas-end { top: 0; right: 0; @@ -6404,8 +6343,6 @@ textarea.form-control-lg { border-left: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateX(100%); } -} -@media (max-width: 767.98px) { .offcanvas-md.offcanvas-top { top: 0; right: 0; @@ -6415,8 +6352,6 @@ textarea.form-control-lg { border-bottom: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateY(-100%); } -} -@media (max-width: 767.98px) { .offcanvas-md.offcanvas-bottom { right: 0; left: 0; @@ -6425,13 +6360,9 @@ textarea.form-control-lg { border-top: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateY(100%); } -} -@media (max-width: 767.98px) { .offcanvas-md.showing, .offcanvas-md.show:not(.hiding) { transform: none; } -} -@media (max-width: 767.98px) { .offcanvas-md.showing, .offcanvas-md.hiding, .offcanvas-md.show { visibility: visible; } @@ -6483,8 +6414,6 @@ textarea.form-control-lg { border-right: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateX(-100%); } -} -@media (max-width: 991.98px) { .offcanvas-lg.offcanvas-end { top: 0; right: 0; @@ -6492,8 +6421,6 @@ textarea.form-control-lg { border-left: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateX(100%); } -} -@media (max-width: 991.98px) { .offcanvas-lg.offcanvas-top { top: 0; right: 0; @@ -6503,8 +6430,6 @@ textarea.form-control-lg { border-bottom: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateY(-100%); } -} -@media (max-width: 991.98px) { .offcanvas-lg.offcanvas-bottom { right: 0; left: 0; @@ -6513,13 +6438,9 @@ textarea.form-control-lg { border-top: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateY(100%); } -} -@media (max-width: 991.98px) { .offcanvas-lg.showing, .offcanvas-lg.show:not(.hiding) { transform: none; } -} -@media (max-width: 991.98px) { .offcanvas-lg.showing, .offcanvas-lg.hiding, .offcanvas-lg.show { visibility: visible; } @@ -6571,8 +6492,6 @@ textarea.form-control-lg { border-right: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateX(-100%); } -} -@media (max-width: 1199.98px) { .offcanvas-xl.offcanvas-end { top: 0; right: 0; @@ -6580,8 +6499,6 @@ textarea.form-control-lg { border-left: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateX(100%); } -} -@media (max-width: 1199.98px) { .offcanvas-xl.offcanvas-top { top: 0; right: 0; @@ -6591,8 +6508,6 @@ textarea.form-control-lg { border-bottom: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateY(-100%); } -} -@media (max-width: 1199.98px) { .offcanvas-xl.offcanvas-bottom { right: 0; left: 0; @@ -6601,13 +6516,9 @@ textarea.form-control-lg { border-top: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateY(100%); } -} -@media (max-width: 1199.98px) { .offcanvas-xl.showing, .offcanvas-xl.show:not(.hiding) { transform: none; } -} -@media (max-width: 1199.98px) { .offcanvas-xl.showing, .offcanvas-xl.hiding, .offcanvas-xl.show { visibility: visible; } @@ -6659,8 +6570,6 @@ textarea.form-control-lg { border-right: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateX(-100%); } -} -@media (max-width: 1399.98px) { .offcanvas-xxl.offcanvas-end { top: 0; right: 0; @@ -6668,8 +6577,6 @@ textarea.form-control-lg { border-left: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateX(100%); } -} -@media (max-width: 1399.98px) { .offcanvas-xxl.offcanvas-top { top: 0; right: 0; @@ -6679,8 +6586,6 @@ textarea.form-control-lg { border-bottom: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateY(-100%); } -} -@media (max-width: 1399.98px) { .offcanvas-xxl.offcanvas-bottom { right: 0; left: 0; @@ -6689,13 +6594,9 @@ textarea.form-control-lg { border-top: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateY(100%); } -} -@media (max-width: 1399.98px) { .offcanvas-xxl.showing, .offcanvas-xxl.show:not(.hiding) { transform: none; } -} -@media (max-width: 1399.98px) { .offcanvas-xxl.showing, .offcanvas-xxl.hiding, .offcanvas-xxl.show { visibility: visible; } @@ -6850,17 +6751,14 @@ textarea.form-control-lg { } } .placeholder-wave { - -webkit-mask-image: linear-gradient(130deg, #000 55%, rgba(0, 0, 0, 0.8) 75%, #000 95%); - mask-image: linear-gradient(130deg, #000 55%, rgba(0, 0, 0, 0.8) 75%, #000 95%); - -webkit-mask-size: 200% 100%; - mask-size: 200% 100%; + mask-image: linear-gradient(130deg, #000 55%, rgba(0, 0, 0, 0.8) 75%, #000 95%); + mask-size: 200% 100%; animation: placeholder-wave 2s linear infinite; } @keyframes placeholder-wave { 100% { - -webkit-mask-position: -200% 0%; - mask-position: -200% 0%; + mask-position: -200% 0%; } } .clearfix::after { @@ -7233,28 +7131,23 @@ textarea.form-control-lg { } .object-fit-contain { - -o-object-fit: contain !important; - object-fit: contain !important; + object-fit: contain !important; } .object-fit-cover { - -o-object-fit: cover !important; - object-fit: cover !important; + object-fit: cover !important; } .object-fit-fill { - -o-object-fit: fill !important; - object-fit: fill !important; + object-fit: fill !important; } .object-fit-scale { - -o-object-fit: scale-down !important; - object-fit: scale-down !important; + object-fit: scale-down !important; } .object-fit-none { - -o-object-fit: none !important; - object-fit: none !important; + object-fit: none !important; } .opacity-0 { @@ -8334,33 +8227,27 @@ textarea.form-control-lg { } .column-gap-0 { - -moz-column-gap: 0 !important; - column-gap: 0 !important; + column-gap: 0 !important; } .column-gap-1 { - -moz-column-gap: 0.25rem !important; - column-gap: 0.25rem !important; + column-gap: 0.25rem !important; } .column-gap-2 { - -moz-column-gap: 0.5rem !important; - column-gap: 0.5rem !important; + column-gap: 0.5rem !important; } .column-gap-3 { - -moz-column-gap: 1rem !important; - column-gap: 1rem !important; + column-gap: 1rem !important; } .column-gap-4 { - -moz-column-gap: 1.5rem !important; - column-gap: 1.5rem !important; + column-gap: 1.5rem !important; } .column-gap-5 { - -moz-column-gap: 3rem !important; - column-gap: 3rem !important; + column-gap: 3rem !important; } .font-monospace { @@ -8380,15 +8267,15 @@ textarea.form-control-lg { } .fs-4 { - font-size: calc(1.265625rem + 0.1875vw) !important; + font-size: calc(1.25625rem + 0.075vw) !important; } .fs-5 { - font-size: 1.171875rem !important; + font-size: 1.09375rem !important; } .fs-6 { - font-size: 0.9375rem !important; + font-size: 0.875rem !important; } .fst-italic { @@ -8916,21 +8803,15 @@ textarea.form-control-lg { } .user-select-all { - -webkit-user-select: all !important; - -moz-user-select: all !important; - user-select: all !important; + user-select: all !important; } .user-select-auto { - -webkit-user-select: auto !important; - -moz-user-select: auto !important; - user-select: auto !important; + user-select: auto !important; } .user-select-none { - -webkit-user-select: none !important; - -moz-user-select: none !important; - user-select: none !important; + user-select: none !important; } .pe-none { @@ -9196,24 +9077,19 @@ textarea.form-control-lg { float: none !important; } .object-fit-sm-contain { - -o-object-fit: contain !important; - object-fit: contain !important; + object-fit: contain !important; } .object-fit-sm-cover { - -o-object-fit: cover !important; - object-fit: cover !important; + object-fit: cover !important; } .object-fit-sm-fill { - -o-object-fit: fill !important; - object-fit: fill !important; + object-fit: fill !important; } .object-fit-sm-scale { - -o-object-fit: scale-down !important; - object-fit: scale-down !important; + object-fit: scale-down !important; } .object-fit-sm-none { - -o-object-fit: none !important; - object-fit: none !important; + object-fit: none !important; } .d-sm-inline { display: inline !important; @@ -9713,28 +9589,22 @@ textarea.form-control-lg { row-gap: 3rem !important; } .column-gap-sm-0 { - -moz-column-gap: 0 !important; - column-gap: 0 !important; + column-gap: 0 !important; } .column-gap-sm-1 { - -moz-column-gap: 0.25rem !important; - column-gap: 0.25rem !important; + column-gap: 0.25rem !important; } .column-gap-sm-2 { - -moz-column-gap: 0.5rem !important; - column-gap: 0.5rem !important; + column-gap: 0.5rem !important; } .column-gap-sm-3 { - -moz-column-gap: 1rem !important; - column-gap: 1rem !important; + column-gap: 1rem !important; } .column-gap-sm-4 { - -moz-column-gap: 1.5rem !important; - column-gap: 1.5rem !important; + column-gap: 1.5rem !important; } .column-gap-sm-5 { - -moz-column-gap: 3rem !important; - column-gap: 3rem !important; + column-gap: 3rem !important; } .text-sm-start { text-align: left !important; @@ -9757,24 +9627,19 @@ textarea.form-control-lg { float: none !important; } .object-fit-md-contain { - -o-object-fit: contain !important; - object-fit: contain !important; + object-fit: contain !important; } .object-fit-md-cover { - -o-object-fit: cover !important; - object-fit: cover !important; + object-fit: cover !important; } .object-fit-md-fill { - -o-object-fit: fill !important; - object-fit: fill !important; + object-fit: fill !important; } .object-fit-md-scale { - -o-object-fit: scale-down !important; - object-fit: scale-down !important; + object-fit: scale-down !important; } .object-fit-md-none { - -o-object-fit: none !important; - object-fit: none !important; + object-fit: none !important; } .d-md-inline { display: inline !important; @@ -10274,28 +10139,22 @@ textarea.form-control-lg { row-gap: 3rem !important; } .column-gap-md-0 { - -moz-column-gap: 0 !important; - column-gap: 0 !important; + column-gap: 0 !important; } .column-gap-md-1 { - -moz-column-gap: 0.25rem !important; - column-gap: 0.25rem !important; + column-gap: 0.25rem !important; } .column-gap-md-2 { - -moz-column-gap: 0.5rem !important; - column-gap: 0.5rem !important; + column-gap: 0.5rem !important; } .column-gap-md-3 { - -moz-column-gap: 1rem !important; - column-gap: 1rem !important; + column-gap: 1rem !important; } .column-gap-md-4 { - -moz-column-gap: 1.5rem !important; - column-gap: 1.5rem !important; + column-gap: 1.5rem !important; } .column-gap-md-5 { - -moz-column-gap: 3rem !important; - column-gap: 3rem !important; + column-gap: 3rem !important; } .text-md-start { text-align: left !important; @@ -10318,24 +10177,19 @@ textarea.form-control-lg { float: none !important; } .object-fit-lg-contain { - -o-object-fit: contain !important; - object-fit: contain !important; + object-fit: contain !important; } .object-fit-lg-cover { - -o-object-fit: cover !important; - object-fit: cover !important; + object-fit: cover !important; } .object-fit-lg-fill { - -o-object-fit: fill !important; - object-fit: fill !important; + object-fit: fill !important; } .object-fit-lg-scale { - -o-object-fit: scale-down !important; - object-fit: scale-down !important; + object-fit: scale-down !important; } .object-fit-lg-none { - -o-object-fit: none !important; - object-fit: none !important; + object-fit: none !important; } .d-lg-inline { display: inline !important; @@ -10835,28 +10689,22 @@ textarea.form-control-lg { row-gap: 3rem !important; } .column-gap-lg-0 { - -moz-column-gap: 0 !important; - column-gap: 0 !important; + column-gap: 0 !important; } .column-gap-lg-1 { - -moz-column-gap: 0.25rem !important; - column-gap: 0.25rem !important; + column-gap: 0.25rem !important; } .column-gap-lg-2 { - -moz-column-gap: 0.5rem !important; - column-gap: 0.5rem !important; + column-gap: 0.5rem !important; } .column-gap-lg-3 { - -moz-column-gap: 1rem !important; - column-gap: 1rem !important; + column-gap: 1rem !important; } .column-gap-lg-4 { - -moz-column-gap: 1.5rem !important; - column-gap: 1.5rem !important; + column-gap: 1.5rem !important; } .column-gap-lg-5 { - -moz-column-gap: 3rem !important; - column-gap: 3rem !important; + column-gap: 3rem !important; } .text-lg-start { text-align: left !important; @@ -10879,24 +10727,19 @@ textarea.form-control-lg { float: none !important; } .object-fit-xl-contain { - -o-object-fit: contain !important; - object-fit: contain !important; + object-fit: contain !important; } .object-fit-xl-cover { - -o-object-fit: cover !important; - object-fit: cover !important; + object-fit: cover !important; } .object-fit-xl-fill { - -o-object-fit: fill !important; - object-fit: fill !important; + object-fit: fill !important; } .object-fit-xl-scale { - -o-object-fit: scale-down !important; - object-fit: scale-down !important; + object-fit: scale-down !important; } .object-fit-xl-none { - -o-object-fit: none !important; - object-fit: none !important; + object-fit: none !important; } .d-xl-inline { display: inline !important; @@ -11396,28 +11239,22 @@ textarea.form-control-lg { row-gap: 3rem !important; } .column-gap-xl-0 { - -moz-column-gap: 0 !important; - column-gap: 0 !important; + column-gap: 0 !important; } .column-gap-xl-1 { - -moz-column-gap: 0.25rem !important; - column-gap: 0.25rem !important; + column-gap: 0.25rem !important; } .column-gap-xl-2 { - -moz-column-gap: 0.5rem !important; - column-gap: 0.5rem !important; + column-gap: 0.5rem !important; } .column-gap-xl-3 { - -moz-column-gap: 1rem !important; - column-gap: 1rem !important; + column-gap: 1rem !important; } .column-gap-xl-4 { - -moz-column-gap: 1.5rem !important; - column-gap: 1.5rem !important; + column-gap: 1.5rem !important; } .column-gap-xl-5 { - -moz-column-gap: 3rem !important; - column-gap: 3rem !important; + column-gap: 3rem !important; } .text-xl-start { text-align: left !important; @@ -11440,24 +11277,19 @@ textarea.form-control-lg { float: none !important; } .object-fit-xxl-contain { - -o-object-fit: contain !important; - object-fit: contain !important; + object-fit: contain !important; } .object-fit-xxl-cover { - -o-object-fit: cover !important; - object-fit: cover !important; + object-fit: cover !important; } .object-fit-xxl-fill { - -o-object-fit: fill !important; - object-fit: fill !important; + object-fit: fill !important; } .object-fit-xxl-scale { - -o-object-fit: scale-down !important; - object-fit: scale-down !important; + object-fit: scale-down !important; } .object-fit-xxl-none { - -o-object-fit: none !important; - object-fit: none !important; + object-fit: none !important; } .d-xxl-inline { display: inline !important; @@ -11957,28 +11789,22 @@ textarea.form-control-lg { row-gap: 3rem !important; } .column-gap-xxl-0 { - -moz-column-gap: 0 !important; - column-gap: 0 !important; + column-gap: 0 !important; } .column-gap-xxl-1 { - -moz-column-gap: 0.25rem !important; - column-gap: 0.25rem !important; + column-gap: 0.25rem !important; } .column-gap-xxl-2 { - -moz-column-gap: 0.5rem !important; - column-gap: 0.5rem !important; + column-gap: 0.5rem !important; } .column-gap-xxl-3 { - -moz-column-gap: 1rem !important; - column-gap: 1rem !important; + column-gap: 1rem !important; } .column-gap-xxl-4 { - -moz-column-gap: 1.5rem !important; - column-gap: 1.5rem !important; + column-gap: 1.5rem !important; } .column-gap-xxl-5 { - -moz-column-gap: 3rem !important; - column-gap: 3rem !important; + column-gap: 3rem !important; } .text-xxl-start { text-align: left !important; @@ -12001,7 +11827,7 @@ textarea.form-control-lg { font-size: 2rem !important; } .fs-4 { - font-size: 1.40625rem !important; + font-size: 1.3125rem !important; } } @media print { @@ -12038,4 +11864,6 @@ textarea.form-control-lg { .d-print-none { display: none !important; } -}/*# sourceMappingURL=darkly-compact.css.map */ \ No newline at end of file +} + +/*# sourceMappingURL=darkly-compact.css.map */ diff --git a/src/assets/css/themes/darkly-red.css b/src/assets/css/themes/darkly-red.css index 4a7459cd..1fc30a00 100644 --- a/src/assets/css/themes/darkly-red.css +++ b/src/assets/css/themes/darkly-red.css @@ -75,7 +75,7 @@ --bs-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; --bs-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0)); --bs-body-font-family: var(--bs-font-sans-serif); - --bs-body-font-size: 0.9375rem; + --bs-body-font-size: 0.875rem; --bs-body-font-weight: 400; --bs-body-line-height: 1.5; --bs-body-color: #dee2e6; @@ -247,20 +247,20 @@ h3, .h3 { } h4, .h4 { - font-size: calc(1.265625rem + 0.1875vw); + font-size: calc(1.25625rem + 0.075vw); } @media (min-width: 1200px) { h4, .h4 { - font-size: 1.40625rem; + font-size: 1.3125rem; } } h5, .h5 { - font-size: 1.171875rem; + font-size: 1.09375rem; } h6, .h6 { - font-size: 0.9375rem; + font-size: 0.875rem; } p { @@ -586,7 +586,7 @@ progress { } .lead { - font-size: 1.171875rem; + font-size: 1.09375rem; font-weight: 300; } @@ -680,7 +680,7 @@ progress { .blockquote { margin-bottom: 1rem; - font-size: 1.171875rem; + font-size: 1.09375rem; } .blockquote > :last-child { margin-bottom: 0; @@ -2063,13 +2063,13 @@ progress { .col-form-label-lg { padding-top: calc(0.5rem + var(--bs-border-width)); padding-bottom: calc(0.5rem + var(--bs-border-width)); - font-size: 1.171875rem; + font-size: 1.09375rem; } .col-form-label-sm { padding-top: calc(0.25rem + var(--bs-border-width)); padding-bottom: calc(0.25rem + var(--bs-border-width)); - font-size: 0.8203125rem; + font-size: 0.765625rem; } .form-text { @@ -2082,7 +2082,7 @@ progress { display: block; width: 100%; padding: 0.375rem 0.75rem; - font-size: 0.9375rem; + font-size: 0.875rem; font-weight: 400; line-height: 1.5; color: #fff; @@ -2173,7 +2173,7 @@ progress { .form-control-sm { min-height: calc(1.5em + 0.5rem + calc(var(--bs-border-width) * 2)); padding: 0.25rem 0.5rem; - font-size: 0.8203125rem; + font-size: 0.765625rem; border-radius: var(--bs-border-radius-sm); } .form-control-sm::file-selector-button { @@ -2185,7 +2185,7 @@ progress { .form-control-lg { min-height: calc(1.5em + 1rem + calc(var(--bs-border-width) * 2)); padding: 0.5rem 1rem; - font-size: 1.171875rem; + font-size: 1.09375rem; border-radius: var(--bs-border-radius-lg); } .form-control-lg::file-selector-button { @@ -2232,7 +2232,7 @@ textarea.form-control-lg { display: block; width: 100%; padding: 0.375rem 2.25rem 0.375rem 0.75rem; - font-size: 0.9375rem; + font-size: 0.875rem; font-weight: 400; line-height: 1.5; color: #fff; @@ -2272,7 +2272,7 @@ textarea.form-control-lg { padding-top: 0.25rem; padding-bottom: 0.25rem; padding-left: 0.5rem; - font-size: 0.8203125rem; + font-size: 0.765625rem; border-radius: var(--bs-border-radius-sm); } @@ -2280,7 +2280,7 @@ textarea.form-control-lg { padding-top: 0.5rem; padding-bottom: 0.5rem; padding-left: 1rem; - font-size: 1.171875rem; + font-size: 1.09375rem; border-radius: var(--bs-border-radius-lg); } @@ -2290,7 +2290,7 @@ textarea.form-control-lg { .form-check { display: block; - min-height: 1.40625rem; + min-height: 1.3125rem; padding-left: 1.5em; margin-bottom: 0.125rem; } @@ -2618,7 +2618,7 @@ textarea.form-control-lg { display: flex; align-items: center; padding: 0.375rem 0.75rem; - font-size: 0.9375rem; + font-size: 0.875rem; font-weight: 400; line-height: 1.5; color: #adb5bd; @@ -2634,7 +2634,7 @@ textarea.form-control-lg { .input-group-lg > .input-group-text, .input-group-lg > .btn { padding: 0.5rem 1rem; - font-size: 1.171875rem; + font-size: 1.09375rem; border-radius: var(--bs-border-radius-lg); } @@ -2643,7 +2643,7 @@ textarea.form-control-lg { .input-group-sm > .input-group-text, .input-group-sm > .btn { padding: 0.25rem 0.5rem; - font-size: 0.8203125rem; + font-size: 0.765625rem; border-radius: var(--bs-border-radius-sm); } @@ -2693,7 +2693,7 @@ textarea.form-control-lg { max-width: 100%; padding: 0.25rem 0.5rem; margin-top: 0.1rem; - font-size: 0.8203125rem; + font-size: 0.765625rem; color: #fff; background-color: var(--bs-success); border-radius: var(--bs-border-radius); @@ -2783,7 +2783,7 @@ textarea.form-control-lg { max-width: 100%; padding: 0.25rem 0.5rem; margin-top: 0.1rem; - font-size: 0.8203125rem; + font-size: 0.765625rem; color: #fff; background-color: var(--bs-danger); border-radius: var(--bs-border-radius); @@ -2861,7 +2861,7 @@ textarea.form-control-lg { --bs-btn-padding-x: 0.75rem; --bs-btn-padding-y: 0.375rem; --bs-btn-font-family: ; - --bs-btn-font-size: 0.9375rem; + --bs-btn-font-size: 0.875rem; --bs-btn-font-weight: 400; --bs-btn-line-height: 1.5; --bs-btn-color: var(--bs-body-color); @@ -3229,14 +3229,14 @@ textarea.form-control-lg { .btn-lg, .btn-group-lg > .btn { --bs-btn-padding-y: 0.5rem; --bs-btn-padding-x: 1rem; - --bs-btn-font-size: 1.171875rem; + --bs-btn-font-size: 1.09375rem; --bs-btn-border-radius: var(--bs-border-radius-lg); } .btn-sm, .btn-group-sm > .btn { --bs-btn-padding-y: 0.25rem; --bs-btn-padding-x: 0.5rem; - --bs-btn-font-size: 0.8203125rem; + --bs-btn-font-size: 0.765625rem; --bs-btn-border-radius: var(--bs-border-radius-sm); } @@ -3309,7 +3309,7 @@ textarea.form-control-lg { --bs-dropdown-padding-x: 0; --bs-dropdown-padding-y: 0.5rem; --bs-dropdown-spacer: 0.125rem; - --bs-dropdown-font-size: 0.9375rem; + --bs-dropdown-font-size: 0.875rem; --bs-dropdown-color: var(--bs-body-color); --bs-dropdown-bg: #222; --bs-dropdown-border-color: #444; @@ -3567,7 +3567,7 @@ textarea.form-control-lg { display: block; padding: var(--bs-dropdown-header-padding-y) var(--bs-dropdown-header-padding-x); margin-bottom: 0; - font-size: 0.8203125rem; + font-size: 0.765625rem; color: var(--bs-dropdown-header-color); white-space: nowrap; } @@ -3844,15 +3844,15 @@ textarea.form-control-lg { --bs-navbar-hover-color: #fff; --bs-navbar-disabled-color: rgba(var(--bs-emphasis-color-rgb), 0.3); --bs-navbar-active-color: #fff; - --bs-navbar-brand-padding-y: 0.32421875rem; + --bs-navbar-brand-padding-y: 0.3359375rem; --bs-navbar-brand-margin-end: 1rem; - --bs-navbar-brand-font-size: 1.171875rem; + --bs-navbar-brand-font-size: 1.09375rem; --bs-navbar-brand-color: #fff; --bs-navbar-brand-hover-color: #fff; --bs-navbar-nav-link-padding-x: 0.5rem; --bs-navbar-toggler-padding-y: 0.25rem; --bs-navbar-toggler-padding-x: 0.75rem; - --bs-navbar-toggler-font-size: 1.171875rem; + --bs-navbar-toggler-font-size: 1.09375rem; --bs-navbar-toggler-icon-bg: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28222, 226, 230, 0.75%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e"); --bs-navbar-toggler-border-color: rgba(34, 34, 34, 0.1); --bs-navbar-toggler-border-radius: var(--bs-border-radius); @@ -4477,7 +4477,7 @@ textarea.form-control-lg { align-items: center; width: 100%; padding: var(--bs-accordion-btn-padding-y) var(--bs-accordion-btn-padding-x); - font-size: 0.9375rem; + font-size: 0.875rem; color: var(--bs-accordion-btn-color); text-align: left; background-color: var(--bs-accordion-btn-bg); @@ -4621,7 +4621,7 @@ textarea.form-control-lg { .pagination { --bs-pagination-padding-x: 0.75rem; --bs-pagination-padding-y: 0.375rem; - --bs-pagination-font-size: 0.9375rem; + --bs-pagination-font-size: 0.875rem; --bs-pagination-color: #fff; --bs-pagination-bg: #00bc8c; --bs-pagination-border-width: 0; @@ -4700,14 +4700,14 @@ textarea.form-control-lg { .pagination-lg { --bs-pagination-padding-x: 1.5rem; --bs-pagination-padding-y: 0.75rem; - --bs-pagination-font-size: 1.171875rem; + --bs-pagination-font-size: 1.09375rem; --bs-pagination-border-radius: var(--bs-border-radius-lg); } .pagination-sm { --bs-pagination-padding-x: 0.5rem; --bs-pagination-padding-y: 0.25rem; - --bs-pagination-font-size: 0.8203125rem; + --bs-pagination-font-size: 0.765625rem; --bs-pagination-border-radius: var(--bs-border-radius-sm); } @@ -4841,7 +4841,7 @@ textarea.form-control-lg { .progress, .progress-stacked { --bs-progress-height: 1rem; - --bs-progress-font-size: 0.703125rem; + --bs-progress-font-size: 0.65625rem; --bs-progress-bg: #444; --bs-progress-border-radius: var(--bs-border-radius); --bs-progress-box-shadow: var(--bs-box-shadow-inset); @@ -5645,7 +5645,7 @@ textarea.form-control-lg { --bs-tooltip-padding-x: 0.5rem; --bs-tooltip-padding-y: 0.25rem; --bs-tooltip-margin: ; - --bs-tooltip-font-size: 0.8203125rem; + --bs-tooltip-font-size: 0.765625rem; --bs-tooltip-color: var(--bs-body-bg); --bs-tooltip-bg: var(--bs-emphasis-color); --bs-tooltip-border-radius: var(--bs-border-radius); @@ -5744,7 +5744,7 @@ textarea.form-control-lg { .popover { --bs-popover-zindex: 1070; --bs-popover-max-width: 276px; - --bs-popover-font-size: 0.8203125rem; + --bs-popover-font-size: 0.765625rem; --bs-popover-bg: #303030; --bs-popover-border-width: var(--bs-border-width); --bs-popover-border-color: var(--bs-border-color-translucent); @@ -5753,7 +5753,7 @@ textarea.form-control-lg { --bs-popover-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15); --bs-popover-header-padding-x: 1rem; --bs-popover-header-padding-y: 0.5rem; - --bs-popover-header-font-size: 0.9375rem; + --bs-popover-header-font-size: 0.875rem; --bs-popover-header-color: inherit; --bs-popover-header-bg: #444; --bs-popover-body-padding-x: 1rem; @@ -8227,15 +8227,15 @@ textarea.form-control-lg { } .fs-4 { - font-size: calc(1.265625rem + 0.1875vw) !important; + font-size: calc(1.25625rem + 0.075vw) !important; } .fs-5 { - font-size: 1.171875rem !important; + font-size: 1.09375rem !important; } .fs-6 { - font-size: 0.9375rem !important; + font-size: 0.875rem !important; } .fst-italic { @@ -11787,7 +11787,7 @@ textarea.form-control-lg { font-size: 2rem !important; } .fs-4 { - font-size: 1.40625rem !important; + font-size: 1.3125rem !important; } } @media print { diff --git a/src/assets/css/themes/darkly.css b/src/assets/css/themes/darkly.css index e8ac2263..a1dd3a0f 100644 --- a/src/assets/css/themes/darkly.css +++ b/src/assets/css/themes/darkly.css @@ -75,7 +75,7 @@ --bs-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; --bs-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0)); --bs-body-font-family: var(--bs-font-sans-serif); - --bs-body-font-size: 0.9375rem; + --bs-body-font-size: 0.875rem; --bs-body-font-weight: 400; --bs-body-line-height: 1.5; --bs-body-color: #dee2e6; @@ -247,20 +247,20 @@ h3, .h3 { } h4, .h4 { - font-size: calc(1.265625rem + 0.1875vw); + font-size: calc(1.25625rem + 0.075vw); } @media (min-width: 1200px) { h4, .h4 { - font-size: 1.40625rem; + font-size: 1.3125rem; } } h5, .h5 { - font-size: 1.171875rem; + font-size: 1.09375rem; } h6, .h6 { - font-size: 0.9375rem; + font-size: 0.875rem; } p { @@ -586,7 +586,7 @@ progress { } .lead { - font-size: 1.171875rem; + font-size: 1.09375rem; font-weight: 300; } @@ -680,7 +680,7 @@ progress { .blockquote { margin-bottom: 1rem; - font-size: 1.171875rem; + font-size: 1.09375rem; } .blockquote > :last-child { margin-bottom: 0; @@ -2063,13 +2063,13 @@ progress { .col-form-label-lg { padding-top: calc(0.5rem + var(--bs-border-width)); padding-bottom: calc(0.5rem + var(--bs-border-width)); - font-size: 1.171875rem; + font-size: 1.09375rem; } .col-form-label-sm { padding-top: calc(0.25rem + var(--bs-border-width)); padding-bottom: calc(0.25rem + var(--bs-border-width)); - font-size: 0.8203125rem; + font-size: 0.765625rem; } .form-text { @@ -2082,7 +2082,7 @@ progress { display: block; width: 100%; padding: 0.375rem 0.75rem; - font-size: 0.9375rem; + font-size: 0.875rem; font-weight: 400; line-height: 1.5; color: #fff; @@ -2173,7 +2173,7 @@ progress { .form-control-sm { min-height: calc(1.5em + 0.5rem + calc(var(--bs-border-width) * 2)); padding: 0.25rem 0.5rem; - font-size: 0.8203125rem; + font-size: 0.765625rem; border-radius: var(--bs-border-radius-sm); } .form-control-sm::file-selector-button { @@ -2185,7 +2185,7 @@ progress { .form-control-lg { min-height: calc(1.5em + 1rem + calc(var(--bs-border-width) * 2)); padding: 0.5rem 1rem; - font-size: 1.171875rem; + font-size: 1.09375rem; border-radius: var(--bs-border-radius-lg); } .form-control-lg::file-selector-button { @@ -2232,7 +2232,7 @@ textarea.form-control-lg { display: block; width: 100%; padding: 0.375rem 2.25rem 0.375rem 0.75rem; - font-size: 0.9375rem; + font-size: 0.875rem; font-weight: 400; line-height: 1.5; color: #fff; @@ -2272,7 +2272,7 @@ textarea.form-control-lg { padding-top: 0.25rem; padding-bottom: 0.25rem; padding-left: 0.5rem; - font-size: 0.8203125rem; + font-size: 0.765625rem; border-radius: var(--bs-border-radius-sm); } @@ -2280,7 +2280,7 @@ textarea.form-control-lg { padding-top: 0.5rem; padding-bottom: 0.5rem; padding-left: 1rem; - font-size: 1.171875rem; + font-size: 1.09375rem; border-radius: var(--bs-border-radius-lg); } @@ -2290,7 +2290,7 @@ textarea.form-control-lg { .form-check { display: block; - min-height: 1.40625rem; + min-height: 1.3125rem; padding-left: 1.5em; margin-bottom: 0.125rem; } @@ -2618,7 +2618,7 @@ textarea.form-control-lg { display: flex; align-items: center; padding: 0.375rem 0.75rem; - font-size: 0.9375rem; + font-size: 0.875rem; font-weight: 400; line-height: 1.5; color: #adb5bd; @@ -2634,7 +2634,7 @@ textarea.form-control-lg { .input-group-lg > .input-group-text, .input-group-lg > .btn { padding: 0.5rem 1rem; - font-size: 1.171875rem; + font-size: 1.09375rem; border-radius: var(--bs-border-radius-lg); } @@ -2643,7 +2643,7 @@ textarea.form-control-lg { .input-group-sm > .input-group-text, .input-group-sm > .btn { padding: 0.25rem 0.5rem; - font-size: 0.8203125rem; + font-size: 0.765625rem; border-radius: var(--bs-border-radius-sm); } @@ -2693,7 +2693,7 @@ textarea.form-control-lg { max-width: 100%; padding: 0.25rem 0.5rem; margin-top: 0.1rem; - font-size: 0.8203125rem; + font-size: 0.765625rem; color: #fff; background-color: var(--bs-success); border-radius: var(--bs-border-radius); @@ -2783,7 +2783,7 @@ textarea.form-control-lg { max-width: 100%; padding: 0.25rem 0.5rem; margin-top: 0.1rem; - font-size: 0.8203125rem; + font-size: 0.765625rem; color: #fff; background-color: var(--bs-danger); border-radius: var(--bs-border-radius); @@ -2861,7 +2861,7 @@ textarea.form-control-lg { --bs-btn-padding-x: 0.75rem; --bs-btn-padding-y: 0.375rem; --bs-btn-font-family: ; - --bs-btn-font-size: 0.9375rem; + --bs-btn-font-size: 0.875rem; --bs-btn-font-weight: 400; --bs-btn-line-height: 1.5; --bs-btn-color: var(--bs-body-color); @@ -3229,14 +3229,14 @@ textarea.form-control-lg { .btn-lg, .btn-group-lg > .btn { --bs-btn-padding-y: 0.5rem; --bs-btn-padding-x: 1rem; - --bs-btn-font-size: 1.171875rem; + --bs-btn-font-size: 1.09375rem; --bs-btn-border-radius: var(--bs-border-radius-lg); } .btn-sm, .btn-group-sm > .btn { --bs-btn-padding-y: 0.25rem; --bs-btn-padding-x: 0.5rem; - --bs-btn-font-size: 0.8203125rem; + --bs-btn-font-size: 0.765625rem; --bs-btn-border-radius: var(--bs-border-radius-sm); } @@ -3309,7 +3309,7 @@ textarea.form-control-lg { --bs-dropdown-padding-x: 0; --bs-dropdown-padding-y: 0.5rem; --bs-dropdown-spacer: 0.125rem; - --bs-dropdown-font-size: 0.9375rem; + --bs-dropdown-font-size: 0.875rem; --bs-dropdown-color: var(--bs-body-color); --bs-dropdown-bg: #222; --bs-dropdown-border-color: #444; @@ -3567,7 +3567,7 @@ textarea.form-control-lg { display: block; padding: var(--bs-dropdown-header-padding-y) var(--bs-dropdown-header-padding-x); margin-bottom: 0; - font-size: 0.8203125rem; + font-size: 0.765625rem; color: var(--bs-dropdown-header-color); white-space: nowrap; } @@ -3844,15 +3844,15 @@ textarea.form-control-lg { --bs-navbar-hover-color: #fff; --bs-navbar-disabled-color: rgba(var(--bs-emphasis-color-rgb), 0.3); --bs-navbar-active-color: #fff; - --bs-navbar-brand-padding-y: 0.32421875rem; + --bs-navbar-brand-padding-y: 0.3359375rem; --bs-navbar-brand-margin-end: 1rem; - --bs-navbar-brand-font-size: 1.171875rem; + --bs-navbar-brand-font-size: 1.09375rem; --bs-navbar-brand-color: #fff; --bs-navbar-brand-hover-color: #fff; --bs-navbar-nav-link-padding-x: 0.5rem; --bs-navbar-toggler-padding-y: 0.25rem; --bs-navbar-toggler-padding-x: 0.75rem; - --bs-navbar-toggler-font-size: 1.171875rem; + --bs-navbar-toggler-font-size: 1.09375rem; --bs-navbar-toggler-icon-bg: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28222, 226, 230, 0.75%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e"); --bs-navbar-toggler-border-color: rgba(34, 34, 34, 0.1); --bs-navbar-toggler-border-radius: var(--bs-border-radius); @@ -4477,7 +4477,7 @@ textarea.form-control-lg { align-items: center; width: 100%; padding: var(--bs-accordion-btn-padding-y) var(--bs-accordion-btn-padding-x); - font-size: 0.9375rem; + font-size: 0.875rem; color: var(--bs-accordion-btn-color); text-align: left; background-color: var(--bs-accordion-btn-bg); @@ -4621,7 +4621,7 @@ textarea.form-control-lg { .pagination { --bs-pagination-padding-x: 0.75rem; --bs-pagination-padding-y: 0.375rem; - --bs-pagination-font-size: 0.9375rem; + --bs-pagination-font-size: 0.875rem; --bs-pagination-color: #fff; --bs-pagination-bg: #00bc8c; --bs-pagination-border-width: 0; @@ -4700,14 +4700,14 @@ textarea.form-control-lg { .pagination-lg { --bs-pagination-padding-x: 1.5rem; --bs-pagination-padding-y: 0.75rem; - --bs-pagination-font-size: 1.171875rem; + --bs-pagination-font-size: 1.09375rem; --bs-pagination-border-radius: var(--bs-border-radius-lg); } .pagination-sm { --bs-pagination-padding-x: 0.5rem; --bs-pagination-padding-y: 0.25rem; - --bs-pagination-font-size: 0.8203125rem; + --bs-pagination-font-size: 0.765625rem; --bs-pagination-border-radius: var(--bs-border-radius-sm); } @@ -4841,7 +4841,7 @@ textarea.form-control-lg { .progress, .progress-stacked { --bs-progress-height: 1rem; - --bs-progress-font-size: 0.703125rem; + --bs-progress-font-size: 0.65625rem; --bs-progress-bg: #444; --bs-progress-border-radius: var(--bs-border-radius); --bs-progress-box-shadow: var(--bs-box-shadow-inset); @@ -5645,7 +5645,7 @@ textarea.form-control-lg { --bs-tooltip-padding-x: 0.5rem; --bs-tooltip-padding-y: 0.25rem; --bs-tooltip-margin: ; - --bs-tooltip-font-size: 0.8203125rem; + --bs-tooltip-font-size: 0.765625rem; --bs-tooltip-color: var(--bs-body-bg); --bs-tooltip-bg: var(--bs-emphasis-color); --bs-tooltip-border-radius: var(--bs-border-radius); @@ -5744,7 +5744,7 @@ textarea.form-control-lg { .popover { --bs-popover-zindex: 1070; --bs-popover-max-width: 276px; - --bs-popover-font-size: 0.8203125rem; + --bs-popover-font-size: 0.765625rem; --bs-popover-bg: #303030; --bs-popover-border-width: var(--bs-border-width); --bs-popover-border-color: var(--bs-border-color-translucent); @@ -5753,7 +5753,7 @@ textarea.form-control-lg { --bs-popover-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15); --bs-popover-header-padding-x: 1rem; --bs-popover-header-padding-y: 0.5rem; - --bs-popover-header-font-size: 0.9375rem; + --bs-popover-header-font-size: 0.875rem; --bs-popover-header-color: inherit; --bs-popover-header-bg: #444; --bs-popover-body-padding-x: 1rem; @@ -8227,15 +8227,15 @@ textarea.form-control-lg { } .fs-4 { - font-size: calc(1.265625rem + 0.1875vw) !important; + font-size: calc(1.25625rem + 0.075vw) !important; } .fs-5 { - font-size: 1.171875rem !important; + font-size: 1.09375rem !important; } .fs-6 { - font-size: 0.9375rem !important; + font-size: 0.875rem !important; } .fst-italic { @@ -11787,7 +11787,7 @@ textarea.form-control-lg { font-size: 2rem !important; } .fs-4 { - font-size: 1.40625rem !important; + font-size: 1.3125rem !important; } } @media print { diff --git a/src/assets/css/themes/litely-compact.css b/src/assets/css/themes/litely-compact.css index 3cfc3474..cfb1e0a4 100644 --- a/src/assets/css/themes/litely-compact.css +++ b/src/assets/css/themes/litely-compact.css @@ -115,7 +115,7 @@ hr.my-3 { --bs-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; --bs-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0)); --bs-body-font-family: var(--bs-font-sans-serif); - --bs-body-font-size: 1rem; + --bs-body-font-size: 0.875rem; --bs-body-font-weight: 400; --bs-body-line-height: 1.5; --bs-body-color: #495057; @@ -260,47 +260,47 @@ h6, .h6, h5, .h5, h4, .h4, h3, .h3, h2, .h2, h1, .h1 { } h1, .h1 { - font-size: calc(1.375rem + 1.5vw); + font-size: calc(1.34375rem + 1.125vw); } @media (min-width: 1200px) { h1, .h1 { - font-size: 2.5rem; + font-size: 2.1875rem; } } h2, .h2 { - font-size: calc(1.325rem + 0.9vw); -} -@media (min-width: 1200px) { - h2, .h2 { - font-size: 2rem; - } -} - -h3, .h3 { font-size: calc(1.3rem + 0.6vw); } @media (min-width: 1200px) { - h3, .h3 { + h2, .h2 { font-size: 1.75rem; } } +h3, .h3 { + font-size: calc(1.278125rem + 0.3375vw); +} +@media (min-width: 1200px) { + h3, .h3 { + font-size: 1.53125rem; + } +} + h4, .h4 { - font-size: calc(1.275rem + 0.3vw); + font-size: calc(1.25625rem + 0.075vw); } @media (min-width: 1200px) { h4, .h4 { - font-size: 1.5rem; + font-size: 1.3125rem; } } h5, .h5 { - font-size: 1.25rem; + font-size: 1.09375rem; } h6, .h6 { - font-size: 1rem; + font-size: 0.875rem; } p { @@ -309,11 +309,9 @@ p { } abbr[title] { - -webkit-text-decoration: underline dotted; - text-decoration: underline dotted; + text-decoration: underline dotted; cursor: help; - -webkit-text-decoration-skip-ink: none; - text-decoration-skip-ink: none; + text-decoration-skip-ink: none; } address { @@ -627,7 +625,7 @@ progress { } .lead { - font-size: 1.25rem; + font-size: 1.09375rem; font-weight: 300; } @@ -721,7 +719,7 @@ progress { .blockquote { margin-bottom: 1rem; - font-size: 1.25rem; + font-size: 1.09375rem; } .blockquote > :last-child { margin-bottom: 0; @@ -2104,13 +2102,13 @@ progress { .col-form-label-lg { padding-top: calc(0.5rem + var(--bs-border-width)); padding-bottom: calc(0.5rem + var(--bs-border-width)); - font-size: 1.25rem; + font-size: 1.09375rem; } .col-form-label-sm { padding-top: calc(0.25rem + var(--bs-border-width)); padding-bottom: calc(0.25rem + var(--bs-border-width)); - font-size: 0.875rem; + font-size: 0.765625rem; } .form-text { @@ -2123,16 +2121,14 @@ progress { display: block; width: 100%; padding: 0.375rem 0.75rem; - font-size: 1rem; + font-size: 0.875rem; font-weight: 400; line-height: 1.5; color: var(--bs-body-color); background-color: var(--bs-body-bg); background-clip: padding-box; border: var(--bs-border-width) solid var(--bs-border-color); - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; + appearance: none; border-radius: var(--bs-border-radius); transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; } @@ -2163,10 +2159,6 @@ progress { display: block; padding: 0; } -.form-control::-moz-placeholder { - color: var(--bs-secondary-color); - opacity: 1; -} .form-control::placeholder { color: var(--bs-secondary-color); opacity: 1; @@ -2178,8 +2170,7 @@ progress { .form-control::file-selector-button { padding: 0.375rem 0.75rem; margin: -0.375rem -0.75rem; - -webkit-margin-end: 0.75rem; - margin-inline-end: 0.75rem; + margin-inline-end: 0.75rem; color: var(--bs-body-color); background-color: var(--bs-tertiary-bg); pointer-events: none; @@ -2221,27 +2212,25 @@ progress { .form-control-sm { min-height: calc(1.5em + 0.5rem + calc(var(--bs-border-width) * 2)); padding: 0.25rem 0.5rem; - font-size: 0.875rem; + font-size: 0.765625rem; border-radius: var(--bs-border-radius-sm); } .form-control-sm::file-selector-button { padding: 0.25rem 0.5rem; margin: -0.25rem -0.5rem; - -webkit-margin-end: 0.5rem; - margin-inline-end: 0.5rem; + margin-inline-end: 0.5rem; } .form-control-lg { min-height: calc(1.5em + 1rem + calc(var(--bs-border-width) * 2)); padding: 0.5rem 1rem; - font-size: 1.25rem; + font-size: 1.09375rem; border-radius: var(--bs-border-radius-lg); } .form-control-lg::file-selector-button { padding: 0.5rem 1rem; margin: -0.5rem -1rem; - -webkit-margin-end: 1rem; - margin-inline-end: 1rem; + margin-inline-end: 1rem; } textarea.form-control { @@ -2282,7 +2271,7 @@ textarea.form-control-lg { display: block; width: 100%; padding: 0.375rem 2.25rem 0.375rem 0.75rem; - font-size: 1rem; + font-size: 0.875rem; font-weight: 400; line-height: 1.5; color: var(--bs-body-color); @@ -2294,9 +2283,7 @@ textarea.form-control-lg { border: var(--bs-border-width) solid var(--bs-border-color); border-radius: var(--bs-border-radius); transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; + appearance: none; } @media (prefers-reduced-motion: reduce) { .form-select { @@ -2324,7 +2311,7 @@ textarea.form-control-lg { padding-top: 0.25rem; padding-bottom: 0.25rem; padding-left: 0.5rem; - font-size: 0.875rem; + font-size: 0.765625rem; border-radius: var(--bs-border-radius-sm); } @@ -2332,7 +2319,7 @@ textarea.form-control-lg { padding-top: 0.5rem; padding-bottom: 0.5rem; padding-left: 1rem; - font-size: 1.25rem; + font-size: 1.09375rem; border-radius: var(--bs-border-radius-lg); } @@ -2342,7 +2329,7 @@ textarea.form-control-lg { .form-check { display: block; - min-height: 1.5rem; + min-height: 1.3125rem; padding-left: 1.5em; margin-bottom: 0.125rem; } @@ -2374,11 +2361,8 @@ textarea.form-control-lg { background-position: center; background-size: contain; border: var(--bs-border-width) solid var(--bs-border-color); - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; - -webkit-print-color-adjust: exact; - print-color-adjust: exact; + appearance: none; + print-color-adjust: exact; } .form-check-input[type=checkbox] { border-radius: 0.25em; @@ -2477,9 +2461,7 @@ textarea.form-control-lg { height: 1.5rem; padding: 0; background-color: transparent; - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; + appearance: none; } .form-range:focus { outline: 0; @@ -2500,14 +2482,11 @@ textarea.form-control-lg { background-color: #f1641e; border: 0; border-radius: 1rem; - -webkit-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; - -webkit-appearance: none; - appearance: none; + appearance: none; } @media (prefers-reduced-motion: reduce) { .form-range::-webkit-slider-thumb { - -webkit-transition: none; transition: none; } } @@ -2529,14 +2508,11 @@ textarea.form-control-lg { background-color: #f1641e; border: 0; border-radius: 1rem; - -moz-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; - -moz-appearance: none; - appearance: none; + appearance: none; } @media (prefers-reduced-motion: reduce) { .form-range::-moz-range-thumb { - -moz-transition: none; transition: none; } } @@ -2597,17 +2573,10 @@ textarea.form-control-lg { .form-floating > .form-control-plaintext { padding: 1rem 0.75rem; } -.form-floating > .form-control::-moz-placeholder, .form-floating > .form-control-plaintext::-moz-placeholder { - color: transparent; -} .form-floating > .form-control::placeholder, .form-floating > .form-control-plaintext::placeholder { color: transparent; } -.form-floating > .form-control:not(:-moz-placeholder-shown), .form-floating > .form-control-plaintext:not(:-moz-placeholder-shown) { - padding-top: 1.625rem; - padding-bottom: 0.625rem; -} .form-floating > .form-control:focus, .form-floating > .form-control:not(:placeholder-shown), .form-floating > .form-control-plaintext:focus, .form-floating > .form-control-plaintext:not(:placeholder-shown) { @@ -2623,10 +2592,6 @@ textarea.form-control-lg { padding-top: 1.625rem; padding-bottom: 0.625rem; } -.form-floating > .form-control:not(:-moz-placeholder-shown) ~ label { - color: rgba(var(--bs-body-color-rgb), 0.65); - transform: scale(0.85) translateY(-0.5rem) translateX(0.15rem); -} .form-floating > .form-control:focus ~ label, .form-floating > .form-control:not(:placeholder-shown) ~ label, .form-floating > .form-control-plaintext ~ label, @@ -2634,15 +2599,6 @@ textarea.form-control-lg { color: rgba(var(--bs-body-color-rgb), 0.65); transform: scale(0.85) translateY(-0.5rem) translateX(0.15rem); } -.form-floating > .form-control:not(:-moz-placeholder-shown) ~ label::after { - position: absolute; - inset: 1rem 0.375rem; - z-index: -1; - height: 1.5em; - content: ""; - background-color: var(--bs-body-bg); - border-radius: var(--bs-border-radius); -} .form-floating > .form-control:focus ~ label::after, .form-floating > .form-control:not(:placeholder-shown) ~ label::after, .form-floating > .form-control-plaintext ~ label::after, @@ -2701,7 +2657,7 @@ textarea.form-control-lg { display: flex; align-items: center; padding: 0.375rem 0.75rem; - font-size: 1rem; + font-size: 0.875rem; font-weight: 400; line-height: 1.5; color: var(--bs-body-color); @@ -2717,7 +2673,7 @@ textarea.form-control-lg { .input-group-lg > .input-group-text, .input-group-lg > .btn { padding: 0.5rem 1rem; - font-size: 1.25rem; + font-size: 1.09375rem; border-radius: var(--bs-border-radius-lg); } @@ -2726,7 +2682,7 @@ textarea.form-control-lg { .input-group-sm > .input-group-text, .input-group-sm > .btn { padding: 0.25rem 0.5rem; - font-size: 0.875rem; + font-size: 0.765625rem; border-radius: var(--bs-border-radius-sm); } @@ -2776,7 +2732,7 @@ textarea.form-control-lg { max-width: 100%; padding: 0.25rem 0.5rem; margin-top: 0.1rem; - font-size: 0.875rem; + font-size: 0.765625rem; color: #fff; background-color: var(--bs-success); border-radius: var(--bs-border-radius); @@ -2866,7 +2822,7 @@ textarea.form-control-lg { max-width: 100%; padding: 0.25rem 0.5rem; margin-top: 0.1rem; - font-size: 0.875rem; + font-size: 0.765625rem; color: #fff; background-color: var(--bs-danger); border-radius: var(--bs-border-radius); @@ -2944,7 +2900,7 @@ textarea.form-control-lg { --bs-btn-padding-x: 0.75rem; --bs-btn-padding-y: 0.375rem; --bs-btn-font-family: ; - --bs-btn-font-size: 1rem; + --bs-btn-font-size: 0.875rem; --bs-btn-font-weight: 400; --bs-btn-line-height: 1.5; --bs-btn-color: var(--bs-body-color); @@ -2966,9 +2922,7 @@ textarea.form-control-lg { text-align: center; vertical-align: middle; cursor: pointer; - -webkit-user-select: none; - -moz-user-select: none; - user-select: none; + user-select: none; border: var(--bs-btn-border-width) solid var(--bs-btn-border-color); border-radius: var(--bs-btn-border-radius); background-color: var(--bs-btn-bg); @@ -3314,14 +3268,14 @@ textarea.form-control-lg { .btn-lg, .btn-group-lg > .btn { --bs-btn-padding-y: 0.5rem; --bs-btn-padding-x: 1rem; - --bs-btn-font-size: 1.25rem; + --bs-btn-font-size: 1.09375rem; --bs-btn-border-radius: var(--bs-border-radius-lg); } .btn-sm, .btn-group-sm > .btn { --bs-btn-padding-y: 0.25rem; --bs-btn-padding-x: 0.5rem; - --bs-btn-font-size: 0.875rem; + --bs-btn-font-size: 0.765625rem; --bs-btn-border-radius: var(--bs-border-radius-sm); } @@ -3394,7 +3348,7 @@ textarea.form-control-lg { --bs-dropdown-padding-x: 0; --bs-dropdown-padding-y: 0.5rem; --bs-dropdown-spacer: 0.125rem; - --bs-dropdown-font-size: 1rem; + --bs-dropdown-font-size: 0.875rem; --bs-dropdown-color: var(--bs-body-color); --bs-dropdown-bg: var(--bs-body-bg); --bs-dropdown-border-color: var(--bs-border-color-translucent); @@ -3652,7 +3606,7 @@ textarea.form-control-lg { display: block; padding: var(--bs-dropdown-header-padding-y) var(--bs-dropdown-header-padding-x); margin-bottom: 0; - font-size: 0.875rem; + font-size: 0.765625rem; color: var(--bs-dropdown-header-color); white-space: nowrap; } @@ -3929,15 +3883,15 @@ textarea.form-control-lg { --bs-navbar-hover-color: #212529; --bs-navbar-disabled-color: rgba(var(--bs-emphasis-color-rgb), 0.3); --bs-navbar-active-color: #212529; - --bs-navbar-brand-padding-y: 0.3125rem; + --bs-navbar-brand-padding-y: 0.3359375rem; --bs-navbar-brand-margin-end: 1rem; - --bs-navbar-brand-font-size: 1.25rem; + --bs-navbar-brand-font-size: 1.09375rem; --bs-navbar-brand-color: #212529; --bs-navbar-brand-hover-color: #212529; --bs-navbar-nav-link-padding-x: 0.5rem; --bs-navbar-toggler-padding-y: 0.25rem; --bs-navbar-toggler-padding-x: 0.75rem; - --bs-navbar-toggler-font-size: 1.25rem; + --bs-navbar-toggler-font-size: 1.09375rem; --bs-navbar-toggler-icon-bg: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%2873, 80, 87, 0.75%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e"); --bs-navbar-toggler-border-color: rgba(var(--bs-emphasis-color-rgb), 0.15); --bs-navbar-toggler-border-radius: var(--bs-border-radius); @@ -4562,7 +4516,7 @@ textarea.form-control-lg { align-items: center; width: 100%; padding: var(--bs-accordion-btn-padding-y) var(--bs-accordion-btn-padding-x); - font-size: 1rem; + font-size: 0.875rem; color: var(--bs-accordion-btn-color); text-align: left; background-color: var(--bs-accordion-btn-bg); @@ -4706,7 +4660,7 @@ textarea.form-control-lg { .pagination { --bs-pagination-padding-x: 0.75rem; --bs-pagination-padding-y: 0.375rem; - --bs-pagination-font-size: 1rem; + --bs-pagination-font-size: 0.875rem; --bs-pagination-color: var(--bs-link-color); --bs-pagination-bg: var(--bs-body-bg); --bs-pagination-border-width: var(--bs-border-width); @@ -4785,14 +4739,14 @@ textarea.form-control-lg { .pagination-lg { --bs-pagination-padding-x: 1.5rem; --bs-pagination-padding-y: 0.75rem; - --bs-pagination-font-size: 1.25rem; + --bs-pagination-font-size: 1.09375rem; --bs-pagination-border-radius: var(--bs-border-radius-lg); } .pagination-sm { --bs-pagination-padding-x: 0.5rem; --bs-pagination-padding-y: 0.25rem; - --bs-pagination-font-size: 0.875rem; + --bs-pagination-font-size: 0.765625rem; --bs-pagination-border-radius: var(--bs-border-radius-sm); } @@ -4926,7 +4880,7 @@ textarea.form-control-lg { .progress, .progress-stacked { --bs-progress-height: 1rem; - --bs-progress-font-size: 0.75rem; + --bs-progress-font-size: 0.65625rem; --bs-progress-bg: var(--bs-secondary-bg); --bs-progress-border-radius: var(--bs-border-radius); --bs-progress-box-shadow: var(--bs-box-shadow-inset); @@ -5353,9 +5307,7 @@ textarea.form-control-lg { } .btn-close:disabled, .btn-close.disabled { pointer-events: none; - -webkit-user-select: none; - -moz-user-select: none; - user-select: none; + user-select: none; opacity: var(--bs-btn-close-disabled-opacity); } @@ -5405,7 +5357,6 @@ textarea.form-control-lg { --bs-toast-zindex: 1090; position: absolute; z-index: var(--bs-toast-zindex); - width: -moz-max-content; width: max-content; max-width: 100%; pointer-events: none; @@ -5733,7 +5684,7 @@ textarea.form-control-lg { --bs-tooltip-padding-x: 0.5rem; --bs-tooltip-padding-y: 0.25rem; --bs-tooltip-margin: ; - --bs-tooltip-font-size: 0.875rem; + --bs-tooltip-font-size: 0.765625rem; --bs-tooltip-color: var(--bs-body-bg); --bs-tooltip-bg: var(--bs-emphasis-color); --bs-tooltip-border-radius: var(--bs-border-radius); @@ -5832,7 +5783,7 @@ textarea.form-control-lg { .popover { --bs-popover-zindex: 1070; --bs-popover-max-width: 276px; - --bs-popover-font-size: 0.875rem; + --bs-popover-font-size: 0.765625rem; --bs-popover-bg: var(--bs-body-bg); --bs-popover-border-width: var(--bs-border-width); --bs-popover-border-color: var(--bs-border-color-translucent); @@ -5841,7 +5792,7 @@ textarea.form-control-lg { --bs-popover-box-shadow: 0 0.5rem 1rem rgba(34, 34, 34, 0.15); --bs-popover-header-padding-x: 1rem; --bs-popover-header-padding-y: 0.5rem; - --bs-popover-header-font-size: 1rem; + --bs-popover-header-font-size: 0.875rem; --bs-popover-header-color: #495057; --bs-popover-header-bg: var(--bs-secondary-bg); --bs-popover-body-padding-x: 1rem; @@ -6306,8 +6257,6 @@ textarea.form-control-lg { border-right: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateX(-100%); } -} -@media (max-width: 575.98px) { .offcanvas-sm.offcanvas-end { top: 0; right: 0; @@ -6315,8 +6264,6 @@ textarea.form-control-lg { border-left: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateX(100%); } -} -@media (max-width: 575.98px) { .offcanvas-sm.offcanvas-top { top: 0; right: 0; @@ -6326,8 +6273,6 @@ textarea.form-control-lg { border-bottom: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateY(-100%); } -} -@media (max-width: 575.98px) { .offcanvas-sm.offcanvas-bottom { right: 0; left: 0; @@ -6336,13 +6281,9 @@ textarea.form-control-lg { border-top: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateY(100%); } -} -@media (max-width: 575.98px) { .offcanvas-sm.showing, .offcanvas-sm.show:not(.hiding) { transform: none; } -} -@media (max-width: 575.98px) { .offcanvas-sm.showing, .offcanvas-sm.hiding, .offcanvas-sm.show { visibility: visible; } @@ -6394,8 +6335,6 @@ textarea.form-control-lg { border-right: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateX(-100%); } -} -@media (max-width: 767.98px) { .offcanvas-md.offcanvas-end { top: 0; right: 0; @@ -6403,8 +6342,6 @@ textarea.form-control-lg { border-left: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateX(100%); } -} -@media (max-width: 767.98px) { .offcanvas-md.offcanvas-top { top: 0; right: 0; @@ -6414,8 +6351,6 @@ textarea.form-control-lg { border-bottom: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateY(-100%); } -} -@media (max-width: 767.98px) { .offcanvas-md.offcanvas-bottom { right: 0; left: 0; @@ -6424,13 +6359,9 @@ textarea.form-control-lg { border-top: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateY(100%); } -} -@media (max-width: 767.98px) { .offcanvas-md.showing, .offcanvas-md.show:not(.hiding) { transform: none; } -} -@media (max-width: 767.98px) { .offcanvas-md.showing, .offcanvas-md.hiding, .offcanvas-md.show { visibility: visible; } @@ -6482,8 +6413,6 @@ textarea.form-control-lg { border-right: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateX(-100%); } -} -@media (max-width: 991.98px) { .offcanvas-lg.offcanvas-end { top: 0; right: 0; @@ -6491,8 +6420,6 @@ textarea.form-control-lg { border-left: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateX(100%); } -} -@media (max-width: 991.98px) { .offcanvas-lg.offcanvas-top { top: 0; right: 0; @@ -6502,8 +6429,6 @@ textarea.form-control-lg { border-bottom: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateY(-100%); } -} -@media (max-width: 991.98px) { .offcanvas-lg.offcanvas-bottom { right: 0; left: 0; @@ -6512,13 +6437,9 @@ textarea.form-control-lg { border-top: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateY(100%); } -} -@media (max-width: 991.98px) { .offcanvas-lg.showing, .offcanvas-lg.show:not(.hiding) { transform: none; } -} -@media (max-width: 991.98px) { .offcanvas-lg.showing, .offcanvas-lg.hiding, .offcanvas-lg.show { visibility: visible; } @@ -6570,8 +6491,6 @@ textarea.form-control-lg { border-right: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateX(-100%); } -} -@media (max-width: 1199.98px) { .offcanvas-xl.offcanvas-end { top: 0; right: 0; @@ -6579,8 +6498,6 @@ textarea.form-control-lg { border-left: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateX(100%); } -} -@media (max-width: 1199.98px) { .offcanvas-xl.offcanvas-top { top: 0; right: 0; @@ -6590,8 +6507,6 @@ textarea.form-control-lg { border-bottom: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateY(-100%); } -} -@media (max-width: 1199.98px) { .offcanvas-xl.offcanvas-bottom { right: 0; left: 0; @@ -6600,13 +6515,9 @@ textarea.form-control-lg { border-top: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateY(100%); } -} -@media (max-width: 1199.98px) { .offcanvas-xl.showing, .offcanvas-xl.show:not(.hiding) { transform: none; } -} -@media (max-width: 1199.98px) { .offcanvas-xl.showing, .offcanvas-xl.hiding, .offcanvas-xl.show { visibility: visible; } @@ -6658,8 +6569,6 @@ textarea.form-control-lg { border-right: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateX(-100%); } -} -@media (max-width: 1399.98px) { .offcanvas-xxl.offcanvas-end { top: 0; right: 0; @@ -6667,8 +6576,6 @@ textarea.form-control-lg { border-left: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateX(100%); } -} -@media (max-width: 1399.98px) { .offcanvas-xxl.offcanvas-top { top: 0; right: 0; @@ -6678,8 +6585,6 @@ textarea.form-control-lg { border-bottom: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateY(-100%); } -} -@media (max-width: 1399.98px) { .offcanvas-xxl.offcanvas-bottom { right: 0; left: 0; @@ -6688,13 +6593,9 @@ textarea.form-control-lg { border-top: var(--bs-offcanvas-border-width) solid var(--bs-offcanvas-border-color); transform: translateY(100%); } -} -@media (max-width: 1399.98px) { .offcanvas-xxl.showing, .offcanvas-xxl.show:not(.hiding) { transform: none; } -} -@media (max-width: 1399.98px) { .offcanvas-xxl.showing, .offcanvas-xxl.hiding, .offcanvas-xxl.show { visibility: visible; } @@ -6849,17 +6750,14 @@ textarea.form-control-lg { } } .placeholder-wave { - -webkit-mask-image: linear-gradient(130deg, #222 55%, rgba(0, 0, 0, 0.8) 75%, #222 95%); - mask-image: linear-gradient(130deg, #222 55%, rgba(0, 0, 0, 0.8) 75%, #222 95%); - -webkit-mask-size: 200% 100%; - mask-size: 200% 100%; + mask-image: linear-gradient(130deg, #222 55%, rgba(0, 0, 0, 0.8) 75%, #222 95%); + mask-size: 200% 100%; animation: placeholder-wave 2s linear infinite; } @keyframes placeholder-wave { 100% { - -webkit-mask-position: -200% 0%; - mask-position: -200% 0%; + mask-position: -200% 0%; } } .clearfix::after { @@ -7232,28 +7130,23 @@ textarea.form-control-lg { } .object-fit-contain { - -o-object-fit: contain !important; - object-fit: contain !important; + object-fit: contain !important; } .object-fit-cover { - -o-object-fit: cover !important; - object-fit: cover !important; + object-fit: cover !important; } .object-fit-fill { - -o-object-fit: fill !important; - object-fit: fill !important; + object-fit: fill !important; } .object-fit-scale { - -o-object-fit: scale-down !important; - object-fit: scale-down !important; + object-fit: scale-down !important; } .object-fit-none { - -o-object-fit: none !important; - object-fit: none !important; + object-fit: none !important; } .opacity-0 { @@ -8333,33 +8226,27 @@ textarea.form-control-lg { } .column-gap-0 { - -moz-column-gap: 0 !important; - column-gap: 0 !important; + column-gap: 0 !important; } .column-gap-1 { - -moz-column-gap: 0.25rem !important; - column-gap: 0.25rem !important; + column-gap: 0.25rem !important; } .column-gap-2 { - -moz-column-gap: 0.5rem !important; - column-gap: 0.5rem !important; + column-gap: 0.5rem !important; } .column-gap-3 { - -moz-column-gap: 1rem !important; - column-gap: 1rem !important; + column-gap: 1rem !important; } .column-gap-4 { - -moz-column-gap: 1.5rem !important; - column-gap: 1.5rem !important; + column-gap: 1.5rem !important; } .column-gap-5 { - -moz-column-gap: 3rem !important; - column-gap: 3rem !important; + column-gap: 3rem !important; } .font-monospace { @@ -8367,27 +8254,27 @@ textarea.form-control-lg { } .fs-1 { - font-size: calc(1.375rem + 1.5vw) !important; + font-size: calc(1.34375rem + 1.125vw) !important; } .fs-2 { - font-size: calc(1.325rem + 0.9vw) !important; -} - -.fs-3 { font-size: calc(1.3rem + 0.6vw) !important; } +.fs-3 { + font-size: calc(1.278125rem + 0.3375vw) !important; +} + .fs-4 { - font-size: calc(1.275rem + 0.3vw) !important; + font-size: calc(1.25625rem + 0.075vw) !important; } .fs-5 { - font-size: 1.25rem !important; + font-size: 1.09375rem !important; } .fs-6 { - font-size: 1rem !important; + font-size: 0.875rem !important; } .fst-italic { @@ -8915,21 +8802,15 @@ textarea.form-control-lg { } .user-select-all { - -webkit-user-select: all !important; - -moz-user-select: all !important; - user-select: all !important; + user-select: all !important; } .user-select-auto { - -webkit-user-select: auto !important; - -moz-user-select: auto !important; - user-select: auto !important; + user-select: auto !important; } .user-select-none { - -webkit-user-select: none !important; - -moz-user-select: none !important; - user-select: none !important; + user-select: none !important; } .pe-none { @@ -9195,24 +9076,19 @@ textarea.form-control-lg { float: none !important; } .object-fit-sm-contain { - -o-object-fit: contain !important; - object-fit: contain !important; + object-fit: contain !important; } .object-fit-sm-cover { - -o-object-fit: cover !important; - object-fit: cover !important; + object-fit: cover !important; } .object-fit-sm-fill { - -o-object-fit: fill !important; - object-fit: fill !important; + object-fit: fill !important; } .object-fit-sm-scale { - -o-object-fit: scale-down !important; - object-fit: scale-down !important; + object-fit: scale-down !important; } .object-fit-sm-none { - -o-object-fit: none !important; - object-fit: none !important; + object-fit: none !important; } .d-sm-inline { display: inline !important; @@ -9712,28 +9588,22 @@ textarea.form-control-lg { row-gap: 3rem !important; } .column-gap-sm-0 { - -moz-column-gap: 0 !important; - column-gap: 0 !important; + column-gap: 0 !important; } .column-gap-sm-1 { - -moz-column-gap: 0.25rem !important; - column-gap: 0.25rem !important; + column-gap: 0.25rem !important; } .column-gap-sm-2 { - -moz-column-gap: 0.5rem !important; - column-gap: 0.5rem !important; + column-gap: 0.5rem !important; } .column-gap-sm-3 { - -moz-column-gap: 1rem !important; - column-gap: 1rem !important; + column-gap: 1rem !important; } .column-gap-sm-4 { - -moz-column-gap: 1.5rem !important; - column-gap: 1.5rem !important; + column-gap: 1.5rem !important; } .column-gap-sm-5 { - -moz-column-gap: 3rem !important; - column-gap: 3rem !important; + column-gap: 3rem !important; } .text-sm-start { text-align: left !important; @@ -9756,24 +9626,19 @@ textarea.form-control-lg { float: none !important; } .object-fit-md-contain { - -o-object-fit: contain !important; - object-fit: contain !important; + object-fit: contain !important; } .object-fit-md-cover { - -o-object-fit: cover !important; - object-fit: cover !important; + object-fit: cover !important; } .object-fit-md-fill { - -o-object-fit: fill !important; - object-fit: fill !important; + object-fit: fill !important; } .object-fit-md-scale { - -o-object-fit: scale-down !important; - object-fit: scale-down !important; + object-fit: scale-down !important; } .object-fit-md-none { - -o-object-fit: none !important; - object-fit: none !important; + object-fit: none !important; } .d-md-inline { display: inline !important; @@ -10273,28 +10138,22 @@ textarea.form-control-lg { row-gap: 3rem !important; } .column-gap-md-0 { - -moz-column-gap: 0 !important; - column-gap: 0 !important; + column-gap: 0 !important; } .column-gap-md-1 { - -moz-column-gap: 0.25rem !important; - column-gap: 0.25rem !important; + column-gap: 0.25rem !important; } .column-gap-md-2 { - -moz-column-gap: 0.5rem !important; - column-gap: 0.5rem !important; + column-gap: 0.5rem !important; } .column-gap-md-3 { - -moz-column-gap: 1rem !important; - column-gap: 1rem !important; + column-gap: 1rem !important; } .column-gap-md-4 { - -moz-column-gap: 1.5rem !important; - column-gap: 1.5rem !important; + column-gap: 1.5rem !important; } .column-gap-md-5 { - -moz-column-gap: 3rem !important; - column-gap: 3rem !important; + column-gap: 3rem !important; } .text-md-start { text-align: left !important; @@ -10317,24 +10176,19 @@ textarea.form-control-lg { float: none !important; } .object-fit-lg-contain { - -o-object-fit: contain !important; - object-fit: contain !important; + object-fit: contain !important; } .object-fit-lg-cover { - -o-object-fit: cover !important; - object-fit: cover !important; + object-fit: cover !important; } .object-fit-lg-fill { - -o-object-fit: fill !important; - object-fit: fill !important; + object-fit: fill !important; } .object-fit-lg-scale { - -o-object-fit: scale-down !important; - object-fit: scale-down !important; + object-fit: scale-down !important; } .object-fit-lg-none { - -o-object-fit: none !important; - object-fit: none !important; + object-fit: none !important; } .d-lg-inline { display: inline !important; @@ -10834,28 +10688,22 @@ textarea.form-control-lg { row-gap: 3rem !important; } .column-gap-lg-0 { - -moz-column-gap: 0 !important; - column-gap: 0 !important; + column-gap: 0 !important; } .column-gap-lg-1 { - -moz-column-gap: 0.25rem !important; - column-gap: 0.25rem !important; + column-gap: 0.25rem !important; } .column-gap-lg-2 { - -moz-column-gap: 0.5rem !important; - column-gap: 0.5rem !important; + column-gap: 0.5rem !important; } .column-gap-lg-3 { - -moz-column-gap: 1rem !important; - column-gap: 1rem !important; + column-gap: 1rem !important; } .column-gap-lg-4 { - -moz-column-gap: 1.5rem !important; - column-gap: 1.5rem !important; + column-gap: 1.5rem !important; } .column-gap-lg-5 { - -moz-column-gap: 3rem !important; - column-gap: 3rem !important; + column-gap: 3rem !important; } .text-lg-start { text-align: left !important; @@ -10878,24 +10726,19 @@ textarea.form-control-lg { float: none !important; } .object-fit-xl-contain { - -o-object-fit: contain !important; - object-fit: contain !important; + object-fit: contain !important; } .object-fit-xl-cover { - -o-object-fit: cover !important; - object-fit: cover !important; + object-fit: cover !important; } .object-fit-xl-fill { - -o-object-fit: fill !important; - object-fit: fill !important; + object-fit: fill !important; } .object-fit-xl-scale { - -o-object-fit: scale-down !important; - object-fit: scale-down !important; + object-fit: scale-down !important; } .object-fit-xl-none { - -o-object-fit: none !important; - object-fit: none !important; + object-fit: none !important; } .d-xl-inline { display: inline !important; @@ -11395,28 +11238,22 @@ textarea.form-control-lg { row-gap: 3rem !important; } .column-gap-xl-0 { - -moz-column-gap: 0 !important; - column-gap: 0 !important; + column-gap: 0 !important; } .column-gap-xl-1 { - -moz-column-gap: 0.25rem !important; - column-gap: 0.25rem !important; + column-gap: 0.25rem !important; } .column-gap-xl-2 { - -moz-column-gap: 0.5rem !important; - column-gap: 0.5rem !important; + column-gap: 0.5rem !important; } .column-gap-xl-3 { - -moz-column-gap: 1rem !important; - column-gap: 1rem !important; + column-gap: 1rem !important; } .column-gap-xl-4 { - -moz-column-gap: 1.5rem !important; - column-gap: 1.5rem !important; + column-gap: 1.5rem !important; } .column-gap-xl-5 { - -moz-column-gap: 3rem !important; - column-gap: 3rem !important; + column-gap: 3rem !important; } .text-xl-start { text-align: left !important; @@ -11439,24 +11276,19 @@ textarea.form-control-lg { float: none !important; } .object-fit-xxl-contain { - -o-object-fit: contain !important; - object-fit: contain !important; + object-fit: contain !important; } .object-fit-xxl-cover { - -o-object-fit: cover !important; - object-fit: cover !important; + object-fit: cover !important; } .object-fit-xxl-fill { - -o-object-fit: fill !important; - object-fit: fill !important; + object-fit: fill !important; } .object-fit-xxl-scale { - -o-object-fit: scale-down !important; - object-fit: scale-down !important; + object-fit: scale-down !important; } .object-fit-xxl-none { - -o-object-fit: none !important; - object-fit: none !important; + object-fit: none !important; } .d-xxl-inline { display: inline !important; @@ -11956,28 +11788,22 @@ textarea.form-control-lg { row-gap: 3rem !important; } .column-gap-xxl-0 { - -moz-column-gap: 0 !important; - column-gap: 0 !important; + column-gap: 0 !important; } .column-gap-xxl-1 { - -moz-column-gap: 0.25rem !important; - column-gap: 0.25rem !important; + column-gap: 0.25rem !important; } .column-gap-xxl-2 { - -moz-column-gap: 0.5rem !important; - column-gap: 0.5rem !important; + column-gap: 0.5rem !important; } .column-gap-xxl-3 { - -moz-column-gap: 1rem !important; - column-gap: 1rem !important; + column-gap: 1rem !important; } .column-gap-xxl-4 { - -moz-column-gap: 1.5rem !important; - column-gap: 1.5rem !important; + column-gap: 1.5rem !important; } .column-gap-xxl-5 { - -moz-column-gap: 3rem !important; - column-gap: 3rem !important; + column-gap: 3rem !important; } .text-xxl-start { text-align: left !important; @@ -11991,16 +11817,16 @@ textarea.form-control-lg { } @media (min-width: 1200px) { .fs-1 { - font-size: 2.5rem !important; + font-size: 2.1875rem !important; } .fs-2 { - font-size: 2rem !important; - } - .fs-3 { font-size: 1.75rem !important; } + .fs-3 { + font-size: 1.53125rem !important; + } .fs-4 { - font-size: 1.5rem !important; + font-size: 1.3125rem !important; } } @media print { @@ -12037,4 +11863,6 @@ textarea.form-control-lg { .d-print-none { display: none !important; } -}/*# sourceMappingURL=litely-compact.css.map */ \ No newline at end of file +} + +/*# sourceMappingURL=litely-compact.css.map */ diff --git a/src/assets/css/themes/litely-red.css b/src/assets/css/themes/litely-red.css index ba1a7f88..d620d189 100644 --- a/src/assets/css/themes/litely-red.css +++ b/src/assets/css/themes/litely-red.css @@ -75,7 +75,7 @@ --bs-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; --bs-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0)); --bs-body-font-family: var(--bs-font-sans-serif); - --bs-body-font-size: 1rem; + --bs-body-font-size: 0.875rem; --bs-body-font-weight: 400; --bs-body-line-height: 1.5; --bs-body-color: #495057; @@ -220,47 +220,47 @@ h6, .h6, h5, .h5, h4, .h4, h3, .h3, h2, .h2, h1, .h1 { } h1, .h1 { - font-size: calc(1.375rem + 1.5vw); + font-size: calc(1.34375rem + 1.125vw); } @media (min-width: 1200px) { h1, .h1 { - font-size: 2.5rem; + font-size: 2.1875rem; } } h2, .h2 { - font-size: calc(1.325rem + 0.9vw); -} -@media (min-width: 1200px) { - h2, .h2 { - font-size: 2rem; - } -} - -h3, .h3 { font-size: calc(1.3rem + 0.6vw); } @media (min-width: 1200px) { - h3, .h3 { + h2, .h2 { font-size: 1.75rem; } } +h3, .h3 { + font-size: calc(1.278125rem + 0.3375vw); +} +@media (min-width: 1200px) { + h3, .h3 { + font-size: 1.53125rem; + } +} + h4, .h4 { - font-size: calc(1.275rem + 0.3vw); + font-size: calc(1.25625rem + 0.075vw); } @media (min-width: 1200px) { h4, .h4 { - font-size: 1.5rem; + font-size: 1.3125rem; } } h5, .h5 { - font-size: 1.25rem; + font-size: 1.09375rem; } h6, .h6 { - font-size: 1rem; + font-size: 0.875rem; } p { @@ -585,7 +585,7 @@ progress { } .lead { - font-size: 1.25rem; + font-size: 1.09375rem; font-weight: 300; } @@ -679,7 +679,7 @@ progress { .blockquote { margin-bottom: 1rem; - font-size: 1.25rem; + font-size: 1.09375rem; } .blockquote > :last-child { margin-bottom: 0; @@ -2062,13 +2062,13 @@ progress { .col-form-label-lg { padding-top: calc(0.5rem + var(--bs-border-width)); padding-bottom: calc(0.5rem + var(--bs-border-width)); - font-size: 1.25rem; + font-size: 1.09375rem; } .col-form-label-sm { padding-top: calc(0.25rem + var(--bs-border-width)); padding-bottom: calc(0.25rem + var(--bs-border-width)); - font-size: 0.875rem; + font-size: 0.765625rem; } .form-text { @@ -2081,7 +2081,7 @@ progress { display: block; width: 100%; padding: 0.375rem 0.75rem; - font-size: 1rem; + font-size: 0.875rem; font-weight: 400; line-height: 1.5; color: var(--bs-body-color); @@ -2172,7 +2172,7 @@ progress { .form-control-sm { min-height: calc(1.5em + 0.5rem + calc(var(--bs-border-width) * 2)); padding: 0.25rem 0.5rem; - font-size: 0.875rem; + font-size: 0.765625rem; border-radius: var(--bs-border-radius-sm); } .form-control-sm::file-selector-button { @@ -2184,7 +2184,7 @@ progress { .form-control-lg { min-height: calc(1.5em + 1rem + calc(var(--bs-border-width) * 2)); padding: 0.5rem 1rem; - font-size: 1.25rem; + font-size: 1.09375rem; border-radius: var(--bs-border-radius-lg); } .form-control-lg::file-selector-button { @@ -2231,7 +2231,7 @@ textarea.form-control-lg { display: block; width: 100%; padding: 0.375rem 2.25rem 0.375rem 0.75rem; - font-size: 1rem; + font-size: 0.875rem; font-weight: 400; line-height: 1.5; color: var(--bs-body-color); @@ -2271,7 +2271,7 @@ textarea.form-control-lg { padding-top: 0.25rem; padding-bottom: 0.25rem; padding-left: 0.5rem; - font-size: 0.875rem; + font-size: 0.765625rem; border-radius: var(--bs-border-radius-sm); } @@ -2279,7 +2279,7 @@ textarea.form-control-lg { padding-top: 0.5rem; padding-bottom: 0.5rem; padding-left: 1rem; - font-size: 1.25rem; + font-size: 1.09375rem; border-radius: var(--bs-border-radius-lg); } @@ -2289,7 +2289,7 @@ textarea.form-control-lg { .form-check { display: block; - min-height: 1.5rem; + min-height: 1.3125rem; padding-left: 1.5em; margin-bottom: 0.125rem; } @@ -2617,7 +2617,7 @@ textarea.form-control-lg { display: flex; align-items: center; padding: 0.375rem 0.75rem; - font-size: 1rem; + font-size: 0.875rem; font-weight: 400; line-height: 1.5; color: var(--bs-body-color); @@ -2633,7 +2633,7 @@ textarea.form-control-lg { .input-group-lg > .input-group-text, .input-group-lg > .btn { padding: 0.5rem 1rem; - font-size: 1.25rem; + font-size: 1.09375rem; border-radius: var(--bs-border-radius-lg); } @@ -2642,7 +2642,7 @@ textarea.form-control-lg { .input-group-sm > .input-group-text, .input-group-sm > .btn { padding: 0.25rem 0.5rem; - font-size: 0.875rem; + font-size: 0.765625rem; border-radius: var(--bs-border-radius-sm); } @@ -2692,7 +2692,7 @@ textarea.form-control-lg { max-width: 100%; padding: 0.25rem 0.5rem; margin-top: 0.1rem; - font-size: 0.875rem; + font-size: 0.765625rem; color: #fff; background-color: var(--bs-success); border-radius: var(--bs-border-radius); @@ -2782,7 +2782,7 @@ textarea.form-control-lg { max-width: 100%; padding: 0.25rem 0.5rem; margin-top: 0.1rem; - font-size: 0.875rem; + font-size: 0.765625rem; color: #fff; background-color: var(--bs-danger); border-radius: var(--bs-border-radius); @@ -2860,7 +2860,7 @@ textarea.form-control-lg { --bs-btn-padding-x: 0.75rem; --bs-btn-padding-y: 0.375rem; --bs-btn-font-family: ; - --bs-btn-font-size: 1rem; + --bs-btn-font-size: 0.875rem; --bs-btn-font-weight: 400; --bs-btn-line-height: 1.5; --bs-btn-color: var(--bs-body-color); @@ -3228,14 +3228,14 @@ textarea.form-control-lg { .btn-lg, .btn-group-lg > .btn { --bs-btn-padding-y: 0.5rem; --bs-btn-padding-x: 1rem; - --bs-btn-font-size: 1.25rem; + --bs-btn-font-size: 1.09375rem; --bs-btn-border-radius: var(--bs-border-radius-lg); } .btn-sm, .btn-group-sm > .btn { --bs-btn-padding-y: 0.25rem; --bs-btn-padding-x: 0.5rem; - --bs-btn-font-size: 0.875rem; + --bs-btn-font-size: 0.765625rem; --bs-btn-border-radius: var(--bs-border-radius-sm); } @@ -3308,7 +3308,7 @@ textarea.form-control-lg { --bs-dropdown-padding-x: 0; --bs-dropdown-padding-y: 0.5rem; --bs-dropdown-spacer: 0.125rem; - --bs-dropdown-font-size: 1rem; + --bs-dropdown-font-size: 0.875rem; --bs-dropdown-color: var(--bs-body-color); --bs-dropdown-bg: var(--bs-body-bg); --bs-dropdown-border-color: var(--bs-border-color-translucent); @@ -3566,7 +3566,7 @@ textarea.form-control-lg { display: block; padding: var(--bs-dropdown-header-padding-y) var(--bs-dropdown-header-padding-x); margin-bottom: 0; - font-size: 0.875rem; + font-size: 0.765625rem; color: var(--bs-dropdown-header-color); white-space: nowrap; } @@ -3843,15 +3843,15 @@ textarea.form-control-lg { --bs-navbar-hover-color: #212529; --bs-navbar-disabled-color: rgba(var(--bs-emphasis-color-rgb), 0.3); --bs-navbar-active-color: #212529; - --bs-navbar-brand-padding-y: 0.3125rem; + --bs-navbar-brand-padding-y: 0.3359375rem; --bs-navbar-brand-margin-end: 1rem; - --bs-navbar-brand-font-size: 1.25rem; + --bs-navbar-brand-font-size: 1.09375rem; --bs-navbar-brand-color: #212529; --bs-navbar-brand-hover-color: #212529; --bs-navbar-nav-link-padding-x: 0.5rem; --bs-navbar-toggler-padding-y: 0.25rem; --bs-navbar-toggler-padding-x: 0.75rem; - --bs-navbar-toggler-font-size: 1.25rem; + --bs-navbar-toggler-font-size: 1.09375rem; --bs-navbar-toggler-icon-bg: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%2873, 80, 87, 0.75%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e"); --bs-navbar-toggler-border-color: rgba(var(--bs-emphasis-color-rgb), 0.15); --bs-navbar-toggler-border-radius: var(--bs-border-radius); @@ -4476,7 +4476,7 @@ textarea.form-control-lg { align-items: center; width: 100%; padding: var(--bs-accordion-btn-padding-y) var(--bs-accordion-btn-padding-x); - font-size: 1rem; + font-size: 0.875rem; color: var(--bs-accordion-btn-color); text-align: left; background-color: var(--bs-accordion-btn-bg); @@ -4620,7 +4620,7 @@ textarea.form-control-lg { .pagination { --bs-pagination-padding-x: 0.75rem; --bs-pagination-padding-y: 0.375rem; - --bs-pagination-font-size: 1rem; + --bs-pagination-font-size: 0.875rem; --bs-pagination-color: var(--bs-link-color); --bs-pagination-bg: var(--bs-body-bg); --bs-pagination-border-width: var(--bs-border-width); @@ -4699,14 +4699,14 @@ textarea.form-control-lg { .pagination-lg { --bs-pagination-padding-x: 1.5rem; --bs-pagination-padding-y: 0.75rem; - --bs-pagination-font-size: 1.25rem; + --bs-pagination-font-size: 1.09375rem; --bs-pagination-border-radius: var(--bs-border-radius-lg); } .pagination-sm { --bs-pagination-padding-x: 0.5rem; --bs-pagination-padding-y: 0.25rem; - --bs-pagination-font-size: 0.875rem; + --bs-pagination-font-size: 0.765625rem; --bs-pagination-border-radius: var(--bs-border-radius-sm); } @@ -4840,7 +4840,7 @@ textarea.form-control-lg { .progress, .progress-stacked { --bs-progress-height: 1rem; - --bs-progress-font-size: 0.75rem; + --bs-progress-font-size: 0.65625rem; --bs-progress-bg: var(--bs-secondary-bg); --bs-progress-border-radius: var(--bs-border-radius); --bs-progress-box-shadow: var(--bs-box-shadow-inset); @@ -5644,7 +5644,7 @@ textarea.form-control-lg { --bs-tooltip-padding-x: 0.5rem; --bs-tooltip-padding-y: 0.25rem; --bs-tooltip-margin: ; - --bs-tooltip-font-size: 0.875rem; + --bs-tooltip-font-size: 0.765625rem; --bs-tooltip-color: var(--bs-body-bg); --bs-tooltip-bg: var(--bs-emphasis-color); --bs-tooltip-border-radius: var(--bs-border-radius); @@ -5743,7 +5743,7 @@ textarea.form-control-lg { .popover { --bs-popover-zindex: 1070; --bs-popover-max-width: 276px; - --bs-popover-font-size: 0.875rem; + --bs-popover-font-size: 0.765625rem; --bs-popover-bg: var(--bs-body-bg); --bs-popover-border-width: var(--bs-border-width); --bs-popover-border-color: var(--bs-border-color-translucent); @@ -5752,7 +5752,7 @@ textarea.form-control-lg { --bs-popover-box-shadow: 0 0.5rem 1rem rgba(34, 34, 34, 0.15); --bs-popover-header-padding-x: 1rem; --bs-popover-header-padding-y: 0.5rem; - --bs-popover-header-font-size: 1rem; + --bs-popover-header-font-size: 0.875rem; --bs-popover-header-color: #495057; --bs-popover-header-bg: var(--bs-secondary-bg); --bs-popover-body-padding-x: 1rem; @@ -8214,27 +8214,27 @@ textarea.form-control-lg { } .fs-1 { - font-size: calc(1.375rem + 1.5vw) !important; + font-size: calc(1.34375rem + 1.125vw) !important; } .fs-2 { - font-size: calc(1.325rem + 0.9vw) !important; -} - -.fs-3 { font-size: calc(1.3rem + 0.6vw) !important; } +.fs-3 { + font-size: calc(1.278125rem + 0.3375vw) !important; +} + .fs-4 { - font-size: calc(1.275rem + 0.3vw) !important; + font-size: calc(1.25625rem + 0.075vw) !important; } .fs-5 { - font-size: 1.25rem !important; + font-size: 1.09375rem !important; } .fs-6 { - font-size: 1rem !important; + font-size: 0.875rem !important; } .fst-italic { @@ -11777,16 +11777,16 @@ textarea.form-control-lg { } @media (min-width: 1200px) { .fs-1 { - font-size: 2.5rem !important; + font-size: 2.1875rem !important; } .fs-2 { - font-size: 2rem !important; - } - .fs-3 { font-size: 1.75rem !important; } + .fs-3 { + font-size: 1.53125rem !important; + } .fs-4 { - font-size: 1.5rem !important; + font-size: 1.3125rem !important; } } @media print { diff --git a/src/assets/css/themes/litely.css b/src/assets/css/themes/litely.css index 5a482c58..388b2674 100644 --- a/src/assets/css/themes/litely.css +++ b/src/assets/css/themes/litely.css @@ -75,7 +75,7 @@ --bs-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; --bs-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0)); --bs-body-font-family: var(--bs-font-sans-serif); - --bs-body-font-size: 1rem; + --bs-body-font-size: 0.875rem; --bs-body-font-weight: 400; --bs-body-line-height: 1.5; --bs-body-color: #495057; @@ -220,47 +220,47 @@ h6, .h6, h5, .h5, h4, .h4, h3, .h3, h2, .h2, h1, .h1 { } h1, .h1 { - font-size: calc(1.375rem + 1.5vw); + font-size: calc(1.34375rem + 1.125vw); } @media (min-width: 1200px) { h1, .h1 { - font-size: 2.5rem; + font-size: 2.1875rem; } } h2, .h2 { - font-size: calc(1.325rem + 0.9vw); -} -@media (min-width: 1200px) { - h2, .h2 { - font-size: 2rem; - } -} - -h3, .h3 { font-size: calc(1.3rem + 0.6vw); } @media (min-width: 1200px) { - h3, .h3 { + h2, .h2 { font-size: 1.75rem; } } +h3, .h3 { + font-size: calc(1.278125rem + 0.3375vw); +} +@media (min-width: 1200px) { + h3, .h3 { + font-size: 1.53125rem; + } +} + h4, .h4 { - font-size: calc(1.275rem + 0.3vw); + font-size: calc(1.25625rem + 0.075vw); } @media (min-width: 1200px) { h4, .h4 { - font-size: 1.5rem; + font-size: 1.3125rem; } } h5, .h5 { - font-size: 1.25rem; + font-size: 1.09375rem; } h6, .h6 { - font-size: 1rem; + font-size: 0.875rem; } p { @@ -585,7 +585,7 @@ progress { } .lead { - font-size: 1.25rem; + font-size: 1.09375rem; font-weight: 300; } @@ -679,7 +679,7 @@ progress { .blockquote { margin-bottom: 1rem; - font-size: 1.25rem; + font-size: 1.09375rem; } .blockquote > :last-child { margin-bottom: 0; @@ -2062,13 +2062,13 @@ progress { .col-form-label-lg { padding-top: calc(0.5rem + var(--bs-border-width)); padding-bottom: calc(0.5rem + var(--bs-border-width)); - font-size: 1.25rem; + font-size: 1.09375rem; } .col-form-label-sm { padding-top: calc(0.25rem + var(--bs-border-width)); padding-bottom: calc(0.25rem + var(--bs-border-width)); - font-size: 0.875rem; + font-size: 0.765625rem; } .form-text { @@ -2081,7 +2081,7 @@ progress { display: block; width: 100%; padding: 0.375rem 0.75rem; - font-size: 1rem; + font-size: 0.875rem; font-weight: 400; line-height: 1.5; color: var(--bs-body-color); @@ -2172,7 +2172,7 @@ progress { .form-control-sm { min-height: calc(1.5em + 0.5rem + calc(var(--bs-border-width) * 2)); padding: 0.25rem 0.5rem; - font-size: 0.875rem; + font-size: 0.765625rem; border-radius: var(--bs-border-radius-sm); } .form-control-sm::file-selector-button { @@ -2184,7 +2184,7 @@ progress { .form-control-lg { min-height: calc(1.5em + 1rem + calc(var(--bs-border-width) * 2)); padding: 0.5rem 1rem; - font-size: 1.25rem; + font-size: 1.09375rem; border-radius: var(--bs-border-radius-lg); } .form-control-lg::file-selector-button { @@ -2231,7 +2231,7 @@ textarea.form-control-lg { display: block; width: 100%; padding: 0.375rem 2.25rem 0.375rem 0.75rem; - font-size: 1rem; + font-size: 0.875rem; font-weight: 400; line-height: 1.5; color: var(--bs-body-color); @@ -2271,7 +2271,7 @@ textarea.form-control-lg { padding-top: 0.25rem; padding-bottom: 0.25rem; padding-left: 0.5rem; - font-size: 0.875rem; + font-size: 0.765625rem; border-radius: var(--bs-border-radius-sm); } @@ -2279,7 +2279,7 @@ textarea.form-control-lg { padding-top: 0.5rem; padding-bottom: 0.5rem; padding-left: 1rem; - font-size: 1.25rem; + font-size: 1.09375rem; border-radius: var(--bs-border-radius-lg); } @@ -2289,7 +2289,7 @@ textarea.form-control-lg { .form-check { display: block; - min-height: 1.5rem; + min-height: 1.3125rem; padding-left: 1.5em; margin-bottom: 0.125rem; } @@ -2617,7 +2617,7 @@ textarea.form-control-lg { display: flex; align-items: center; padding: 0.375rem 0.75rem; - font-size: 1rem; + font-size: 0.875rem; font-weight: 400; line-height: 1.5; color: var(--bs-body-color); @@ -2633,7 +2633,7 @@ textarea.form-control-lg { .input-group-lg > .input-group-text, .input-group-lg > .btn { padding: 0.5rem 1rem; - font-size: 1.25rem; + font-size: 1.09375rem; border-radius: var(--bs-border-radius-lg); } @@ -2642,7 +2642,7 @@ textarea.form-control-lg { .input-group-sm > .input-group-text, .input-group-sm > .btn { padding: 0.25rem 0.5rem; - font-size: 0.875rem; + font-size: 0.765625rem; border-radius: var(--bs-border-radius-sm); } @@ -2692,7 +2692,7 @@ textarea.form-control-lg { max-width: 100%; padding: 0.25rem 0.5rem; margin-top: 0.1rem; - font-size: 0.875rem; + font-size: 0.765625rem; color: #fff; background-color: var(--bs-success); border-radius: var(--bs-border-radius); @@ -2782,7 +2782,7 @@ textarea.form-control-lg { max-width: 100%; padding: 0.25rem 0.5rem; margin-top: 0.1rem; - font-size: 0.875rem; + font-size: 0.765625rem; color: #fff; background-color: var(--bs-danger); border-radius: var(--bs-border-radius); @@ -2860,7 +2860,7 @@ textarea.form-control-lg { --bs-btn-padding-x: 0.75rem; --bs-btn-padding-y: 0.375rem; --bs-btn-font-family: ; - --bs-btn-font-size: 1rem; + --bs-btn-font-size: 0.875rem; --bs-btn-font-weight: 400; --bs-btn-line-height: 1.5; --bs-btn-color: var(--bs-body-color); @@ -3228,14 +3228,14 @@ textarea.form-control-lg { .btn-lg, .btn-group-lg > .btn { --bs-btn-padding-y: 0.5rem; --bs-btn-padding-x: 1rem; - --bs-btn-font-size: 1.25rem; + --bs-btn-font-size: 1.09375rem; --bs-btn-border-radius: var(--bs-border-radius-lg); } .btn-sm, .btn-group-sm > .btn { --bs-btn-padding-y: 0.25rem; --bs-btn-padding-x: 0.5rem; - --bs-btn-font-size: 0.875rem; + --bs-btn-font-size: 0.765625rem; --bs-btn-border-radius: var(--bs-border-radius-sm); } @@ -3308,7 +3308,7 @@ textarea.form-control-lg { --bs-dropdown-padding-x: 0; --bs-dropdown-padding-y: 0.5rem; --bs-dropdown-spacer: 0.125rem; - --bs-dropdown-font-size: 1rem; + --bs-dropdown-font-size: 0.875rem; --bs-dropdown-color: var(--bs-body-color); --bs-dropdown-bg: var(--bs-body-bg); --bs-dropdown-border-color: var(--bs-border-color-translucent); @@ -3566,7 +3566,7 @@ textarea.form-control-lg { display: block; padding: var(--bs-dropdown-header-padding-y) var(--bs-dropdown-header-padding-x); margin-bottom: 0; - font-size: 0.875rem; + font-size: 0.765625rem; color: var(--bs-dropdown-header-color); white-space: nowrap; } @@ -3843,15 +3843,15 @@ textarea.form-control-lg { --bs-navbar-hover-color: #212529; --bs-navbar-disabled-color: rgba(var(--bs-emphasis-color-rgb), 0.3); --bs-navbar-active-color: #212529; - --bs-navbar-brand-padding-y: 0.3125rem; + --bs-navbar-brand-padding-y: 0.3359375rem; --bs-navbar-brand-margin-end: 1rem; - --bs-navbar-brand-font-size: 1.25rem; + --bs-navbar-brand-font-size: 1.09375rem; --bs-navbar-brand-color: #212529; --bs-navbar-brand-hover-color: #212529; --bs-navbar-nav-link-padding-x: 0.5rem; --bs-navbar-toggler-padding-y: 0.25rem; --bs-navbar-toggler-padding-x: 0.75rem; - --bs-navbar-toggler-font-size: 1.25rem; + --bs-navbar-toggler-font-size: 1.09375rem; --bs-navbar-toggler-icon-bg: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%2873, 80, 87, 0.75%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e"); --bs-navbar-toggler-border-color: rgba(var(--bs-emphasis-color-rgb), 0.15); --bs-navbar-toggler-border-radius: var(--bs-border-radius); @@ -4476,7 +4476,7 @@ textarea.form-control-lg { align-items: center; width: 100%; padding: var(--bs-accordion-btn-padding-y) var(--bs-accordion-btn-padding-x); - font-size: 1rem; + font-size: 0.875rem; color: var(--bs-accordion-btn-color); text-align: left; background-color: var(--bs-accordion-btn-bg); @@ -4620,7 +4620,7 @@ textarea.form-control-lg { .pagination { --bs-pagination-padding-x: 0.75rem; --bs-pagination-padding-y: 0.375rem; - --bs-pagination-font-size: 1rem; + --bs-pagination-font-size: 0.875rem; --bs-pagination-color: var(--bs-link-color); --bs-pagination-bg: var(--bs-body-bg); --bs-pagination-border-width: var(--bs-border-width); @@ -4699,14 +4699,14 @@ textarea.form-control-lg { .pagination-lg { --bs-pagination-padding-x: 1.5rem; --bs-pagination-padding-y: 0.75rem; - --bs-pagination-font-size: 1.25rem; + --bs-pagination-font-size: 1.09375rem; --bs-pagination-border-radius: var(--bs-border-radius-lg); } .pagination-sm { --bs-pagination-padding-x: 0.5rem; --bs-pagination-padding-y: 0.25rem; - --bs-pagination-font-size: 0.875rem; + --bs-pagination-font-size: 0.765625rem; --bs-pagination-border-radius: var(--bs-border-radius-sm); } @@ -4840,7 +4840,7 @@ textarea.form-control-lg { .progress, .progress-stacked { --bs-progress-height: 1rem; - --bs-progress-font-size: 0.75rem; + --bs-progress-font-size: 0.65625rem; --bs-progress-bg: var(--bs-secondary-bg); --bs-progress-border-radius: var(--bs-border-radius); --bs-progress-box-shadow: var(--bs-box-shadow-inset); @@ -5644,7 +5644,7 @@ textarea.form-control-lg { --bs-tooltip-padding-x: 0.5rem; --bs-tooltip-padding-y: 0.25rem; --bs-tooltip-margin: ; - --bs-tooltip-font-size: 0.875rem; + --bs-tooltip-font-size: 0.765625rem; --bs-tooltip-color: var(--bs-body-bg); --bs-tooltip-bg: var(--bs-emphasis-color); --bs-tooltip-border-radius: var(--bs-border-radius); @@ -5743,7 +5743,7 @@ textarea.form-control-lg { .popover { --bs-popover-zindex: 1070; --bs-popover-max-width: 276px; - --bs-popover-font-size: 0.875rem; + --bs-popover-font-size: 0.765625rem; --bs-popover-bg: var(--bs-body-bg); --bs-popover-border-width: var(--bs-border-width); --bs-popover-border-color: var(--bs-border-color-translucent); @@ -5752,7 +5752,7 @@ textarea.form-control-lg { --bs-popover-box-shadow: 0 0.5rem 1rem rgba(34, 34, 34, 0.15); --bs-popover-header-padding-x: 1rem; --bs-popover-header-padding-y: 0.5rem; - --bs-popover-header-font-size: 1rem; + --bs-popover-header-font-size: 0.875rem; --bs-popover-header-color: #495057; --bs-popover-header-bg: var(--bs-secondary-bg); --bs-popover-body-padding-x: 1rem; @@ -8214,27 +8214,27 @@ textarea.form-control-lg { } .fs-1 { - font-size: calc(1.375rem + 1.5vw) !important; + font-size: calc(1.34375rem + 1.125vw) !important; } .fs-2 { - font-size: calc(1.325rem + 0.9vw) !important; -} - -.fs-3 { font-size: calc(1.3rem + 0.6vw) !important; } +.fs-3 { + font-size: calc(1.278125rem + 0.3375vw) !important; +} + .fs-4 { - font-size: calc(1.275rem + 0.3vw) !important; + font-size: calc(1.25625rem + 0.075vw) !important; } .fs-5 { - font-size: 1.25rem !important; + font-size: 1.09375rem !important; } .fs-6 { - font-size: 1rem !important; + font-size: 0.875rem !important; } .fst-italic { @@ -11777,16 +11777,16 @@ textarea.form-control-lg { } @media (min-width: 1200px) { .fs-1 { - font-size: 2.5rem !important; + font-size: 2.1875rem !important; } .fs-2 { - font-size: 2rem !important; - } - .fs-3 { font-size: 1.75rem !important; } + .fs-3 { + font-size: 1.53125rem !important; + } .fs-4 { - font-size: 1.5rem !important; + font-size: 1.3125rem !important; } } @media print { From 950dfad659fa18af93e83d5d00c3faaeea9c108b Mon Sep 17 00:00:00 2001 From: Alec Armbruster <35377827+alectrocute@users.noreply.github.com> Date: Mon, 26 Jun 2023 14:54:38 -0400 Subject: [PATCH 15/35] Move password reset form to separate route, view (#1390) * rework password reset form * make self-suggested changes * cleaning * validate in handlePasswordReset as well * update submodule * partially make suggested changes * make suggested changes * resolve merge conflicts * resolve merge conflicts * resolve merge conflicts --------- Co-authored-by: Dessalines --- src/server/handlers/robots-handler.ts | 1 + src/shared/components/home/login-reset.tsx | 138 +++++++++++++++++++++ src/shared/components/home/login.tsx | 27 +--- src/shared/routes.ts | 5 + 4 files changed, 149 insertions(+), 22 deletions(-) create mode 100644 src/shared/components/home/login-reset.tsx diff --git a/src/server/handlers/robots-handler.ts b/src/server/handlers/robots-handler.ts index 7271095c..80678aa0 100644 --- a/src/server/handlers/robots-handler.ts +++ b/src/server/handlers/robots-handler.ts @@ -5,6 +5,7 @@ export default async ({ res }: { res: Response }) => { res.send(`User-Agent: * Disallow: /login + Disallow: /login_reset Disallow: /settings Disallow: /create_community Disallow: /create_post diff --git a/src/shared/components/home/login-reset.tsx b/src/shared/components/home/login-reset.tsx new file mode 100644 index 00000000..c96255d5 --- /dev/null +++ b/src/shared/components/home/login-reset.tsx @@ -0,0 +1,138 @@ +import { setIsoData } from "@utils/app"; +import { capitalizeFirstLetter, validEmail } from "@utils/helpers"; +import { Component, linkEvent } from "inferno"; +import { GetSiteResponse } from "lemmy-js-client"; +import { HttpService, I18NextService, UserService } from "../../services"; +import { toast } from "../../toast"; +import { HtmlTags } from "../common/html-tags"; +import { Spinner } from "../common/icon"; + +interface State { + form: { + email: string; + loading: boolean; + }; + siteRes: GetSiteResponse; +} + +export class LoginReset extends Component { + private isoData = setIsoData(this.context); + + state: State = { + form: { + email: "", + loading: false, + }, + siteRes: this.isoData.site_res, + }; + + constructor(props: any, context: any) { + super(props, context); + } + + componentDidMount() { + if (UserService.Instance.myUserInfo) { + this.context.router.history.push("/"); + } + } + + get documentTitle(): string { + return `${capitalizeFirstLetter( + I18NextService.i18n.t("forgot_password") + )} - ${this.state.siteRes.site_view.site.name}`; + } + + render() { + return ( +
+ +
+ {this.loginResetForm()} +
+
+ ); + } + + loginResetForm() { + return ( +
+
+ {capitalizeFirstLetter(I18NextService.i18n.t("forgot_password"))} +
+ +
+ +
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ + ); + } + + handleEmailInputChange(i: LoginReset, event: any) { + i.setState(s => ((s.form.email = event.target.value.trim()), s)); + } + + async handlePasswordReset(i: LoginReset, event: any) { + event.preventDefault(); + + const email = i.state.form.email; + + if (email && validEmail(email)) { + i.setState(s => ((s.form.loading = true), s)); + + const res = await HttpService.client.passwordReset({ email }); + + if (res.state == "success") { + toast(I18NextService.i18n.t("reset_password_mail_sent")); + i.context.router.history.push("/login"); + } + + i.setState(s => ((s.form.loading = false), s)); + } + } +} diff --git a/src/shared/components/home/login.tsx b/src/shared/components/home/login.tsx index 4dd64665..397288e8 100644 --- a/src/shared/components/home/login.tsx +++ b/src/shared/components/home/login.tsx @@ -1,7 +1,7 @@ import { myAuth, setIsoData } from "@utils/app"; import { isBrowser } from "@utils/browser"; -import { validEmail } from "@utils/helpers"; import { Component, linkEvent } from "inferno"; +import { NavLink } from "inferno-router"; import { GetSiteResponse, LoginResponse } from "lemmy-js-client"; import { I18NextService, UserService } from "../../services"; import { HttpService, RequestState } from "../../services/HttpService"; @@ -105,18 +105,12 @@ export class Login extends Component { required maxLength={60} /> - + {this.state.showTotp && ( @@ -214,15 +208,4 @@ export class Login extends Component { i.state.form.password = event.target.value; i.setState(i.state); } - - async handlePasswordReset(i: Login, event: any) { - event.preventDefault(); - const email = i.state.form.username_or_email; - if (email) { - const res = await HttpService.client.passwordReset({ email }); - if (res.state == "success") { - toast(I18NextService.i18n.t("reset_password_mail_sent")); - } - } - } } diff --git a/src/shared/routes.ts b/src/shared/routes.ts index 6e3ed498..01325afa 100644 --- a/src/shared/routes.ts +++ b/src/shared/routes.ts @@ -7,6 +7,7 @@ import { Home } from "./components/home/home"; import { Instances } from "./components/home/instances"; import { Legal } from "./components/home/legal"; import { Login } from "./components/home/login"; +import { LoginReset } from "./components/home/login-reset"; import { Setup } from "./components/home/setup"; import { Signup } from "./components/home/signup"; import { Modlog } from "./components/modlog"; @@ -38,6 +39,10 @@ export const routes: IRoutePropsWithFetch>[] = [ path: `/login`, component: Login, }, + { + path: `/login_reset`, + component: LoginReset, + }, { path: `/signup`, component: Signup, From 022c27aec20ecf26156138535a10f7ce05fd0895 Mon Sep 17 00:00:00 2001 From: Alec Armbruster <35377827+alectrocute@users.noreply.github.com> Date: Mon, 26 Jun 2023 15:25:22 -0400 Subject: [PATCH 16/35] capitalize button (#1616) Co-authored-by: Dessalines --- src/shared/components/person/inbox.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/shared/components/person/inbox.tsx b/src/shared/components/person/inbox.tsx index 395875be..c414e8be 100644 --- a/src/shared/components/person/inbox.tsx +++ b/src/shared/components/person/inbox.tsx @@ -11,6 +11,7 @@ import { setIsoData, updatePersonBlock, } from "@utils/app"; +import { capitalizeFirstLetter } from "@utils/helpers"; import { RouteDataResponse } from "@utils/types"; import { Component, linkEvent } from "inferno"; import { @@ -243,7 +244,9 @@ export class Inbox extends Component { {this.state.markAllAsReadRes.state == "loading" ? ( ) : ( - I18NextService.i18n.t("mark_all_as_read") + capitalizeFirstLetter( + I18NextService.i18n.t("mark_all_as_read") + ) )} )} From dd09b3cadece112f4ccf42b751b9bf180e6590d3 Mon Sep 17 00:00:00 2001 From: dullbananas Date: Mon, 26 Jun 2023 12:57:23 -0700 Subject: [PATCH 17/35] Indicate valid and invalid fields in signup form (#1450) * Use was-validated class in signup form * Update signup.tsx * Update signup.tsx --------- Co-authored-by: SleeplessOne1917 --- src/shared/components/home/signup.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/shared/components/home/signup.tsx b/src/shared/components/home/signup.tsx index a2d960dc..516cd43f 100644 --- a/src/shared/components/home/signup.tsx +++ b/src/shared/components/home/signup.tsx @@ -140,7 +140,10 @@ export class Signup extends Component { registerForm() { const siteView = this.state.siteRes.site_view; return ( -
+
{this.titleName(siteView)}
{this.isLemmyMl && ( From d816b8f8635543d5877871f1829ae6c7fe0ce32c Mon Sep 17 00:00:00 2001 From: Alec Armbruster <35377827+alectrocute@users.noreply.github.com> Date: Mon, 26 Jun 2023 16:09:11 -0400 Subject: [PATCH 18/35] remove icon (#1618) Co-authored-by: Dessalines --- src/shared/components/post/post-listing.tsx | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx index 61561e98..37902ee8 100644 --- a/src/shared/components/post/post-listing.tsx +++ b/src/shared/components/post/post-listing.tsx @@ -482,26 +482,13 @@ export class PostListing extends Component { this.postLink )} - {(url && isImage(url)) || - (post.thumbnail_url && ( - - ))} + {post.removed && ( {I18NextService.i18n.t("removed")} )} + {post.deleted && ( { )} + {post.locked && ( { )} + {post.featured_community && ( { )} + {post.featured_local && ( { )} + {post.nsfw && ( {I18NextService.i18n.t("nsfw")} From 28661dfacfd821a1ed4290982baf0685eccf4968 Mon Sep 17 00:00:00 2001 From: Alec Armbruster <35377827+alectrocute@users.noreply.github.com> Date: Mon, 26 Jun 2023 17:10:39 -0400 Subject: [PATCH 19/35] fix vote button alignment --- src/shared/components/common/vote-buttons.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/components/common/vote-buttons.tsx b/src/shared/components/common/vote-buttons.tsx index 005db8c0..259d2161 100644 --- a/src/shared/components/common/vote-buttons.tsx +++ b/src/shared/components/common/vote-buttons.tsx @@ -104,7 +104,7 @@ export class VoteButtonsCompact extends Component< render() { return ( -
+ <>
+ ); } } From 8e2f83eb4e85afa4af20d82402a542970b271a33 Mon Sep 17 00:00:00 2001 From: Pascal de Vink Date: Mon, 26 Jun 2023 21:45:56 +0100 Subject: [PATCH 20/35] Fix feedback on banning an unbanning When banning or unbanning, the API call was done, but updating the frontend failed. This caused a confusing experience for an admin, until the page was reloaded. --- src/shared/components/person/profile.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/shared/components/person/profile.tsx b/src/shared/components/person/profile.tsx index 714b6bed..622e9312 100644 --- a/src/shared/components/person/profile.tsx +++ b/src/shared/components/person/profile.tsx @@ -205,6 +205,7 @@ export class Profile extends Component< this.handleSavePost = this.handleSavePost.bind(this); this.handlePurgePost = this.handlePurgePost.bind(this); this.handleFeaturePost = this.handleFeaturePost.bind(this); + this.handleModBanSubmit = this.handleModBanSubmit.bind(this); // Only fetch the data if coming from another route if (FirstLoadService.isFirstLoad) { @@ -987,6 +988,7 @@ export class Profile extends Component< s.personRes.data.comments .filter(c => c.creator.id == banRes.data.person_view.person.id) .forEach(c => (c.creator.banned = banRes.data.banned)); + s.personRes.data.person_view.person.banned = banRes.data.banned; } return s; }); From b2b6f4521fde8fd7ffd2bb8f075c18b050c350e2 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Mon, 26 Jun 2023 18:42:44 -0400 Subject: [PATCH 21/35] fix: Use Bootstrap file upload form control styles --- src/assets/css/main.css | 9 --------- .../components/common/image-upload-form.tsx | 2 +- .../components/common/markdown-textarea.tsx | 3 +++ src/shared/components/home/emojis-form.tsx | 1 + src/shared/components/post/post-form.tsx | 20 ++++++++++--------- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/assets/css/main.css b/src/assets/css/main.css index d3e9d0b8..b917b3ec 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -88,15 +88,6 @@ color: var(--bs-gray) !important; } -input[type="file"]::file-selector-button { - font: inherit; - border: 0; - padding: 0.375em 0.75em; - border-radius: var(--bs-border-radius); - background-color: var(--bs-secondary); - color: var(--bs-white); -} - .icon { display: inline-grid; display: inline-flex; diff --git a/src/shared/components/common/image-upload-form.tsx b/src/shared/components/common/image-upload-form.tsx index 107949f6..3f40693a 100644 --- a/src/shared/components/common/image-upload-form.tsx +++ b/src/shared/components/common/image-upload-form.tsx @@ -59,7 +59,7 @@ export class ImageUploadForm extends Component< id={this.id} type="file" accept="image/*,video/*" - className="small" + className="small form-control" name={this.id} disabled={!UserService.Instance.myUserInfo} onChange={linkEvent(this, this.handleImageUpload)} diff --git a/src/shared/components/common/markdown-textarea.tsx b/src/shared/components/common/markdown-textarea.tsx index 8963d5e9..25df1207 100644 --- a/src/shared/components/common/markdown-textarea.tsx +++ b/src/shared/components/common/markdown-textarea.tsx @@ -170,6 +170,9 @@ export class MarkdownTextArea extends Component<
{I18NextService.i18n.t("column_emoji")} diff --git a/src/shared/components/home/site-form.tsx b/src/shared/components/home/site-form.tsx index 382f5650..e30d13bf 100644 --- a/src/shared/components/home/site-form.tsx +++ b/src/shared/components/home/site-form.tsx @@ -155,28 +155,32 @@ export class SiteForm extends Component { /> -
-
@@ -1214,7 +1126,97 @@ export class PostListing extends Component { // TODO: make nicer const post_view = this.postView; return ( - this.state.showAdvanced &&
+ this.state.showAdvanced && ( +
+ {this.canMod_ && ( + <> + {!this.creatorIsMod_ && + (!post_view.creator_banned_from_community ? ( +
  • {this.modBanFromCommunityButton}
    • + ) : ( +
  • {this.modUnbanFromCommunityButton}
    • + ))} + {!post_view.creator_banned_from_community && ( +
  • {this.addModToCommunityButton}
    • + )} + + )} + + {/* Community creators and admins can transfer community to another mod */} + {(amCommunityCreator(post_view.creator.id, this.props.moderators) || + this.canAdmin_) && + this.creatorIsMod_ && + (!this.state.showConfirmTransferCommunity ? ( +
  • + +
    • + ) : ( + <> +
  • + +
    • +
  • + +
    • +
  • + +
    • + + ))} + {/* Admins can ban from all, and appoint other admins */} + {this.canAdmin_ && ( + <> + {!this.creatorIsAdmin_ && ( + <> + {!isBanned(post_view.creator) ? ( +
  • {this.modBanButton}
    • + ) : ( +
  • {this.modUnbanButton}
    • + )} +
  • {this.purgePersonButton}
    • +
  • {this.purgePostButton}
    • + + )} + {!isBanned(post_view.creator) && post_view.creator.local && ( +
  • {this.toggleAdminButton}
    • + )} + + )} +
    + ) ); } From 1db654ecf51c3af700911b4ee6dc47eb1546fb7c Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Sun, 25 Jun 2023 18:11:12 -0400 Subject: [PATCH 04/35] fix: Remove extraneous classes --- src/shared/components/post/post-listing.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx index b3367305..90d1a8fe 100644 --- a/src/shared/components/post/post-listing.tsx +++ b/src/shared/components/post/post-listing.tsx @@ -985,7 +985,7 @@ export class PostListing extends Component { get modBanFromCommunityButton() { return ( + ) : ( + <> + + - - ) : ( - <> -
  • - -
    • -
  • - -
    • -
  • - -
    • ))} {/* Admins can ban from all, and appoint other admins */} @@ -1201,18 +1193,16 @@ export class PostListing extends Component { <> {!this.creatorIsAdmin_ && ( <> - {!isBanned(post_view.creator) ? ( -
  • {this.modBanButton}
    • - ) : ( -
  • {this.modUnbanButton}
    • - )} -
  • {this.purgePersonButton}
    • -
  • {this.purgePostButton}
    • + {!isBanned(post_view.creator) + ? this.modBanButton + : this.modUnbanButton} + {this.purgePersonButton} + {this.purgePostButton} )} - {!isBanned(post_view.creator) && post_view.creator.local && ( -
  • {this.toggleAdminButton}
    • - )} + {!isBanned(post_view.creator) && + post_view.creator.local && + this.toggleAdminButton} )} From 984de714cdf31faad7cc5dad11efb5d3eef51b4a Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Sun, 25 Jun 2023 18:15:59 -0400 Subject: [PATCH 06/35] fix: Restore removed classes --- src/shared/components/post/post-listing.tsx | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx index c84d9b9f..3efd7fd3 100644 --- a/src/shared/components/post/post-listing.tsx +++ b/src/shared/components/post/post-listing.tsx @@ -1131,14 +1131,11 @@ export class PostListing extends Component { {this.canMod_ && ( <> {!this.creatorIsMod_ && - (!post_view.creator_banned_from_community ? ( -
  • {this.modBanFromCommunityButton}
    • - ) : ( -
  • {this.modUnbanFromCommunityButton}
    • - ))} - {!post_view.creator_banned_from_community && ( -
  • {this.addModToCommunityButton}
    • - )} + (!post_view.creator_banned_from_community + ? this.modBanFromCommunityButton + : this.modUnbanFromCommunityButton)} + {!post_view.creator_banned_from_community && + this.addModToCommunityButton} )} @@ -1160,13 +1157,13 @@ export class PostListing extends Component { ) : ( <> {showScores() ? (
    {numToSI(this.props.counts.score)} diff --git a/src/shared/components/home/emojis-form.tsx b/src/shared/components/home/emojis-form.tsx index 930bd55c..da0028d9 100644 --- a/src/shared/components/home/emojis-form.tsx +++ b/src/shared/components/home/emojis-form.tsx @@ -258,7 +258,7 @@ export class EmojiForm extends Component { >
    diff --git a/src/shared/components/home/tagline-form.tsx b/src/shared/components/home/tagline-form.tsx index c79d9554..bdbe1e63 100644 --- a/src/shared/components/home/tagline-form.tsx +++ b/src/shared/components/home/tagline-form.tsx @@ -71,7 +71,7 @@ export class TaglineForm extends Component { data-tippy-content={I18NextService.i18n.t("edit")} aria-label={I18NextService.i18n.t("edit")} > - +