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

Master #1

Open
wants to merge 8 commits into
base: gh-pages
Choose a base branch
from
Open

Master #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
02bddaf
Trying this out
evolfo Sep 11, 2018
523ffc6
testing different config file
evolfo Sep 11, 2018
7b94382
fixing for real!
evolfo Sep 11, 2018
10a418a
testing config file change
evolfo Sep 11, 2018
0b682c9
Merge branch 'gh-pages'
evolfo Sep 11, 2018
3471ca7
Merge branch 'master' of https://github.com/evolfo/wearewhatwevote
evolfo Sep 11, 2018
d8ead6f
trying to fix again
evolfo Sep 11, 2018
a8abaf3
adding links to footer logos
evolfo Sep 11, 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
9 changes: 9 additions & 0 deletions .gitignore.orig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<<<<<<< HEAD
.bundle
.sass-cache
_site
Gemfile.lock
=======
.sass-cache
>>>>>>> gh-pages
.DS_Store
7 changes: 4 additions & 3 deletions _includes/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
<div class="row">
<div class="col-md-12">
<div class="footer-manu">
<img src="img/logo.png">
<a href="https://www.salomearthaus.com/"><img src="{{ site.baseurl }}/img/logo.png"></a>
<a href="https://www.stockboy.nyc"><img src="{{ site.baseurl }}/img/stockboy-logo.png"></a>
<ul class="socials-footer">
<li><a href="https://facebook.com/salomearthaus"><img src="img/socials/facebook.png"></a></li>
<li><a href="http://instagram.com/salomearthaus"><img src="img/socials/instagram.png"></a></li>
<li><a href="https://facebook.com/salomearthaus"><img src="{{ site.baseurl }}/img/socials/facebook.png"></a></li>
<li><a href="http://instagram.com/salomearthaus"><img src="{{ site.baseurl }}/img/socials/instagram.png"></a></li>
</ul>
<ul>
<li>Copyright © 2018 <a href="https://www.salomearthaus.com/">Salomé Arthaus</a>. All rights reserved.</li>
Expand Down
2 changes: 1 addition & 1 deletion _includes/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="index.html">
<a class="navbar-brand" href="{{ site.baseurl }}/">
<!--<img src="{{ site.baseurl }}/img/logo.png" alt="Logo">-->
<h1>#WeAreWhatWeVote</h1>
</a>
Expand Down
2 changes: 1 addition & 1 deletion about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h3>About us</h3>
<h3>About Salomé Arthaus</h3>
<p><a href="https://www.salomearthaus.com/">Salomé ArtHaus</a> is a collective based in Brooklyn, NY with the aim of cultivating an art and knowledge sharing community. By harnessing the creativity and skills inherent to our community we enrich and uplift one another in innumerable ways.</p>
<h3>About Stockboy Creative</h3>
<p><a href=www.stockboy.nyc">Stockboy Creative</a> is a multimedia production company based in NYC. Stockboy is both an artistic hub and a corporate content creator.</p>
<p><a href="https://www.stockboy.nyc">Stockboy Creative</a> is a multimedia production company based in NYC. Stockboy is both an artistic hub and a corporate content creator.</p>
<h3>Credits</h3>
<ul>
<li>Artistic Direction & Executive Production: Ella Joy Meir & Mikhal Weiner (Salomé ArtHaus)</li>
Expand Down
8 changes: 4 additions & 4 deletions css/airspace.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ font header .navbar-default .navbar-nav li a:hover {
background-size: cover;
background-attachment: fixed;
background-position: 10% 0%;
padding: 110px 0 90px 0;
padding: 90px 0 70px 0;
position: relative;
}
#slider:before {
Expand Down Expand Up @@ -131,7 +131,7 @@ font header .navbar-default .navbar-nav li a:hover {
margin-top: 24px;
width: 50%;
background-color: #015e9b;
color: #ff5c5c;
color: #fff;
padding: 3px;

}
Expand Down Expand Up @@ -784,8 +784,8 @@ font header .navbar-default .navbar-nav li a:hover {
footer {
background: #F5F5F5;
text-align: center;
padding-top: 48px;
padding-bottom: 55px;
padding-top: 30px;
padding-bottom: 10px;
}
footer p {
font-size: 13px;
Expand Down
Loading