bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Fixed invalid HTML in workshop previews

Browse Source
This commit is contained in:
Godwin 2016-06-03 18:16:04 -07:00
parent dfdb44b5ae
commit f52f282c43
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/assets/stylesheets/_application.scss
View File

@ -1748,19 +1748,30 @@ html[data-lingua-franca-example="html"] {
overflow: hidden; overflow: hidden;
} }
.workshop-link {
position: static;
@include before {
content: '';
display: block;
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0
}
@include after {
display: none;
}
}
> li { > li {
position: relative;
margin-bottom: 1em; margin-bottom: 1em;
border: 0.2em solid; border: 0.2em solid;
@include _(border-radius, 0.25em); @include _(border-radius, 0.25em);
@include _(transition, box-shadow 250ms ease-in-out);
> a { will-change: box-shadow;
display: block;
color: inherit;
@include after {
display: none;
}
}
ul { ul {
padding-left: 2.5em; padding-left: 2.5em;

14
app/views/workshops/_workshop_previews.html.haml
View File

@ -2,11 +2,11 @@
- workshops.sort_by{ |w| w.title.downcase }.each do |w| - workshops.sort_by{ |w| w.title.downcase }.each do |w|
- is_interested = w.interested?(current_user) - is_interested = w.interested?(current_user)
%li{class: [is_interested ? :interested : nil]} %li{class: [is_interested ? :interested : nil]}
= link_to view_workshop_path(w.conference.slug, w.id) do = link_to view_workshop_path(w.conference.slug, w.id), class: 'workshop-link' do
%h4.title=w.title %h4.title=w.title
.workshop-interest .workshop-interest
- if is_interested - if is_interested
=_'articles.workshops.info.you_are_interested_count', "You and #{w.interested_count - 1} others are interested in this workshop", :vars => {:count => (w.interested_count - 1)} =_'articles.workshops.info.you_are_interested_count', "You and #{w.interested_count - 1} others are interested in this workshop", :vars => {:count => (w.interested_count - 1)}
- elsif w.interested_count > 0 - elsif w.interested_count > 0
=_'articles.workshops.info.interested_count', "#{w.interested_count} people are interested in this workshop", :vars => {:count => w.interested_count} =_'articles.workshops.info.interested_count', "#{w.interested_count} people are interested in this workshop", :vars => {:count => w.interested_count}
.workshop-description=w.info.html_safe .workshop-description=w.info.html_safe