Skip to content

Feature/bootstrap support #1

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

Open
bitscraps wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Feature/bootstrap support #1

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2e02155
update gem with bootstrap classes
phapsides Jan 5, 2017
8f31124
test space
phapsides Jan 5, 2017
88c358e
update template’s head
phapsides Jan 5, 2017
0b0a205
test references
phapsides Jan 5, 2017
d6c7fd7
revert tested references
phapsides Jan 5, 2017
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
38 changes: 31 additions & 7 deletions lib/livingstyleguide/templates/layout.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
<meta content="ie=edge" http-equiv="x-ua-compatible">
<meta content="width=device-width,initial-scale=1" name="viewport">
<meta content="livingstyleguide.org <%= LivingStyleGuide::VERSION %>" name="generator">

<link href="https://dax2lgcd0wbaz.cloudfront.net/assets/favicon-ef96c1978fef7b3c2b5c6a66bb7d75bc856702cfe7dd688fb6e4a6e609eca897.ico" rel="shortcut icon" type="image/vnd.microsoft.icon">
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css"></link>

<title><%= ERB::Util.h(title) %></title>
<script>
<%= javascript %>
Expand All @@ -17,16 +23,34 @@
<body class="lsg">
<%= header %>
<% unless before.empty? %>
<section class="lsg-before">
<%= before %>
<section class="container">
<section class="row">
<div class="col-md-12">
<section class="lsg-before">
<%= before %>
</section>
</div>
</section>
</section>
<% end %>
<article class="lsg-container">
<%= html %>
</article>
<section class="container">
<section class="row">
<div class="col-md-12">
<article class="lsg-container">
<%= html %>
</article>
</div>
</section>
</section>
<% unless after.empty? %>
<section class="lsg-after">
<%= after %>
<section class="container">
<section class="row">
<div class="col-md-12">
<section class="lsg-after">
<%= after %>
</section>
</div>
</section>
</section>
<% end %>
<%= footer %>
Expand Down