Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cf2021
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
vojtech.pikal
cf2021
Commits
3f17c283
Commit
3f17c283
authored
4 years ago
by
xaralis
Browse files
Options
Downloads
Patches
Plain Diff
fix: overflow corner cases
parent
1aecab2d
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
public/index.html
+3
-3
3 additions, 3 deletions
public/index.html
src/components/posts/Post.jsx
+6
-8
6 additions, 8 deletions
src/components/posts/Post.jsx
src/pages/Home.jsx
+12
-3
12 additions, 3 deletions
src/pages/Home.jsx
with
21 additions
and
14 deletions
public/index.html
+
3
−
3
View file @
3f17c283
...
...
@@ -12,7 +12,7 @@
<meta
name=
"msapplication-square150x150logo"
content=
"%REACT_APP_STYLEGUIDE_URL%/images/favicons/mstile-150x150.png"
>
<meta
name=
"msapplication-wide310x150logo"
content=
"%REACT_APP_STYLEGUIDE_URL%/images/favicons/mstile-310x150.png"
>
<meta
name=
"msapplication-square310x310logo"
content=
"%REACT_APP_STYLEGUIDE_URL%/images/favicons/mstile-310x310.png"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1"
/>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1
, shrink-to-fit=no
"
/>
<meta
name=
"theme-color"
content=
"#000000"
/>
<meta
property=
"og:url"
content=
"https://cf2021.pirati.cz/"
/>
<meta
property=
"og:type"
content=
"website"
/>
...
...
@@ -39,9 +39,9 @@
<link
rel=
"stylesheet"
href=
"%REACT_APP_STYLEGUIDE_URL%/css/styles.css"
/>
<script
src=
"https://polyfill.io/v3/polyfill.min.js?features=IntersectionObserver"
></script>
</head>
<body
class=
"h-screen"
>
<body>
<noscript>
You need to enable JavaScript to run this app.
</noscript>
<div
id=
"root"
class=
"h-screen h-full w-full"
></div>
<div
id=
"root"
></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
...
...
This diff is collapsed.
Click to expand it.
src/components/posts/Post.jsx
+
6
−
8
View file @
3f17c283
...
...
@@ -201,7 +201,7 @@ const Post = ({
className
=
"w-8 h-8 lg:w-14 lg:h-14 mr-3 rounded object-cover"
alt
=
{
author
.
name
}
/>
<
div
className
=
"flex-1
w-full
"
>
<
div
className
=
"flex-1
overflow-hidden
"
>
<
div
className
=
"mb-1"
>
<
div
className
=
"flex justify-between items-start xl:items-center"
>
<
div
className
=
"flex flex-col xl:flex-row xl:items-center"
>
...
...
@@ -248,7 +248,7 @@ const Post = ({
supportThreshold
=
{
supportThreshold
}
/>
{
showActions
&&
(
<
DropdownMenu
right
className
=
"pl-4"
>
<
DropdownMenu
right
className
=
"pl-4
static
"
>
{
showAnnounceAction
&&
(
<
DropdownMenuItem
onClick
=
{
onAnnounceProcedureProposal
}
...
...
@@ -327,12 +327,10 @@ const Post = ({
<
div
className
=
"flex lg:hidden flex-row flex-wrap my-2 space-x-2"
>
{
labels
}
</
div
>
<
div
className
=
"overflow-hidden"
>
<
div
className
=
"text-sm lg:text-base text-black leading-normal content-block overflow-x-scroll overflow-y-hidden"
dangerouslySetInnerHTML
=
{
htmlContent
}
></
div
>
</
div
>
<
div
className
=
"text-sm lg:text-base text-black leading-normal content-block overflow-x-scroll overflow-y-hidden mt-1"
dangerouslySetInnerHTML
=
{
htmlContent
}
></
div
>
</
div
>
</
div
>
);
...
...
This diff is collapsed.
Click to expand it.
src/pages/Home.jsx
+
12
−
3
View file @
3f17c283
...
...
@@ -220,7 +220,7 @@ const Home = () => {
onClick
=
{
showTutorial
}
/>
{
displayActions
&&
(
<
DropdownMenu
right
triggerSize
=
"lg"
>
<
DropdownMenu
right
triggerSize
=
"lg"
className
=
"z-20"
>
<
DropdownMenuItem
onClick
=
{
()
=>
setShowProgramEditModal
(
true
)
}
icon
=
"ico--pencil"
...
...
@@ -258,7 +258,11 @@ const Home = () => {
</
div
>
</
div
>
</
div
>
<
section
className
=
"cf2021__video"
>
<
section
className
=
"cf2021__video"
// This prevents overflowing on very long lines without spaces on mobile, 2rem compensates container-padding--zero.
style
=
{
{
maxWidth
:
"
calc(100vw - 2rem)
"
}
}
>
<
div
className
=
"container-padding--zero md:container-padding--auto"
>
{
streamUrl
&&
(
<
div
className
=
"iframe-container joyride-player"
>
...
...
@@ -296,7 +300,12 @@ const Home = () => {
</
div
>
</
section
>
<
section
className
=
"cf2021__posts joyride-posts"
>
{
/* Relative is for fixing the dropdowns on the right which are detached from their immediate container. */
}
<
section
className
=
"cf2021__posts relative joyride-posts"
// This prevents overflowing on very long lines without spaces on mobile, 2rem compensates container-padding--zero.
style
=
{
{
maxWidth
:
"
calc(100vw - 2rem)
"
}
}
>
<
div
className
=
"flex flex-col xl:flex-row xl:justify-between xl:items-center mb-4"
>
<
h2
className
=
"head-heavy-xs md:head-heavy-sm whitespace-no-wrap"
>
<
span
>
Příspěvky v rozpravě
</
span
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment