Commit 2019af41 by Brian Talbot Committed by John Jarvis

drupal integration - revised/proofed header and footer styles to match spacing…

drupal integration - revised/proofed header and footer styles to match spacing of marketing site and renamed social icons
parent 42d4b4d6
...@@ -335,10 +335,10 @@ ...@@ -335,10 +335,10 @@
button[type="submit"] { button[type="submit"] {
@include button(simple, $blue); @include button(simple, $blue);
@include box-sizing(border-box); @include box-sizing(border-box);
@include border-radius(2px); @include border-radius(3px);
padding: ($baseline*0.75) $baseline; padding: ($baseline*0.75) $baseline;
font-size: em(16); font-size: em(16);
font-weight: 600; font-weight: 700;
letter-spacing: 0; letter-spacing: 0;
text-align: center; text-align: center;
......
.wrapper-footer { .wrapper-footer {
border-top: 1px solid tint($m-gray,50%); border-top: 1px solid tint($m-gray,50%);
padding: $baseline ($baseline/2) ($baseline*1.5) ($baseline/2); padding: 25px ($baseline/2) ($baseline*1.5) ($baseline/2);
background: $white; background: $white;
footer { footer {
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
} }
.colophon-about { .colophon-about {
@include clearfix();
img { img {
width: 68px; width: 68px;
...@@ -79,12 +80,12 @@ ...@@ -79,12 +80,12 @@
// references // references
.references { .references {
margin: 0; margin: -10px 0 0 0;
width: flex-grid(4); width: flex-grid(4);
float: right; float: right;
.nav-social { .nav-social {
margin: 0 0 ($baseline/4) 0; margin: 0;
text-align: right; text-align: right;
li { li {
...@@ -110,7 +111,7 @@ ...@@ -110,7 +111,7 @@
} }
.copyright { .copyright {
margin: 0 0 ($baseline/4) 0; margin: -2px 0 8px 0;
font-size: em(11); font-size: em(11);
color: tint($m-gray,50%); color: tint($m-gray,50%);
text-align: right; text-align: right;
......
...@@ -299,10 +299,11 @@ header.global { ...@@ -299,10 +299,11 @@ header.global {
@include box-sizing(border-box); @include box-sizing(border-box);
@include border-radius(3px); @include border-radius(3px);
padding: ($baseline/4) ($baseline/2); padding: ($baseline/4) ($baseline/2);
font-size: em(14); font-size: em(15);
font-weight: 600; font-weight: 500;
letter-spacing: 0; letter-spacing: 1px;
text-align: center; text-align: center;
text-transform: uppercase;
&:hover { &:hover {
text-decoration: none; text-decoration: none;
......
...@@ -42,27 +42,27 @@ ...@@ -42,27 +42,27 @@
<ul> <ul>
<li class="nav-social-01"> <li class="nav-social-01">
<a href="http://www.meetup.com/edX-Global-Community/" rel="external"> <a href="http://www.meetup.com/edX-Global-Community/" rel="external">
<img src="${MITX_ROOT_URL}/static/images/social/social-meetup.png" alt="edX on Meetup" /> <img src="${MITX_ROOT_URL}/static/images/social/ico-social-meetup.png" alt="edX on Meetup" />
</a> </a>
</li> </li>
<li class="nav-social-02"> <li class="nav-social-02">
<a href="http://www.facebook.com/EdxOnline" rel="external"> <a href="http://www.facebook.com/EdxOnline" rel="external">
<img src="${MITX_ROOT_URL}/static/images/social/social-facebook.png" alt="edX on Facebook" /> <img src="${MITX_ROOT_URL}/static/images/social/ico-social-facebook.png" alt="edX on Facebook" />
</a> </a>
</li> </li>
<li class="nav-social-03"> <li class="nav-social-03">
<a href="https://twitter.com/edXOnline" rel="external"> <a href="https://twitter.com/edXOnline" rel="external">
<img src="${MITX_ROOT_URL}/static/images/social/social-twitter.png" alt="edX on Twitter" /> <img src="${MITX_ROOT_URL}/static/images/social/ico-social-twitter.png" alt="edX on Twitter" />
</a> </a>
</li> </li>
<li class="nav-social-04"> <li class="nav-social-04">
<a href="https://plus.google.com/108235383044095082735/posts" rel="external"> <a href="https://plus.google.com/108235383044095082735/posts" rel="external">
<img src="${MITX_ROOT_URL}/static/images/social/social-google.png" alt="edX on Google+" /> <img src="${MITX_ROOT_URL}/static/images/social/ico-social-google.png" alt="edX on Google+" />
</a> </a>
</li> </li>
<li class="nav-social-05"> <li class="nav-social-05">
<a href="http://youtube.com/user/edxonline" rel="external"> <a href="http://youtube.com/user/edxonline" rel="external">
<img src="${MITX_ROOT_URL}/static/images/social/social-youtube.png" alt="edX on YouTube" /> <img src="${MITX_ROOT_URL}/static/images/social/ico-social-youtube.png" alt="edX on YouTube" />
</a> </a>
</li> </li>
</ul> </ul>
......
...@@ -91,7 +91,7 @@ site_status_msg = get_site_status_msg(course_id) ...@@ -91,7 +91,7 @@ site_status_msg = get_site_status_msg(course_id)
<ol class="right nav-courseware"> <ol class="right nav-courseware">
<li class="nav-courseware-01"> <li class="nav-courseware-01">
% if not settings.MITX_FEATURES['DISABLE_LOGIN_BUTTON']: % if not settings.MITX_FEATURES['DISABLE_LOGIN_BUTTON']:
<a class="cta cta-login" href="#">Current Students</a> <a class="cta cta-login" href="#">Courseware</a>
% endif % endif
</li> </li>
</ol> </ol>
......
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