Commit fe9887a9 by Davorin Šego

Merge pull request #8389 from edx/dsego/SOL-734

Make header & footer responsive
parents f5275a54 2c22a4d8
...@@ -83,7 +83,6 @@ ...@@ -83,7 +83,6 @@
// platform Open edX logo and link // platform Open edX logo and link
.footer-about-openedx { .footer-about-openedx {
@include float(right); @include float(right);
width: flex-grid(3,12);
@include text-align(right); @include text-align(right);
a { a {
......
...@@ -133,7 +133,6 @@ $facet-background-color: #007db8; ...@@ -133,7 +133,6 @@ $facet-background-color: #007db8;
height: 120px; height: 120px;
margin: 0 auto; margin: 0 auto;
max-width: 1200px; max-width: 1200px;
min-width: 760px;
padding-top: ($baseline*10); padding-top: ($baseline*10);
position: relative; position: relative;
text-align: center; text-align: center;
......
@import '../base/grid-settings';
@import 'neat/neat'; // lib - Neat
$title-left-margin: grid-width(2) + $gw-gutter; $title-left-margin: grid-width(2) + $gw-gutter;
$button-size: ($baseline*2.75); $button-size: ($baseline*2.75);
$course-search-input-height: ($button-size); $course-search-input-height: ($button-size);
...@@ -29,13 +32,12 @@ $course-search-input-height: ($button-size); ...@@ -29,13 +32,12 @@ $course-search-input-height: ($button-size);
position: relative; position: relative;
margin: 0 auto ($baseline); margin: 0 auto ($baseline);
padding: ($baseline*5) ($baseline/2); padding: ($baseline*5) ($baseline/2);
min-width: ($baseline*38);
max-width: ($baseline*60); max-width: ($baseline*60);
} }
.title { .title {
@include margin-left($title-left-margin); @include span-columns(8);
@include float(left); @include shift(2);
@include box-sizing(border-box); @include box-sizing(border-box);
@include transition(all 0.2s linear 0s); @include transition(all 0.2s linear 0s);
position: relative; position: relative;
...@@ -53,6 +55,24 @@ $course-search-input-height: ($button-size); ...@@ -53,6 +55,24 @@ $course-search-input-height: ($button-size);
} }
} }
// 8 column layout
@include media($bp-medium) {
@include span-columns(6);
@include shift(1);
}
// 4 column layout
@include media($bp-small) {
@include fill-parent();
@include shift(0);
}
// 4 column layout
@include media($bp-tiny) {
@include fill-parent();
@include shift(0);
}
> hgroup { > hgroup {
@include left(0); @include left(0);
@include box-sizing(border-box); @include box-sizing(border-box);
......
...@@ -13,9 +13,7 @@ ...@@ -13,9 +13,7 @@
footer#footer-openedx { footer#footer-openedx {
@include clearfix(); @include clearfix();
@include box-sizing(border-box); @include box-sizing(border-box);
max-width: grid-width(12); @include outer-container;
min-width: 760px;
width: flex-grid(12);
margin: 0 auto; margin: 0 auto;
p, ol, ul { p, ol, ul {
...@@ -40,9 +38,16 @@ ...@@ -40,9 +38,16 @@
// colophon // colophon
.colophon { .colophon {
@include margin-right(flex-gutter()); @include span-columns(8);
width: flex-grid(8,12);
@include float(left); @include media($bp-small) {
@include fill-parent();
}
@include media($bp-tiny) {
@include fill-parent();
}
.nav-colophon { .nav-colophon {
@include clearfix(); @include clearfix();
...@@ -159,13 +164,20 @@ ...@@ -159,13 +164,20 @@
// platform Open edX logo and link // platform Open edX logo and link
.footer-about-openedx { .footer-about-openedx {
@include float(right); @include span-columns(4);
width: flex-grid(3,12);
display: inline-block;
vertical-align: bottom;
@include text-align(right); @include text-align(right);
vertical-align: bottom;
@include media($bp-small) {
@include fill-parent();
}
@include media($bp-tiny) {
@include fill-parent();
}
a { a {
@include float(right);
display: inline-block; display: inline-block;
&:hover { &:hover {
......
...@@ -6,7 +6,6 @@ header.global { ...@@ -6,7 +6,6 @@ header.global {
border-bottom: 1px solid $m-gray; border-bottom: 1px solid $m-gray;
box-shadow: 0 1px 5px 0 $shadow-l1; box-shadow: 0 1px 5px 0 $shadow-l1;
background: $header-bg; background: $header-bg;
height: 76px;
position: relative; position: relative;
width: 100%; width: 100%;
...@@ -31,11 +30,9 @@ header.global { ...@@ -31,11 +30,9 @@ header.global {
nav { nav {
@include clearfix(); @include clearfix();
height: 40px;
margin: 0 auto; margin: 0 auto;
padding: 18px ($baseline/2) 0; padding: 18px ($baseline/2) 12px;
max-width: grid-width(12); max-width: grid-width(12);
min-width: 760px;
} }
.left { .left {
......
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