From 92f495f5b86f4878683cf367019cdade89546672 Mon Sep 17 00:00:00 2001
From: Ivan <8611739+IRBorisov@users.noreply.github.com>
Date: Thu, 3 Oct 2024 16:26:00 +0300
Subject: [PATCH] M: Minor style fixes
---
TODO.txt | 3 ++
.../src/pages/ManualsPage/ManualsPage.tsx | 2 +-
.../src/pages/ManualsPage/ViewTopic.tsx | 6 +++-
.../OssPage/EditorOssCard/EditorOssCard.tsx | 2 +-
.../EditorRSFormCard/EditorRSFormCard.tsx | 2 +-
rsconcept/frontend/src/styling/constants.css | 8 +++++
rsconcept/frontend/src/styling/setup.css | 35 ++++++++++---------
7 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/TODO.txt b/TODO.txt
index d9d5f241..fc60a8f9 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,6 +1,9 @@
!! This is not complete list of TODOs !!
For more specific TODOs see comments in code
+[Bugs - PENDING]
+- Tab index still selecting background elements when modal is active
+
[Functionality - PROGRESS]
- OSS change propagation: Advanced features
diff --git a/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx b/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx
index cbed048b..68ebdf82 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx
@@ -35,7 +35,7 @@ function ManualsPage() {
);
return (
-
+
onSelectTopic(topic)} />
diff --git a/rsconcept/frontend/src/pages/ManualsPage/ViewTopic.tsx b/rsconcept/frontend/src/pages/ManualsPage/ViewTopic.tsx
index 4a094d12..0e0bbcc0 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/ViewTopic.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/ViewTopic.tsx
@@ -12,7 +12,11 @@ interface ViewTopicProps {
function ViewTopic({ topic }: ViewTopicProps) {
const { mainHeight } = useConceptOptions();
return (
-
+
);
diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssCard/EditorOssCard.tsx b/rsconcept/frontend/src/pages/OssPage/EditorOssCard/EditorOssCard.tsx
index 79b1152e..4e6f8808 100644
--- a/rsconcept/frontend/src/pages/OssPage/EditorOssCard/EditorOssCard.tsx
+++ b/rsconcept/frontend/src/pages/OssPage/EditorOssCard/EditorOssCard.tsx
@@ -49,7 +49,7 @@ function EditorOssCard({ isModified, onDestroy, setIsModified }: EditorOssCardPr
/>
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx
index 69f74f39..4ebeae94 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx
@@ -49,7 +49,7 @@ function EditorRSFormCard({ isModified, onDestroy, setIsModified }: EditorRSForm
/>
diff --git a/rsconcept/frontend/src/styling/constants.css b/rsconcept/frontend/src/styling/constants.css
index ab790391..b17b59d0 100644
--- a/rsconcept/frontend/src/styling/constants.css
+++ b/rsconcept/frontend/src/styling/constants.css
@@ -7,6 +7,14 @@
--font-ui: 'Alegreya Sans SC', 'Rubik', 'Noto Color Emoji', 'Segoe UI Symbol', sans-serif;
--font-main: 'Rubik', 'Noto Color Emoji', 'Fira Code', 'Noto Sans Math', 'Noto Sans Symbols 2', 'Segoe UI Symbol', sans-serif;
--font-math: 'Fira Code', 'Noto Sans Math', 'Noto Sans Symbols 2', 'Rubik', 'Noto Color Emoji', 'Segoe UI Symbol', sans-serif;
+
+ /* Numeric parameters */
+ --font-size-base: 16px;
+ --font-size-sm: 12px;
+ --line-height: 1.5;
+
+ --text-max-width: 75ch;
+ --scroll-padding: 3rem;
/* Light Theme */
--cl-bg-120: hsl(000, 000%, 100%);
diff --git a/rsconcept/frontend/src/styling/setup.css b/rsconcept/frontend/src/styling/setup.css
index be443dac..58c57c8a 100644
--- a/rsconcept/frontend/src/styling/setup.css
+++ b/rsconcept/frontend/src/styling/setup.css
@@ -8,22 +8,23 @@
@tailwind components;
@tailwind utilities;
-html,
-body {
- -webkit-text-size-adjust: 100%;
+html {
+ -webkit-text-size-adjust: none;
+ -moz-text-size-adjust: none;
+ text-size-adjust: none;
- width: 100%;
- height: 100%;
+ hanging-punctuation: first last;
+ color-scheme: dark light;
+
+ /* interpolate-size: allow-keywords; */
+}
+
+body {
margin: 0px;
padding: 0px;
overflow-x: hidden;
}
-html {
- hanging-punctuation: first last;
- color-scheme: dark light;
-}
-
[data-color-scheme='dark'] {
color-scheme: dark;
}
@@ -36,13 +37,13 @@ html {
@media (prefers-reduced-motion: no-preference) {
:has(:target) {
scroll-behavior: smooth;
- scroll-padding-top: 3rem;
+ scroll-padding-top: var(--scroll-padding);
}
}
:root {
- font-size: 16px;
- line-height: 24px;
+ font-size: var(--font-size-base);
+ line-height: var(--line-height);
font-family: var(--font-main);
color: var(--cl-fg-100);
@@ -58,8 +59,7 @@ html {
@media only screen and (max-width: 639px) {
:root {
- font-size: 12px;
- line-height: 18px;
+ font-size: var(--font-size-sm);
}
}
@@ -104,7 +104,7 @@ h6 {
/* Limit text lines and setup wrapping */
p,
li {
- max-width: 75ch;
+ max-width: var(--text-max-width);
text-wrap: pretty;
}
@@ -119,6 +119,9 @@ div:not(.dense) > p {
h2 {
@apply [&:not(:first-child)]:mt-2 font-semibold text-center;
+ [role='manuals'] & {
+ @apply [&:not(:first-child)]:mt-3 mb-2;
+ }
}
b {