Commit 127da09b authored by Daniel W Bond's avatar Daniel W Bond

who loves merge commits? we have the best merge commits, folks, I guarantee it

parents a3116f1a c2f3cecc
......@@ -23,8 +23,8 @@ a[name] {
background-color: #e4e6d7;
}
@font-face {
font-family: Xolonium, Arial, sans-serif;
src: url(/static/fonts/Xolonium-Regular.otf) format("opentype");
font-family: 'Xolonium';
src: url('../fonts/Xolonium-Regular.otf') format("opentype");
}
.xolonium {
font-family: Xolonium;
......
......@@ -194,7 +194,7 @@ SRCT
</p>
<p>
You can also come to any of our major events: all-day workshops, travel to conferences,
hosting speakers, and more. Each one goes on our
hosting speakers, and more. Every event goes on our
<a href="{{ url_for('projects') }}">calendar</a>, on our
<a href="https://facebook.com/MasonSRCT">Facebook page</a>,
and is announced on our
......@@ -216,13 +216,13 @@ SRCT
<div class="panel-body">
<ul class="nav nav-pills nav-justified smidge small" role="tablist">
<li role="presentation" class="active">
<a href="#code" aria-controls="code" role="tab" data-toggle="tab">Code</a>
<a href="#code" aria-controls="code" role="tab" data-toggle="tab"><strong>Code</strong></a>
</li>
<li role="presentation">
<a href="#design" aria-controls="design" role="tab" data-toggle="tab">Design</a>
<a href="#design" aria-controls="design" role="tab" data-toggle="tab"><strong>Design</strong></a>
</li>
<li role="presentation">
<a href="#infra" aria-controls="infra" role="tab" data-toggle="tab">Infrastructure</a>
<a href="#infra" aria-controls="infra" role="tab" data-toggle="tab"><strong>Infrastructure</strong></a>
</li>
</ul>
<div class="tab-content">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment