Skip to content
This repository has been archived by the owner on Feb 24, 2021. It is now read-only.

Commit

Permalink
[#168] trying to fix lost changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@loicsans
loicsans committed Apr 24, 2014
1 parent 0c9996b commit 26976fa
Show file tree
Hide file tree
Showing 6 changed files with 5,570 additions and 26 deletions.
12 changes: 12 additions & 0 deletions code/.htaccess
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

# BEGIN WordPress
<IfModule mod_rewrite.c>
RewriteEngine On
RewriteBase /akvo-web-master/code/
RewriteRule ^index\.php$ - [L]
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule . /akvo-web-master/code/index.php [L]
</IfModule>

# END WordPress
5,253 changes: 5,252 additions & 1 deletion code/wp-content/themes/Akvo-responsive/css/main.css
View file

Large diffs are not rendered by default.

14 changes: 6 additions & 8 deletions code/wp-content/themes/Akvo-responsive/css/main.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2141,7 +2141,7 @@ body.home h1.akvoDescr {
}
}
.products #productWindow div.fourColumns div {
background: rgb(245, 245, 245);
background: rgb(255,255,255);
}
#productWindow div h1,
#productWindow div h2 {
Expand Down Expand Up @@ -2206,11 +2206,9 @@ body.home h1.akvoDescr {
}
}
#productWindow a.tagLine:after {
border-bottom: 1px solid rgb(255, 255, 255);
border-top: 1px solid rgb(228, 228, 228);
content: "";
display: block;
margin: 10px auto 5px auto;
margin: 10px auto 50px auto;
width: 100%;
}
@media screen and (max-width:768px) {
Expand Down Expand Up @@ -2256,19 +2254,19 @@ body.home h1.akvoDescr {
color: rgb(191, 131, 185);
}
#rsrBucket h1 {
background-size: 85%;
background-size: 75% auto;
background: url("../images/rsr-logo-40px.png") center top no-repeat;
}
#flowBucket h1 {
background-size: 85%;
background-size: 75% auto;
background: url("../images/flow-logo-40px.png") center top no-repeat;
}
#openaidBucket h1 {
background-size: 85%;
background-size: 75% auto;
background: url("../images/openaid-logo-40px.png") center top no-repeat;
}
#akvopedia h1 {
background-size: 85%;
background-size: 75% auto;
background: url("../images/akvopedia-logo-40px.png") center top no-repeat;
}
/*************************************************************
Expand Down
34 changes: 23 additions & 11 deletions code/wp-content/themes/Akvo-responsive/foundation.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
<br/>
<br/>
<div id="advisoryGroup" class="directors">
<p class="">Akvo has a four-person supervisory board that oversees our work:</p>
<p class="directorsAbs">Board of directors:</p>
<p>Akvo has a four-person supervisory board that oversees our work:</p>
<ul class="staff floats-in">
<li class="staffAsset advisory" id="aalt">
<div class="imgWrapper"><img src="<?php bloginfo('template_directory'); ?>/images/staff/aalt240.jpg" title="Aalt Leusink" alt="Aalt Leusink - chairman of the board " /></div>
Expand All @@ -42,7 +41,10 @@
<div class="imgWrapper"><img src="<?php bloginfo('template_directory'); ?>/images/staff/sunita240.jpg" title="Sunita Nadhamuni" alt="Sunita Nadhamuni, Board member" /></div>
<div class="staffName"><a href="#">Sunita Nadhamuni</a></div>
<p class="staffTitle">Board member</p>
<small>Click for more details.</small>
<small>Click for more details.</small></li>
</ul>
<p>Board of directors:</p>
<ul class="floats-in staff">
<li class="staffAsset" id="jeroen">
<div class="imgWrapper"><img src="<?php bloginfo('template_directory'); ?>/images/staff/jvds_240.jpg" title="Jeroen van der Sommen" alt="Jeroen van der Sommen - Co-founder And Co-director" /></div>
<div class="staffName"><a href="#">Jeroen van der Sommen</a></div>
Expand All @@ -53,6 +55,11 @@
<div class="staffName"><a href="#">Thomas Bjelkeman-Pettersson</a></div>
<p class="staffTitle">Co-founder and director</p>
<small>Click for more details.</small></li>
<li class="staffAsset" id="kathelyne">
<div class="imgWrapper"><img src="<?php bloginfo('template_directory'); ?>/images/staff/kathelyne240x135.png" title="Kathelyne van den Berg, Chief financial officer" alt="Kathelyne van den Berg, Chief financial officer" /></div>
<div class="staffName"><a href="#">Kathelyne van den Berg</a></div>
<p class="staffTitle">Chief financial officer</p>
<small>Click for more details.</small></li>
</ul>
</div>
</section>
Expand All @@ -64,8 +71,6 @@
<br/>
<div id="advisoryGroup" class="directors">
<p>Board of directors:</p>
<p class="directorsAbs">Management:</p>

<ul class="staff floats-in">
<li class="staffAsset advisory" id="markN">
<div class="imgWrapper"><img src="<?php bloginfo('template_directory'); ?>/images/staff/MarkN240.jpg" title="Mark Nitzberg" alt="Mark Nitzberg, Board member" /></div>
Expand All @@ -80,7 +85,9 @@
<li class="staffAsset advisory" id="paulC">
<div class="imgWrapper"><img src="<?php bloginfo('template_directory'); ?>/images/staff/paulC240.png" title="Paul Ciandrini" alt="Paul Ciandrini, Board member" /></div>
<div class="staffName"><a href="#">Paul Ciandrini</a></div>
<p class="staffTitle">Board member</p>
<p class="staffTitle">Board member</p></ul> <p>Management:</p>

<ul class="staff floats-in">

<li class="staffAsset" id="henry">
<div class="imgWrapper"><img src="<?php bloginfo('template_directory'); ?>/images/staff/henry240.jpg" title="Henry Jewell" alt=" Henry Jewell, programme manager, Akvo FLOW" /></div>
Expand All @@ -95,13 +102,12 @@
<h2>Akvo Kenya Ltd</h2>
<p>Akvo has established a limited company in Nairobi to support operations while the formal process of establishing a non-profit foundation in Kenya is underway.</p>
<div id="advisoryGroup" class="directors">
<p>Trustees:</p> <p class="directorsAbs">Management:</p>

<p>Trustees:</p>
<ul class="staff floats-in">
<li class="staffAsset" id="akvoF">
<div class="imgWrapper"><img src="<?php bloginfo('template_directory'); ?>/images/staff/akvo240.jpg" title="Akvo foundation" alt="Akvo foundation represented by Jeroen van der Sommen" /></div>
<div class="staffName"><a href="#">Akvo Foundation</a></div>
<p class="staffTitle">represented by Jeroen van der Sommen</p>
<p class="staffTitle">represented by Peter van der Linde</p>
<small>Click for more details.</small></li>
<li class="staffAsset advisory" id="sam">
<div class="imgWrapper"><img src="<?php bloginfo('template_directory'); ?>/images/staff/Sam240.png" title="BSam Gichuru" alt="Sam Gichuru, Board member" /></div>
Expand All @@ -112,8 +118,9 @@
<div class="imgWrapper"><img src="<?php bloginfo('template_directory'); ?>/images/staff/bertil240.jpg" title="Bertil van Vugt" alt="Bertil van Vugt, Board member" /></div>
<div class="staffName"><a href="#">Bertil van Vugt</a></div>
<p class="staffTitle">Board member</p>
<small>Click for more details.</small>

<small>Click for more details.</small></li></ul> <p>Management:</p>
<ul class="staff floats-in">

<li class="staffAsset" id="luuk">
<div class="imgWrapper"><img src="<?php bloginfo('template_directory'); ?>/images/staff/Luukv2.jpg" title="Luuk Diphoorn" alt="Luuk Diphoorn, manager, East Africa hub " /></div>
<div class="staffName"><a href="#">Luuk Diphoorn</a></div>
Expand All @@ -134,5 +141,10 @@
<div class="buttons"><a class="cancel">close</a></div>
</div>
</div>
<script type="text/javascript">
$( document ).ready(function() {
});
</script>

<!-- end content -->
<?php get_footer(); ?>
12 changes: 6 additions & 6 deletions code/wp-content/themes/Akvo-responsive/sidebar.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@
<?php dynamic_sidebar( 'main' ); ?>
</div>
<?php endif; // end sidebar widget area ?>
<div class="widget faceBook">
<div class="fb-like-box" data-href="https://www.facebook.com/1Akvo" data-width="292" data-show-faces="true" data-header="true" data-stream="false" data-show-border="false"></div>
</div>
<div class="widget twitBuck"> <a class="twitter-timeline" href="https://twitter.com/search?q=+%40akvo+OR+%23akvo+OR+%23akvoflow" data-widget-id="373127164918378496">Tweets about " @akvo OR #akvo OR #akvoflow"</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
<div class="widget">
<h3 class="title">Meta</h3>
<ul>
Expand All @@ -40,11 +46,5 @@
<?php wp_meta(); ?>
</ul>
</div>
<div class="widget faceBook">
<div class="fb-like-box" data-href="https://www.facebook.com/1Akvo" data-width="292" data-show-faces="true" data-header="true" data-stream="false" data-show-border="false"></div>
</div>
<div class="widget twitBuck"> <a class="twitter-timeline" href="https://twitter.com/search?q=+%40akvo+OR+%23akvo+OR+%23akvoflow" data-widget-id="373127164918378496">Tweets about " @akvo OR #akvo OR #akvoflow"</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
<?php endif; // end sidebar widget area ?>
</aside>
Loading

0 comments on commit 26976fa

Please sign in to comment.