Skip to content

Commit

Permalink
Making sure parent and child files are the same prior to header testing
Browse files Browse the repository at this point in the history
  • Loading branch information
Adi committed Jun 24, 2014
1 parent b9c77f7 commit 78b91a8
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 15 deletions.
11 changes: 3 additions & 8 deletions micropasts/bg.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
<?php
$bg = array(
'http://micropasts.org/wp-content/uploads/2014/05/coins.jpg',
'http://micropasts.org/wp-content/uploads/2014/05/terracotta5.jpeg',
'http://micropasts.org/wp-content/uploads/2014/05/hoard.jpg',
'http://micropasts.org/wp-content/uploads/2014/05/easter.jpeg',
'http://micropasts.org/wp-content/uploads/2014/05/testaccio.jpg'
);
$bg = array('http://micropasts.org/wp-content/uploads/2014/05/coins.jpg','http://micropasts.org/wp-content/uploads/2014/05/terracotta5.jpeg','http://micropasts.org/wp-content/uploads/2014/05/hoard.jpg','http://micropasts.org/wp-content/uploads/2014/05/easter.jpeg','http://micropasts.org/wp-content/uploads/2014/05/testaccio.jpg');
$i = rand(0, count($bg)-1);
$selectedBg = $bg[$i];
$selectedBg = $bg[$i];
?>
Binary file modified micropasts/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions micropasts/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ body {
padding: 0;
background-color: #000;
font-family: Arial, Helvetica, Sans-Serif;
text-align: center;
background-size: cover;
background-repeat: no-repeat;
background-attachment: fixed;
Expand Down
2 changes: 1 addition & 1 deletion wpbootstrap/front-page.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="top-container"></div>

<div class="row jumbotron">
<div class="col-md-12">
<div class="col-md-12 mainpage">
<p><h1>MicroPasts</h1></p>
<p><h3>A community platform for conducting, designing and funding research into our human past.</h3></p>
<img src="http://adi.micropasts.org/wp-content/uploads/sites/3/2014/05/figurines_800px.png" class="figurines">
Expand Down
21 changes: 15 additions & 6 deletions wpbootstrap/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ body {
.push {
height: 170px;
}
.mainpage {
text-align: center;
}
.figurines {
width: auto;
height: auto;
Expand All @@ -57,6 +60,14 @@ body {
border: 0;
-ms-interpolation-mode: bicubic;
}
.learning-list-1 {
padding-left: 22px;
text-align: left;
}
.learning-list-2 {
padding-left: 27px;
text-align: left;
}


/* HEADER */
Expand All @@ -76,8 +87,8 @@ body {
}
.navbar-fixed-top {
top: 0;
padding-top: 7px;
padding-bottom: 5px;
padding-top: 10px; /* 7 */
padding-bottom: 8px; /* 5 */
padding-right: 20px;
padding-left: 20px;
border-width: 0 0 1px;
Expand Down Expand Up @@ -114,7 +125,7 @@ body {

.footer {
background-color: #000;
padding-top: 20px; /* new */
padding-top: 20px;
padding-bottom: 0px;
margin-bottom: 0px;
margin-top: -185px;
Expand Down Expand Up @@ -143,8 +154,6 @@ body {
}
.logoFooter {
padding-top: 10px;
max-height: 50%;
max-width: 50%;
}


Expand Down Expand Up @@ -311,7 +320,7 @@ body {
height: 100px;
}
.push {
height: 200px;
height: 250px;
}
.footer {
height: 270px;
Expand Down

0 comments on commit 78b91a8

Please sign in to comment.