Merge pull request #206 from ZeusWPI/christmas

Christmas

.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_WITH: "production"

content/assets/stylesheets/includes/cammie.scss

@@ -45,6 +45,25 @@
       &.diag i {
         transform: rotate(45deg);
       }
+      
     }
   }
 }
+#cammie-section {
+
+  .nav-center{
+  width:100%;
+  }
+  button{
+    background-color: $orange;
+    color: white;
+    margin-top: 5px;
+    border-radius: 0;
+    border: none;
+    width: 33.333333333333333333333333333333333333333333333333333%;
+    &:not(:last-child){
+        margin-right: 5px;
+    }
+  }
+
+}

content/assets/stylesheets/includes/navbar.scss

@@ -10,11 +10,10 @@
 
     #santa {
       position: absolute;
-      z-index: 500;
-      left: 27px;
-      top: -1px;
-      width: 40px;
-      transform: scale(-1, 1);
+      z-index: 300;
+      left: 5px;
+      top: 10px;
+      width: 60px;
     }
   }
 

layouts/partials/_navbar.erb

@@ -3,7 +3,7 @@
     <div class="logo-wrapper column is-narrow is-hidden-mobile">
       <a id="logo-link" href="/">
         <% if christmastime? %>
-          <img id="santa" src="https://upload.wikimedia.org/wikipedia/commons/c/c0/Santa_hat.svg">
+          <img id="santa" src="/assets/images/pusheen.png">
         <% end %>
         <img id="logo" src="<%= zeus_logo_url color: @zeus_logo_color %>" alt="" />
       </a>