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

fix desktop styling #159

Merged
merged 2 commits into from
Jun 8, 2017
+8 −7
Merged

fix desktop styling #159

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
491d93b
fix desktop styling
Suuuuha Jun 8, 2017
550e279
fix merge conflict and margin bottom class
m4v15 Jun 8, 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
4 changes: 4 additions & 0 deletions public/css/main.css
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,10 @@
height: 6rem;
}

.mb-nav {
margin-bottom: 3rem;
}

.amiri {
font-family: 'Amiri', serif;
}
2 changes: 1 addition & 1 deletion views/home.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<section class="w-100 tc white fixed top-0 mb3">
<section class="center mw6 w-100 tc white top-0 mb-nav">
<section class="tc mt5 mb2 pa1">
<h2 class="ma0">{{text.disabilitiesPrompt}}</h2>
</section>
2 changes: 1 addition & 1 deletion views/result.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<section class="w-100 tc white mb3">
<section class="w-100 center mw6 tc white mb-nav">
<div class="mt4 pt2 f3 mh2 fixed top-0">
<a href="/services" class="near-white dim" aria-label={{text.back}}><i aria-hidden="true" class="{{{chooseBack dir}}}"></i></a>
</div>
5 changes: 1 addition & 4 deletions views/serviceInfo.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<section class="tc w-100 white">
<section class="tc center mw6 w-100 white mb-nav">
<div class="mt4 pt2 f3 mh2 fixed top-0">
<a href="{{{back}}}" class="near-white dim" aria-label={{text.back}}><i aria-hidden="true" class="{{{chooseBack dir}}}"></i></a>
</div>
@@ -41,9 +41,6 @@
<a href="https://www.instagram.com" aria-label="{{{text.instagram}}}"><i class="fa fa-instagram link dim black" aria-hidden="true"></i></a>
</section>
<div id="googleMap" style="width:100%;height:400px;" data-lat={{latlng.lat}} data-lng={{latlng.lng}} data-name={{service.name}}></div>
<div class="h4">

</div>
</div>
</section>

2 changes: 1 addition & 1 deletion views/services.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<section class="w-100 tc white fixed top-0 mb3">
<section class="w-100 tc white center mw6 top-0 mb-nav">
<div class="mt4 pt2 f3 mh2">
<a href="/" class="near-white dim" aria-label={{text.back}}><i aria-hidden="true" class="{{{chooseBack dir}}}"></i></a>
</div>