diff --git a/.hgignore b/.hgignore index c93aa7128d..e2ae8c91cb 100644 --- a/.hgignore +++ b/.hgignore @@ -5,3 +5,5 @@ syntax: glob *.swp *.orig *.DS_Store +#* +.#* \ No newline at end of file diff --git a/custom_tags b/custom_tags new file mode 120000 index 0000000000..ec1dac8fbe --- /dev/null +++ b/custom_tags @@ -0,0 +1 @@ +../data/custom_tags \ No newline at end of file diff --git a/mitx_help.html b/mitx_help.html index e67fd1255d..ab0c28a23e 100644 --- a/mitx_help.html +++ b/mitx_help.html @@ -4,7 +4,8 @@

Help & Feedback

-

If run into any problems, we have several e-mail addresses set up:

+

If run into problems signing up for the web site which you + cannot resolve on your own, you can reach us at:

System-related questions
technical@mitx.mit.edu
diff --git a/sass/_index.scss b/sass/_index.scss index 0c7360f015..d579eb8ea6 100644 --- a/sass/_index.scss +++ b/sass/_index.scss @@ -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);