Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:joeyrobert/physclub-www

  • Loading branch information...
commit 10941f1699ffdb230821b5f2e1dd0f5683209494 2 parents f12361c + ef84a81
@joeyrobert authored
View
2  src/_includes/menu.html
@@ -2,5 +2,5 @@
<!--<li{% if page.active == "about" %} class="active"{% endif %}><a href="/about/">About</a></li>-->
<li{% if page.active == "events" %} class="active"{% endif %}><a href="/events/">Events</a></li>
<li{% if page.active == "people" %} class="active"{% endif %}><a href="/people/">People</a></li>
-<!--<li{% if page.active == "darkmatter" %} class="active"{% endif %}><a href="/darkmatter/">Darkmatter</a></li>-->
+<li{% if page.active == "darkmatter" %} class="active"{% endif %}><a href="/darkmatter/">Darkmatter</a></li>
<li><a href="https://www.facebook.com/uwphysclub">Facebook</a></li>
View
2  src/css/styles.css
@@ -52,6 +52,6 @@
#physclub .person h1 {
margin-bottom: 0;
}
-#physclub .container {
+#physclub .container, #physclub .row.event {
margin-bottom: 20px;
}
View
5 src/darkmatter.html
@@ -10,4 +10,7 @@
</h1>
</div>
-<p>Under Construction</p>
+<h2>Fall 2011 - Issue 1</h2>
+<p>
+ <a href="/darkmatter/darkmatter-F11-01.pdf">PDF</a>
+</p>
View
BIN  src/darkmatter/darkmatter-F11-01.pdf
Binary file not shown
View
22 src/events.html
@@ -10,7 +10,19 @@
</h1>
</div>
-<div class="row">
+<div class="row event">
+ <div class="span16 columns">
+ None at the current time.
+ </div>
+</div>
+
+<div class="page-header">
+ <h1>
+ Past Events
+ </h1>
+</div>
+
+<div class="row event">
<div class="span4 columns">
<img src="/img/studentprofnight_small.png" class="thumbnail">
</div>
@@ -41,13 +53,7 @@
</div>
</div>
-<div class="page-header">
- <h1>
- Past Events
- </h1>
-</div>
-
-<div class="row">
+<div class="row event">
<div class="span4 columns">
<img src="/img/bbqlogo_small.png" class="thumbnail">
</div>
Please sign in to comment.
Something went wrong with that request. Please try again.