Skip to content

Commit

Permalink
Merge pull request #146 from markusbink/145-bugfix-kleinere-formatier…
Browse files Browse the repository at this point in the history
…ungsanpassungen

145 bugfix kleinere formatierungsanpassungen
  • Loading branch information
markusbink authored Sep 27, 2022
2 parents 8f6872c + b6fd5e6 commit 12fd605
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
3 changes: 2 additions & 1 deletion src/components/JudgeHintPopup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export const JudgeHintPopup = () => {
}
};

const getEntryCode = () => {
const getEntryCode = () => {
let entry = entries.find((obj) => {
return obj.id === associatedEntryIdHint;
});
Expand Down Expand Up @@ -194,6 +194,7 @@ export const JudgeHintPopup = () => {
</label>
<Editor
defaultEditorState={editorState}
stripPastedStyles={true}
onEditorStateChange={setEditorState}
wrapperClassName={cx("w-full focus:outline-none")}
editorClassName="p-2 text-sm bg-offWhite text-mediumGrey rounded min-h-[100px] max-h-[200px]"
Expand Down
1 change: 1 addition & 0 deletions src/components/NotePopup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ export const NotePopup = () => {
</label>
<Editor
defaultEditorState={editorState}
stripPastedStyles={true}
onEditorStateChange={setEditorState}
wrapperClassName={cx("w-full focus:outline-none")}
editorClassName="p-2 text-sm bg-offWhite text-mediumGrey rounded min-h-[100px] max-h-[200px]"
Expand Down
4 changes: 2 additions & 2 deletions src/components/section-header/SectionTitle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const SectionTitle: React.FC<SectionTitleProps> = ({
}, [title]);

return (
<div className={cx("flex w-full flex-col")}>
<div className={cx("flex w-full flex-col pt-2")}>
<span
className={cx(
"text-xs font-bold rounded-md px-2 py-1 w-fit uppercase text-darkGrey",
Expand All @@ -64,7 +64,7 @@ export const SectionTitle: React.FC<SectionTitleProps> = ({
)}>
{role}
</span>
<div className={cx("flex items-start justify-between gap-2 w-full py-3")}>
<div className={cx("flex items-start justify-between gap-2 w-full pt-3")}>
{isEditing ? (
<input
ref={titleInputRef}
Expand Down
9 changes: 4 additions & 5 deletions src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ body {
}

h3 {
@apply text-xl font-bold mb-5 leading-5 hyphens-auto;
@apply text-xl font-bold mb-5 leading-5 hyphens-auto break-words;
}

/* SwiperJS Pagination Dots */
Expand All @@ -203,7 +203,7 @@ h3 {
/* Bulletpoints */
ul,
ol {
@apply space-y-2 my-6 ml-8;
@apply space-y-2 my-6 ml-8 hyphens-auto break-words;
}

:is(ul, ol) > :is(ul, ol) {
Expand All @@ -227,6 +227,7 @@ ul > ul > ul {
}

p {
@apply hyphens-auto break-words;
min-height: 20px;
}

Expand All @@ -236,7 +237,5 @@ p:not(:last-child) {

/* Break words for headlines */
h2 {
-webkit-hyphens: auto;
-ms-hyphens: auto;
hyphens: auto;
@apply hyphens-auto break-words;
}

0 comments on commit 12fd605

Please sign in to comment.