fix easter egg

casutton · Dec 28, 2016 · efe133d · efe133d
1 parent 9d11e80
commit efe133d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/_includes/navbar.html b/_includes/navbar.html
@@ -20,7 +20,7 @@
 	  <ul class="nav navbar-nav navbar-right navbar-social">
 		<li><a href="https://github.com/casutton/"><i class="fa fa-github fa-navbar" aria-hidden="true"></i></a></li>
 		<li><a href="https://twitter.com/RandomlyWalking"><i class="fa fa-twitter fa-navbar" aria-hidden="true"></i></a></li>
-		<li><a href="http://scholar.google.co.uk/citations?user=hYtGXD0AAAAJ&amp;hl=en"><i class="fa fa-google" aria-hidden="true"></i></a></li>
+		<li><a href="http://scholar.google.co.uk/citations?user=hYtGXD0AAAAJ&amp;hl=en"><i class="fa fa-google fa-navbar" aria-hidden="true"></i></a></li>
 		<li><a href="/csutton/#contact"><i class="fa fa-envelope-open fa-navbar" aria-hidden="true"></i></a></li>
           </ul>
 	</div><!--/.nav-collapse -->

diff --git a/css/base.css b/css/base.css
@@ -10,11 +10,15 @@ li {
 }
 li.nav-font { font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; }
 li.nav-font a { font-weight: normal; }
-.photo { margin-top: 50px; border: 1px; border-color: black;  }
+.photo { margin-top: 50px; border: 1px solid black; }
 .breaking { background-color: #FFCCCC; padding: 15px 25px 10px 25px; }
 
+.color-header { margin-top: -10px; }
+#contact { padding-bottom: 10px; }
+
 .fa-navbar { font-size: 20pt; }
-.fa-envelope-open { font-size: 16pt; }
+.fa-envelope-open { font-size: 18pt; }
+.fa-google { font-size: 16pt; padding-top: 2px; }
 .navbar-social { padding: 0; margin: 0; }
 .navbar-social li  { padding: 0; margin: 0; }
 .navbar-social>li>a { padding-right: 7px; padding-left: 7px; padding-bottom: 0; padding-top: 12px; }

diff --git a/css/home-red.css b/css/home-red.css
@@ -8,4 +8,5 @@ a:hover { color: #ff3292;}
 .breaking { background-color: thistle; }
 .navbar-inverse { background-color: orange; }
 .navbar-font { color: white; }
-.navbar-brand-font { color: white; }
+.navbar-brand-font { color: white; }
+.fa-navbar { color: white; }
diff --git a/js/egg.js b/js/egg.js
@@ -23,21 +23,24 @@ function do_switch () {
 
 
  function switch_to_red_cas () {
-   document.magic_photo.src = 'images/charles.jpg'	
+   magic_photo = $("#magic_photo")[0];
+   magic_photo.src = 'images/charles.jpg'	
    setActiveStyleSheet ("red")
    egg = document.getElementById ("egg")
    egg.innerHTML = "You found the Easter egg! Now try clicking my photo again."
  }
 
  function switch_to_std_cas  () {
-   document.magic_photo.src = 'images/charles3.jpg'	
+   magic_photo = $("#magic_photo")[0];
+   magic_photo.src = 'images/charles3.jpg'	
    setActiveStyleSheet ("standard")
-  egg = document.getElementById ("egg")
+   egg = document.getElementById ("egg")
    egg.innerHTML = "Had enough of silliness? You turned off the Easter egg."
  }
 
  function switch_to_bw_cas () {
-   document.magic_photo.src = 'images/charles-bw.jpg'	
+   magic_photo = $("#magic_photo")[0];
+   magic_photo.src = 'images/charles-bw.jpg'	
    setActiveStyleSheet ("bw")
    egg = document.getElementById ("egg")
    egg.innerHTML = "Don't much like colour, do you?"