Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New blog design(issue#2454) #2484

Merged
merged 4 commits into from
Mar 14, 2018
Merged

New blog design(issue#2454) #2484

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c96892d
Replace blog link with stories from Read Stories button (Fixes issue …
mirzabob Mar 9, 2018
b2762f6
Merge https://github.com/publiclab/plots2
mirzabob Mar 12, 2018
0a0b379
changed button content(issue#2454)
mirzabob Mar 12, 2018
b67fc8c
Update home.html.erb
jywarren Mar 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/views/home/home.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<h1 style="font-family:Junction Light;font-size:4em;margin-top:0;margin-bottom:20px;padding-top:0.3em;">

Public Lab
Public Lab

<small class="hidden-xs" style="letter-spacing:100%;line-height:0.7em;"><%= t('home.home.public_lab_community') %> <a href="/join"><%= t('home.home.join_now') %> &raquo;</a></small>
<small class="visible-xs" style="font-size:0.4em;letter-spacing:100%;line-height:1.3em;"><%= t('home.home.public_lab_community') %> <a href="/join"><%= t('home.home.join_now') %> &raquo;</a></small>
Expand All @@ -32,7 +32,7 @@
<h3 style="text-align:center;color:#888;">
<a href="https://twitter.com/intent/follow?original_referer=http%3A%2F%2Fpubliclab.org%2Fhome&region=follow_link&screen_name=PublicLab&tw_p=followbutton&variant=2.0"><i style="text-decoration:none;" class="fa fa-twitter"></i></a>
&nbsp;
<a href="https://www.facebook.com/PublicLab"><i style="text-decoration:none;" class="fa fa-facebook"></i></a>
<a href="https://www.facebook.com/PublicLab"><i style="text-decoration:none;" class="fa fa-facebook"></i></a>
&nbsp;
<a href="https://instagram.com/publiclab"><i style="text-decoration:none;" class="fa fa-instagram"></i></a>
</h3>
Expand Down Expand Up @@ -101,7 +101,7 @@
<img class="img img-circle" src="//i.publiclab.org/system/images/photos/000/006/671/original/canoe.jpg"/>
<h2 class="the-problem"> <%= t('home.home.the_problem.title') %> </h2>
<h4><%= t('home.home.the_problem.lack_access') %> <a href="/tools"><%= t('home.home.the_problem.tools') %></a> <%= t('home.home.the_problem.need_participation') %></h4>
<p><a href="/blog" class="btn btn-primary btn-lg">Read stories &raquo;</a></p>
<p><a href="/wiki/stories" class="btn btn-primary btn-lg">Read blog stories &raquo;</a></p>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This route doesn't seem to exist in config/routes.rb

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jywarren

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True - we may eventually move this into the Features system; but for now this looks great!

</div>

<div class="col-md-4">
Expand Down