diff --git a/.stylelintrc.json b/.stylelintrc.json index abbdd2b7..0a38b9e1 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -21,15 +21,6 @@ "function-url-quotes": null, "keyframes-name-pattern": null, "no-descending-specificity": null, - "order/order": [ - { - "type": "at-rule", - "name": "include" - }, - "custom-properties", - "declarations", - "rules" - ], "property-no-vendor-prefix": [ true, { @@ -40,12 +31,6 @@ "scss/at-mixin-pattern": null, "scss/dollar-variable-colon-space-after": "always-single-line", "scss/dollar-variable-colon-space-before": "never", - "scss/dollar-variable-pattern": [ - "^[a-z][a-zA-Z]+$", - { - "ignore": "global" - } - ], "scss/double-slash-comment-empty-line-before": [ "always", { @@ -68,6 +53,8 @@ { "ignorePseudoClasses": ["global", "export"] } - ] + ], + "scss/at-if-no-null": true, + "media-query-no-invalid": true } } diff --git a/package.json b/package.json index 9831100a..6b2d3d08 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ "@graphql-codegen/typescript-urql": "^4.0.0", "@hocuspocus/provider": "^2.13.6", "@playwright/test": "^1.47.2", - "@popperjs/core": "^2.11.8", "@solid-primitives/media": "^2.2.9", "@solid-primitives/memo": "^1.3.9", "@solid-primitives/pagination": "^0.3.0", @@ -88,7 +87,6 @@ "@types/throttle-debounce": "^5.0.2", "@urql/core": "^5.0.6", "axe-playwright": "^2.0.3", - "bootstrap": "^5.3.3", "clsx": "^2.1.1", "cookie": "^0.6.0", "cookie-signature": "^1.2.1", diff --git a/src/components/Article/Article.module.scss b/src/components/Article/Article.module.scss index e56638f3..ef4c87a2 100644 --- a/src/components/Article/Article.module.scss +++ b/src/components/Article/Article.module.scss @@ -1,13 +1,11 @@ h1 { - @include font-size(4rem); - + font-size:4rem; line-height: 1.1; margin-top: 0.5em; } h2 { - @include font-size(4rem); - + font-size:4rem; line-height: 1.1; } @@ -96,12 +94,11 @@ img { &[data-float='left'], &[data-float='right'] { - @include font-size(2.2rem); - @include media-breakpoint-up(sm) { clear: none; } + font-size:2.2rem; line-height: 1.4; } @@ -114,13 +111,12 @@ img { ta-sub, ta-selection-frame, ta-border-sub { - @include font-size(1.4rem); - @include media-breakpoint-up(md) { margin: 3.2rem -8.3333%; padding: 3.2rem 8.3333%; } + font-size:1.4rem; background: #f1f2f3; clear: both; display: block; @@ -243,7 +239,7 @@ img { .shoutAuthor, .shoutDate { - @include font-size(1.5rem); + font-size:1.5rem; } .shoutAuthor { @@ -282,8 +278,7 @@ img { } .writeComment { - @include font-size(1.7rem); - + font-size:1.7rem; border: 2px solid #f6f6f6; outline: none; padding: 0.2em 0.4em; @@ -295,8 +290,7 @@ img { } .commentWarning { - @include font-size(2.2rem); - + font-size:2.2rem; background: #f6f6f6; margin-bottom: 1em; padding: 2.4rem 1.8rem; @@ -325,12 +319,11 @@ img { } .shoutStatsItem { - @include font-size(1.5rem); - @include media-breakpoint-up(xl) { margin-right: 3.2rem; } + font-size:1.5rem; align-items: center; font-weight: 500; display: flex; @@ -487,8 +480,7 @@ img { } .topicsList { - @include font-size(1.2rem); - + font-size:1.2rem; border-bottom: 1px solid #e8e8e8; letter-spacing: 0.08em; margin-top: 1.6rem; @@ -535,8 +527,7 @@ img { } .commentsHeader { - @include font-size(2.4rem); - + font-size: 2.4rem; margin-bottom: 1em; .newReactions { @@ -569,8 +560,7 @@ img { padding-bottom: 3.2rem; button { - @include font-size(1.5rem); - + font-size:1.5rem; border-radius: 0.8rem; margin-right: 1.2rem; padding: 0.9rem 1.2rem; @@ -620,8 +610,7 @@ a[data-toggle='tooltip'] { } .tooltip { - @include font-size(1.4rem); - + font-size:1.4rem; position: relative; padding: 8px; border-radius: 4px; @@ -658,8 +647,7 @@ a[data-toggle='tooltip'] { } .lead { - @include font-size(1.8rem); - + font-size:1.8rem; font-weight: 600; b, diff --git a/src/components/Article/AudioHeader/AudioHeader.module.scss b/src/components/Article/AudioHeader/AudioHeader.module.scss index 2c35c2d3..ba8547a0 100644 --- a/src/components/Article/AudioHeader/AudioHeader.module.scss +++ b/src/components/Article/AudioHeader/AudioHeader.module.scss @@ -15,8 +15,7 @@ flex-direction: row; .item { - @include font-size(1.6rem); - + font-size:1.6rem; font-weight: 500; padding: 2px 12px; border-left: 2px solid #e9e9ee; diff --git a/src/components/Article/AudioPlayer/AudioPlayer.module.scss b/src/components/Article/AudioPlayer/AudioPlayer.module.scss index 7b953eef..93b5dee6 100644 --- a/src/components/Article/AudioPlayer/AudioPlayer.module.scss +++ b/src/components/Article/AudioPlayer/AudioPlayer.module.scss @@ -236,8 +236,7 @@ $vendors-thumb: ('::-webkit-slider-thumb', '::-moz-moz-range-thumb', '::-ms-thum } .playlistItemText { - @include font-size(1.6rem); - + font-size:1.6rem; display: flex; flex-direction: row; flex: 1; @@ -249,8 +248,7 @@ $vendors-thumb: ('::-webkit-slider-thumb', '::-moz-moz-range-thumb', '::-ms-thum .artist, .title { - @include font-size(1.6rem); - + font-size:1.6rem; overflow: hidden; text-overflow: ellipsis; padding: 0; @@ -335,7 +333,7 @@ $vendors-thumb: ('::-webkit-slider-thumb', '::-moz-moz-range-thumb', '::-ms-thum .description, .lyrics { - @include font-size(1.4rem); + font-size:1.4rem; } .description { diff --git a/src/components/Article/Comment/Comment.module.scss b/src/components/Article/Comment/Comment.module.scss index da686f58..97fcbedd 100644 --- a/src/components/Article/Comment/Comment.module.scss +++ b/src/components/Article/Comment/Comment.module.scss @@ -46,8 +46,7 @@ } .shout-body { - @include font-size(1.5rem); - + font-size:1.5rem; margin-bottom: 1em; *:last-child { @@ -155,8 +154,7 @@ } .commentBody { - @include font-size(1.5rem); - + font-size:1.5rem; line-height: 1.47; blockquote { @@ -176,7 +174,7 @@ .commentAuthor, .commentRating { - @include font-size(1.2rem); + font-size:1.2rem; } .commentAuthor { @@ -184,15 +182,12 @@ } .articleAuthor { - @include font-size(1.2rem); - + font-size:1.2rem; color: var(--blue-500); margin: 0.3rem 1rem 0; } .articleLink { - @include font-size(1.2rem); - @include media-breakpoint-down(md) { margin: 0.3em 0 0.5em; } @@ -206,6 +201,7 @@ white-space: nowrap; } + font-size:1.2rem; flex: 0 0 50%; margin-right: 2em; } @@ -222,8 +218,6 @@ } .commentDates { - @include font-size(1.2rem); - flex: 1; display: flex; gap: 1rem; diff --git a/src/components/Article/CommentDate/CommentDate.module.scss b/src/components/Article/CommentDate/CommentDate.module.scss index c648cca1..7f1c9fc8 100644 --- a/src/components/Article/CommentDate/CommentDate.module.scss +++ b/src/components/Article/CommentDate/CommentDate.module.scss @@ -1,6 +1,4 @@ .commentDates { - @include font-size(1.2rem); - color: var(--secondary-color); display: flex; justify-content: center; diff --git a/src/components/Article/FullArticle.tsx b/src/components/Article/FullArticle.tsx index 7420f8bd..b80e72f9 100644 --- a/src/components/Article/FullArticle.tsx +++ b/src/components/Article/FullArticle.tsx @@ -1,5 +1,4 @@ import { AuthToken } from '@authorizerdev/authorizer-js' -import { createPopper } from '@popperjs/core' import { Link } from '@solidjs/meta' import { A, useSearchParams } from '@solidjs/router' import { clsx } from 'clsx' @@ -13,6 +12,7 @@ import { DEFAULT_HEADER_OFFSET, useUI } from '~/context/ui' import type { Author, Maybe, Shout, Topic } from '~/graphql/schema/core.gen' import { processPrepositions } from '~/intl/prepositions' import { isCyrillic } from '~/intl/translate' +import { createTooltip } from '~/lib/createTooltip' import { getImageUrl } from '~/lib/getThumbUrl' import { MediaItem } from '~/types/mediaitem' import { capitalize } from '~/utils/capitalize' @@ -215,7 +215,7 @@ export const FullArticle = (props: Props) => { element.setAttribute('href', 'javascript: void(0)') } - const popperInstance = createPopper(element, tooltip, { + const popperInstance = createTooltip(element, tooltip, { placement: 'top', modifiers: [ { diff --git a/src/components/AuthModal/AuthModal.module.scss b/src/components/AuthModal/AuthModal.module.scss index 1e72c779..09597494 100644 --- a/src/components/AuthModal/AuthModal.module.scss +++ b/src/components/AuthModal/AuthModal.module.scss @@ -39,12 +39,11 @@ } .authImage { - @include font-size(1.5rem); - @include media-breakpoint-down(sm) { display: none; } + font-size:1.5rem; background: var(--background-color-invert) url('https://images.discours.io/unsafe/1600x/production/image/auth-page.jpg') center no-repeat; background-size: cover; @@ -88,8 +87,7 @@ } .disclaimer { - @include font-size(1.2rem); - + font-size:1.2rem; color: #9fa1a7; margin-bottom: 0; @@ -103,8 +101,7 @@ } .authActions { - @include font-size(1.5rem); - + font-size:1.5rem; margin-top: 1.6rem; text-align: center; display: flex; @@ -142,15 +139,13 @@ } .authLink { - @include font-size(1.6rem); - + font-size:1.6rem; cursor: pointer; font-weight: 500; } .authSubtitle { - @include font-size(1.5rem); - + font-size:1.5rem; margin-bottom: 1em; } diff --git a/src/components/AuthModal/SocialProviders/SocialProviders.module.scss b/src/components/AuthModal/SocialProviders/SocialProviders.module.scss index fae9291a..2ab260d2 100644 --- a/src/components/AuthModal/SocialProviders/SocialProviders.module.scss +++ b/src/components/AuthModal/SocialProviders/SocialProviders.module.scss @@ -6,8 +6,7 @@ } .text { - @include font-size(1.5rem); - + font-size:1.5rem; font-weight: 500; margin-bottom: 1em; text-align: center; diff --git a/src/components/Author/AuthorBadge/AuthorBadge.module.scss b/src/components/Author/AuthorBadge/AuthorBadge.module.scss index 0bc9a9d6..6220bb9a 100644 --- a/src/components/Author/AuthorBadge/AuthorBadge.module.scss +++ b/src/components/Author/AuthorBadge/AuthorBadge.module.scss @@ -29,12 +29,11 @@ } .info { - @include font-size(1.4rem); - @include media-breakpoint-up(sm) { flex: 1 100%; } + font-size:1.4rem; border: none; display: flex; flex-direction: column; @@ -46,8 +45,7 @@ } .name { - @include font-size(1.4rem); - + font-size:1.4rem; color: var(--default-color); font-weight: 500; @@ -58,8 +56,7 @@ } .bio { - @include font-size(1.2rem); - + font-size:1.2rem; color: var(--black-400); display: flex; flex-direction: row; diff --git a/src/components/Author/AuthorCard/AuthorCard.module.scss b/src/components/Author/AuthorCard/AuthorCard.module.scss index 5c652d44..a5c96cfd 100644 --- a/src/components/Author/AuthorCard/AuthorCard.module.scss +++ b/src/components/Author/AuthorCard/AuthorCard.module.scss @@ -21,15 +21,13 @@ } .authorName { - @include font-size(4rem); - + font-size:4rem; font-weight: 700; margin-bottom: 1.2rem; } .authorAbout { - @include font-size(2rem); - + font-size:2rem; color: #696969; font-weight: 500; margin-top: 1.5rem; @@ -142,8 +140,7 @@ } .authorName { - @include font-size(4rem); - + font-size:4rem; line-height: 1.1; } @@ -206,8 +203,7 @@ } .authorSubscribeSocialLabel { - @include font-size(1.6rem); - + font-size:1.6rem; color: #000; display: block; left: 100%; diff --git a/src/components/Discours/Footer.module.scss b/src/components/Discours/Footer.module.scss index ab803c63..36880a85 100644 --- a/src/components/Discours/Footer.module.scss +++ b/src/components/Discours/Footer.module.scss @@ -1,6 +1,5 @@ .discoursFooter { - @include font-size(1.7rem); - + font-size:1.7rem; background: #000; color: rgb(255 255 255 / 64%); padding: 2.4rem 0 4.2rem; @@ -51,8 +50,7 @@ } .footerCopyright { - @include font-size(1.5rem); - + font-size:1.5rem; border-top: 5px solid #404040; color: #696969; padding-top: 1.6rem; diff --git a/src/components/Discours/Hero.module.scss b/src/components/Discours/Hero.module.scss index 0923da87..f8956abe 100644 --- a/src/components/Discours/Hero.module.scss +++ b/src/components/Discours/Hero.module.scss @@ -1,6 +1,5 @@ .aboutDiscours { - @include font-size(1.6rem); - + font-size:1.6rem; background: #fef2f2; font-weight: 500; margin-bottom: 6.4rem; @@ -8,8 +7,7 @@ text-align: center; h4 { - @include font-size(4rem); - + font-size:4rem; font-weight: bold; line-height: 1.1; margin-bottom: 2rem; diff --git a/src/components/Draft/Draft.module.scss b/src/components/Draft/Draft.module.scss index 51ddd0fe..0ada52e3 100644 --- a/src/components/Draft/Draft.module.scss +++ b/src/components/Draft/Draft.module.scss @@ -3,8 +3,7 @@ } .created { - @include font-size(1.2rem); - + font-size:1.2rem; line-height: 1.5rem; margin-bottom: 20px; @@ -16,8 +15,7 @@ } .titleContainer { - @include font-size(2.6rem); - + font-size:2.6rem; line-height: 3.2rem; margin-bottom: 28px; } @@ -27,8 +25,7 @@ } .actions { - @include font-size(1.2rem); - + font-size:1.2rem; display: flex; gap: 12px; diff --git a/src/components/Draft/PublishSettings.module.scss b/src/components/Draft/PublishSettings.module.scss index 0807c6bf..e58a2b8f 100644 --- a/src/components/Draft/PublishSettings.module.scss +++ b/src/components/Draft/PublishSettings.module.scss @@ -1,7 +1,6 @@ .PublishSettings { .goBack { - @include font-size(1.8rem); - + font-size:1.8rem; font-weight: 500; display: flex; align-items: center; @@ -33,7 +32,7 @@ .settingInput { &::after, textarea { - @include font-size(1.6rem); + font-size:1.6rem; } } } @@ -98,24 +97,21 @@ color: var(--default-color); .mainTopic { - @include font-size(1.4rem); - + font-size:1.4rem; margin: auto 0 1.6rem; font-weight: 600; text-transform: uppercase; } .shoutCardTitle { - @include font-size(2.4rem); - + font-size: 2.4rem; font-weight: 700; line-height: 1.25; margin-bottom: 0.8rem; } .shoutCardSubtitle { - @include font-size(2.2rem); - + font-size:2.2rem; font-weight: 400; line-height: 1.3; margin-bottom: 0.8rem; @@ -126,7 +122,7 @@ } .shoutAuthor { - @include font-size(1.6rem); + font-size:1.6rem; } } diff --git a/src/components/Editor/AutoSaveNotice/AutoSaveNotice.module.scss b/src/components/Editor/AutoSaveNotice/AutoSaveNotice.module.scss index fa51f5fb..6eb50ad2 100644 --- a/src/components/Editor/AutoSaveNotice/AutoSaveNotice.module.scss +++ b/src/components/Editor/AutoSaveNotice/AutoSaveNotice.module.scss @@ -1,6 +1,5 @@ .AutoSaveNotice { - @include font-size(1.4rem); - + font-size:1.4rem; display: inline-flex; flex-direction: row; align-items: center; diff --git a/src/components/Editor/Editor.module.scss b/src/components/Editor/Editor.module.scss index 267ef123..468aadd9 100644 --- a/src/components/Editor/Editor.module.scss +++ b/src/components/Editor/Editor.module.scss @@ -114,8 +114,7 @@ mark.highlight { } &[data-type='quote'] { - @include font-size(1.4rem); - + font-size:1.4rem; border: solid #000; border-width: 0 0 0 2px; margin: 1.6rem 0; @@ -137,8 +136,6 @@ mark.highlight { } &[data-type='punchline'] { - @include font-size(3.2rem); - @include media-breakpoint-up(sm) { &[data-float='left'] { margin-right: 1.5em; @@ -151,6 +148,7 @@ mark.highlight { } } + font-size:3.2rem; border: solid #000; border-width: 2px 0; font-weight: 700; @@ -160,16 +158,13 @@ mark.highlight { &[data-float='left'], &[data-float='right'] { - @include font-size(2.2rem); - + font-size:2.2rem; line-height: 1.4; } } } .ProseMirror article[data-type='incut'] { - @include font-size(1.4rem); - @include media-breakpoint-up(sm) { margin-left: -2rem; margin-right: -2rem; @@ -186,6 +181,7 @@ mark.highlight { margin-right: -3em; } + font-size:1.4rem; background: #f1f2f3; margin: 1em -1rem; padding: 2em 2rem; diff --git a/src/components/Editor/MiniEditor.module.scss b/src/components/Editor/MiniEditor.module.scss index 7b1548f5..4ff2e973 100644 --- a/src/components/Editor/MiniEditor.module.scss +++ b/src/components/Editor/MiniEditor.module.scss @@ -8,13 +8,11 @@ position: relative; .compactEditor { - @include font-size(1.4rem); - + font-size:1.4rem; min-height: 100px; .emptyNode:first-child::before { - @include font-size(1.4rem); - + font-size:1.4rem; position: absolute; top: 4px; height: 0; @@ -154,8 +152,7 @@ } .label { - @include font-size(1.2rem); - + font-size:1.2rem; position: absolute; top: 6px; left: 12px; diff --git a/src/components/Editor/Panel/Panel.module.scss b/src/components/Editor/Panel/Panel.module.scss index 537ecee0..1d53d1d4 100644 --- a/src/components/Editor/Panel/Panel.module.scss +++ b/src/components/Editor/Panel/Panel.module.scss @@ -104,7 +104,7 @@ } .typographStatus { - @include font-size(1.2rem); + font-size:1.2rem; } .typographStatusSuccess { diff --git a/src/components/Editor/Toolbar/MicroBubbleMenu.tsx b/src/components/Editor/Toolbar/MicroBubbleMenu.tsx index 0c532a32..06883fb9 100644 --- a/src/components/Editor/Toolbar/MicroBubbleMenu.tsx +++ b/src/components/Editor/Toolbar/MicroBubbleMenu.tsx @@ -20,7 +20,8 @@ export const MicroBubbleMenu = (props: MicroBubbleMenuProps) => { const isActive = (name: string, attributes?: Record) => createEditorTransaction( - () => props.editor, + // biome-ignore lint/suspicious/noExplicitAny: tiptap 2.8.0 typing issue + () => props.editor as any, (editor) => editor?.isActive(name, attributes) ) diff --git a/src/components/Feed/ArticleCard/ArticleCard.module.scss b/src/components/Feed/ArticleCard/ArticleCard.module.scss index c617942f..0ccb6f1b 100644 --- a/src/components/Feed/ArticleCard/ArticleCard.module.scss +++ b/src/components/Feed/ArticleCard/ArticleCard.module.scss @@ -133,8 +133,7 @@ } .shoutAuthor { - @include font-size(1.4rem); - + font-size:1.4rem; font-weight: 500; margin-right: 1.6rem; @@ -151,8 +150,7 @@ } .shoutDate { - @include font-size(1.2rem); - + font-size:1.2rem; color: #9fa1a7; font-weight: 500; } @@ -167,19 +165,18 @@ justify-content: space-between; .shoutAuthor { - @include font-size(1.2rem); + font-size:1.2rem; } } .shoutCardTitle { - @include font-size(2.2rem); - + font-size:2.2rem; font-weight: 700; line-height: 1.2; margin-bottom: 0.8rem; :global(.col-md-12) & { - @include font-size(2.6rem); + font-size:2.6rem; } } @@ -193,22 +190,19 @@ } .shoutCardTitlesContainerFeedMode & { - @include font-size(3.2rem); - + font-size:3.2rem; line-height: 1.1; } } .shoutCardDescription { - @include font-size(1.6rem); - + font-size:1.6rem; color: var(--default-color); margin-bottom: 1.4rem; } .shoutCardSubtitle { - @include font-size(1.8rem); - + font-size:1.8rem; color: #141414; font-weight: 400; line-height: 1.3; @@ -369,8 +363,7 @@ .shoutCardTitle, .shoutCardSubtitle { - @include font-size(2.6rem); - + font-size:2.6rem; display: inline; line-height: 1.2; } @@ -528,7 +521,7 @@ } .shoutCardTitle { - @include font-size(3.2rem); + font-size:3.2rem; } .shoutTopic a { @@ -571,8 +564,7 @@ } .shoutCardDetails { - @include font-size(1.5rem); - + font-size:1.5rem; align-items: flex-start; border-top: 2px solid var(--black-500); display: flex; @@ -723,22 +715,20 @@ .shoutCardBigTitle { .shoutCardTitle { - @include font-size(3.2rem); - + font-size:3.2rem; display: block; padding-right: 0; } .shoutCardSubtitle { - @include font-size(2.6rem); + font-size:2.6rem; } } .shoutCardCompact { .shoutCardTitle, .shoutCardSubtitle { - @include font-size(2.2rem); - + font-size:2.2rem; display: inline; line-height: 1.2; } @@ -765,8 +755,7 @@ .shoutCardTitle, .shoutCardSubtitle { - @include font-size(1.8rem); - + font-size:1.8rem; display: inline; } @@ -836,15 +825,13 @@ } .shoutCardTitle { - @include font-size(4rem); - + font-size:4rem; font-weight: 900; line-height: 1.1; } .shoutCardSubtitle { - @include font-size(2.4rem); - + font-size: 2.4rem; flex: 1; } } diff --git a/src/components/Feed/Beside.module.scss b/src/components/Feed/Beside.module.scss index 4dd2ae73..f56d7878 100644 --- a/src/components/Feed/Beside.module.scss +++ b/src/components/Feed/Beside.module.scss @@ -106,8 +106,7 @@ } a:link { - @include font-size(1.4rem); - + font-size:1.4rem; border: none; font-weight: bold; padding-right: 0.3em; @@ -125,8 +124,7 @@ } h4 { - @include font-size(2.6rem); - + font-size:2.6rem; font-weight: bold; padding-right: 1em; } diff --git a/src/components/Feed/Placeholder/Placeholder.module.scss b/src/components/Feed/Placeholder/Placeholder.module.scss index ff928c65..33a3cd53 100644 --- a/src/components/Feed/Placeholder/Placeholder.module.scss +++ b/src/components/Feed/Placeholder/Placeholder.module.scss @@ -12,8 +12,7 @@ button, .button { - @include font-size(1.5rem); - + font-size:1.5rem; align-items: center; border-radius: 1.2rem; display: flex; @@ -119,7 +118,7 @@ } h3 { - @include font-size(3.8rem); + font-size:3.8rem; } .button { @@ -233,13 +232,12 @@ } .bottomLinks { - @include font-size(1.6rem); - @include media-breakpoint-down(sm) { flex-direction: column; gap: 1.4rem; } + font-size:1.6rem; display: flex; gap: 4rem; diff --git a/src/components/Feed/Sidebar/Sidebar.module.scss b/src/components/Feed/Sidebar/Sidebar.module.scss index ff65e801..3e02ebb8 100644 --- a/src/components/Feed/Sidebar/Sidebar.module.scss +++ b/src/components/Feed/Sidebar/Sidebar.module.scss @@ -38,8 +38,7 @@ } .counter { - @include font-size(1.2rem); - + font-size:1.2rem; align-items: center; align-self: flex-start; background: #f6f6f6; @@ -131,8 +130,7 @@ } h4 { - @include font-size(1.2rem); - + font-size:1.2rem; font-weight: bold; color: #9fa1a7; cursor: pointer; diff --git a/src/components/HeaderNav/Header.module.scss b/src/components/HeaderNav/Header.module.scss index f797c9fa..d920a11c 100644 --- a/src/components/HeaderNav/Header.module.scss +++ b/src/components/HeaderNav/Header.module.scss @@ -122,12 +122,11 @@ } .mainNavigationWrapper { - @include font-size(1.7rem); - @include media-breakpoint-down(lg) { display: none; } + font-size:1.7rem; position: relative; .fixed & { @@ -380,12 +379,11 @@ } .articleHeader { - @include font-size(1.4rem); - @include media-breakpoint-down(md) { display: none; } + font-size:1.4rem; left: $container-padding-x; margin: 0.2em 0; overflow: hidden; diff --git a/src/components/HeaderNav/TopicsNav.module.scss b/src/components/HeaderNav/TopicsNav.module.scss index 2c436944..ffe7da6a 100644 --- a/src/components/HeaderNav/TopicsNav.module.scss +++ b/src/components/HeaderNav/TopicsNav.module.scss @@ -4,7 +4,7 @@ } @include media-breakpoint-up(md) { - @include font-size(1.4rem); + font-size:1.4rem; } font-size: 1.6rem; diff --git a/src/components/Inbox/CreateModalContent.module.scss b/src/components/Inbox/CreateModalContent.module.scss index 53328161..8052fd24 100644 --- a/src/components/Inbox/CreateModalContent.module.scss +++ b/src/components/Inbox/CreateModalContent.module.scss @@ -5,6 +5,7 @@ justify-content: space-around; gap: 12px; } + .chatTitleInput { width: 100%; padding: 0.5rem 1rem; @@ -17,7 +18,7 @@ &:focus { border-color: #80bdff; outline: 0; - box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25); + box-shadow: 0 0 0 0.2rem rgb(0 123 255 / 25%); } } } diff --git a/src/components/Inbox/CreateModalContent.tsx b/src/components/Inbox/CreateModalContent.tsx index d2785f7e..6ecdebfa 100644 --- a/src/components/Inbox/CreateModalContent.tsx +++ b/src/components/Inbox/CreateModalContent.tsx @@ -78,7 +78,7 @@ const CreateModalContent = (props: Props) => { required={true} class={styles.chatTitleInput} // TODO: Удалите эти классы, если они не нужны - // class="form-control form-control-lg fs-3" + // class="form-control form-control-lg fs-3" placeholder={t('Chat Title')} /> )} @@ -92,13 +92,7 @@ const CreateModalContent = (props: Props) => {
-