gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor HTML cleanup

Browse source
This commit is contained in:
Michael Ball 2019-12-19 02:36:42 -08:00
parent 904ca19878
commit 8a35bb377e
4 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/conferences/_conference_details.html.haml
View file

@ -6,7 +6,7 @@
= image_tag(conference.picture_url, class: 'img-responsive') if conference.picture? = image_tag(conference.picture_url, class: 'img-responsive') if conference.picture?
.col-md-6 .col-md-6
%h3 %h3
= conference.title = conference.title.html_safe
%small %small
%b %b
= date_string(conference.start_date, conference.end_date) = date_string(conference.start_date, conference.end_date)

26
app/views/conferences/_footer.haml
View file

@ -1,14 +1,14 @@
.scroll-top-wrapper -# .scroll-top-wrapper
= link_to "#banner", class: "smoothscroll" do -# = link_to "#banner", class: "smoothscroll" do
%i.fa.fa-2x.fa-arrow-circle-up -# %i.fa.fa-2x.fa-arrow-circle-up
:javascript -# :javascript
$(function(){ -# $(function(){
$(document).on( 'scroll', function(){ -# $(document).on( 'scroll', function(){
if ($(window).scrollTop() > 100) { -# if ($(window).scrollTop() > 100) {
$('.scroll-top-wrapper').addClass('show'); -# $('.scroll-top-wrapper').addClass('show');
} else { -# } else {
$('.scroll-top-wrapper').removeClass('show'); -# $('.scroll-top-wrapper').removeClass('show');
} -# }
}); -# });
}); -# });

2
app/views/conferences/show.html.haml
View file

@ -63,7 +63,7 @@
- if @conference.contact.has_social_media? - if @conference.contact.has_social_media?
= render 'social_media', contact: @conference.contact = render 'social_media', contact: @conference.contact
= render 'footer' = render 'footer'
)
-# - content_for :script_head do -# - content_for :script_head do
-# :javascript -# :javascript

4
app/views/layouts/application.html.haml
View file

@ -2,7 +2,7 @@
%head %head
%meta{charset: 'utf-8'} %meta{charset: 'utf-8'}
%meta{name: 'viewport', content: 'width=device-width, initial-scale=1'} %meta{name: 'viewport', content: 'width=device-width, initial-scale=1'}
%title= content_for?(:title) ? yield(:title) : (ENV['OSEM_NAME'] || 'OSEM') %title= content_for?(:title) ? strip_tags( yield(:title) ) : (ENV['OSEM_NAME'] || 'OSEM')
%meta{content: 'Snap!Con -- A conference all about Snap!, a programing language from UC Berkeley.', name: 'description'} %meta{content: 'Snap!Con -- A conference all about Snap!, a programing language from UC Berkeley.', name: 'description'}
%meta{content: 'Michael Ball, Brian Harvey, Jens Moenig, Bernat Romagosa, Dan Garcia, Lauren Mock', name: 'author'} %meta{content: 'Michael Ball, Brian Harvey, Jens Moenig, Bernat Romagosa, Dan Garcia, Lauren Mock', name: 'author'}
= stylesheet_link_tag "application", media: 'all' = stylesheet_link_tag "application", media: 'all'
@ -26,7 +26,7 @@
-# Admin area -# Admin area
- if controller.class.name.split("::").first=="Admin" - if controller.class.name.split("::").first=="Admin"
= render 'layouts/admin' = render 'layouts/admin'
-else - else
#messages #messages
.container .container
= render 'layouts/messages' = render 'layouts/messages'