Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
rescheduled 🗓️
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
c3lingo
rescheduled 🗓️
Commits
fe773187
Unverified
Commit
fe773187
authored
10 months ago
by
Teal
Committed by
GitHub
10 months ago
Browse files
Options
Downloads
Plain Diff
Merge pull request
#3
from moeffju/hover-height
Fix session holders shrinking on hover
parents
2bb009fa
c2df969b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/assets/stylesheets/application.tailwind.css
+9
-1
9 additions, 1 deletion
app/assets/stylesheets/application.tailwind.css
app/views/conferences/show.html.erb
+2
-4
2 additions, 4 deletions
app/views/conferences/show.html.erb
with
11 additions
and
5 deletions
app/assets/stylesheets/application.tailwind.css
+
9
−
1
View file @
fe773187
...
@@ -24,7 +24,15 @@ input[type=submit] {
...
@@ -24,7 +24,15 @@ input[type=submit] {
select
{
select
{
@apply
pl-2
pr-6
py-1;
@apply
pl-2
pr-6
py-1;
}
}
.session-holder
{
@apply
w-full;
}
.session-holder
{
@apply
w-full;
height
:
var
(
--height
);
display
:
flex
;
}
.session-holder
:hover
{
height
:
auto
;
min-height
:
var
(
--height
);
}
.session
{
.session
{
@apply
border
p-2
bg-slate-100
border-slate-300
rounded-md
w-full
hover
:
shadow-2xl
;
@apply
border
p-2
bg-slate-100
border-slate-300
rounded-md
w-full
hover
:
shadow-2xl
;
...
...
This diff is collapsed.
Click to expand it.
app/views/conferences/show.html.erb
+
2
−
4
View file @
fe773187
...
@@ -117,12 +117,10 @@ current_time = Time.zone.now.in_time_zone(@conference.time_zone)
...
@@ -117,12 +117,10 @@ current_time = Time.zone.now.in_time_zone(@conference.time_zone)
<h4>
<%=
stage
.
name
%>
</h4>
<h4>
<%=
stage
.
name
%>
</h4>
<div
class=
"stage-sessions"
>
<div
class=
"stage-sessions"
>
<%
sessions
.
each
do
|
session
|
%>
<%
sessions
.
each
do
|
session
|
%>
<div
class=
"session-holder hover:z-30 h-full
hover:!h-auto
"
style=
"
<div
class=
"session-holder hover:z-30 h-full"
style=
"
position: absolute;
position: absolute;
top:
<%=
(
session
.
starts_at
-
timeline_starts_at
)
/
3600.0
*
pixels_per_hour
%>
px;
top:
<%=
(
session
.
starts_at
-
timeline_starts_at
)
/
3600.0
*
pixels_per_hour
%>
px;
max-height:
<%=
(
session
.
ends_at
-
session
.
starts_at
)
/
3600.0
*
pixels_per_hour
%>
px;
--height:
<%=
(
session
.
ends_at
-
session
.
starts_at
)
/
3600.0
*
pixels_per_hour
%>
px;
min-height:
<%=
(
session
.
ends_at
-
session
.
starts_at
)
/
3600.0
*
pixels_per_hour
%>
px;
hxeight:
<%=
(
session
.
ends_at
-
session
.
starts_at
)
/
3600.0
*
pixels_per_hour
%>
px;
"
>
"
>
<%=
render
partial:
"sessions/session"
,
locals:
{
session:
session
}
%>
<%=
render
partial:
"sessions/session"
,
locals:
{
session:
session
}
%>
</div>
</div>
...
...
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