Merge with default

--HG--
branch : close_sidebar
This commit is contained in:
Kyle Fiedler
2012-02-14 10:57:55 -05:00
4 changed files with 12 additions and 1 deletions

View File

@@ -5,3 +5,5 @@ syntax: glob
*.swp
*.orig
*.DS_Store
#*
.#*

1
custom_tags Symbolic link
View File

@@ -0,0 +1 @@
../data/custom_tags

View File

@@ -4,7 +4,8 @@
<div>
<section class="help-email">
<h2>Help &amp; Feedback</h2>
<p> If run into any problems, we have several e-mail addresses set up:</p>
<p> If run into problems signing up for the web site which you
cannot resolve on your own, you can reach us at:</p>
<dl>
<dt>System-related questions</dt>
<dd><a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a></dd>

View File

@@ -53,6 +53,13 @@ header.announcement {
&.home {
background: #e3e3e3 url("/static/images/marketing/shot-5-medium.jpg");
@media screen and (min-width: 1200px) {
background: #e3e3e3 url("/static/images/marketing/shot-5-large.jpg");
}
// @media screen and (max-width: 1199px) {
// }
div {
padding: lh(10) lh() lh(3);