Skip to content

E
edx-platform
Commit b977901a by Reda Lemeden
Options

Made the header and footer wrappers fixed width

parent 6d3e6827
Showing with 115 additions and 105 deletions
sass/_askbot-original.scss
// Original styles // Original styles
/*body { // body {
background: #FFF; // background: #FFF;
font-size: 14px; // font-size: 14px;
line-height: 150%; // line-height: 150%;
margin: 0; // margin: 0;
padding: 0; // padding: 0;
color: #000; // color: #000;
font-family: Arial; }*/ // font-family: Arial; }
// div { // div {
// margin: 0 auto; // margin: 0 auto;
...@@ -2146,16 +2146,16 @@ ins { ...@@ -2146,16 +2146,16 @@ ins {
text-decoration: underline; text-decoration: underline;
font-weight: bold; } } font-weight: bold; } }
#ground { // #ground {
width: 100%; // width: 100%;
clear: both; // clear: both;
border-top: 1px solid #000; // border-top: 1px solid #000;
padding: 6px 0 0 0; // padding: 6px 0 0 0;
background: #16160f; // background: #16160f;
font-size: 16px; // font-size: 16px;
font-family: 'Yanone Kaffeesatz',sans-serif; // font-family: 'Yanone Kaffeesatz',sans-serif;
p { // p {
margin-bottom: 0; } } // margin-bottom: 0; } }
.footer-links { .footer-links {
color: #EEE; color: #EEE;
......
sass/_discussion.scss
.secondary-nav { body.askbot {
@extend .topbar; .secondary-nav {
margin: 0; margin: 0;
padding: 15px 0;
nav {
nav { @extend .clearfix;
@extend .clearfix; @extend .topbar;
@extend .wrapper; @extend .wrapper;
@include box-sizing(border-box); @include box-sizing(border-box);
padding: 0 $body-line-height; border: 1px solid darken(#F6EFD4, 10%);
border-top: 0;
div { margin: 0 auto;
float: left; padding: $body-line-height;
&.question-filter { div {
font-size:16px; float: left;
margin-top: 4px;
width: grid-width(4); &.question-filter {
font-size:16px;
ul { margin-top: 4px;
@include border-radius(35px); width: grid-width(4);
background: darken(#F6EFD4, 20%);
display: inline; ul {
margin: 0 0 0 10px; @include border-radius(35px);
padding: $body-line-height/4 20px; background: darken(#F6EFD4, 20%);
display: inline;
li { margin: 0 0 0 10px;
display: inline-block; padding: $body-line-height/4 20px;
list-style: none;
margin-right: 10px; li {
display: inline-block;
&:last-child { list-style: none;
margin-right: 0; margin-right: 10px;
}
&:last-child {
margin-right: 0;
}
a { a {
text-transform: capitalize; text-transform: capitalize;
text-shadow: none; text-shadow: none;
font-size: 14px; font-size: 14px;
&.on { &.on {
font-weight: bold; font-weight: bold;
}
} }
} }
} }
} }
}
&.search-box { &.search-box {
margin-left:2%; margin-left:2%;
text-align:right; text-align:right;
width: grid-width(8); width: grid-width(8);
} }
}
} }
} }
}
.content-wrapper { .content-wrapper {
@extend .clearfix; @extend .clearfix;
@extend .wrapper; @extend .wrapper;
@include box-shadow(0 1px 0 #fff); @include box-shadow(0 1px 0 #fff);
@include box-sizing(border-box);
background: #fff;
border: 1px solid #ccc;
border-top: 0;
.discussion-content {
/*@extend .content;*/
@include box-sizing(border-box); @include box-sizing(border-box);
display: table-cell; background: #fff;
padding: $gw-gutter; border: 1px solid #ccc;
vertical-align: top; border-top: 0;
width: grid-width(9);
} .discussion-content {
/*@extend .content;*/
@include box-sizing(border-box);
display: table-cell;
padding: $gw-gutter;
vertical-align: top;
width: grid-width(9);
}
aside { aside {
@extend .sidebar; @extend .sidebar;
width: grid-width(2.5); width: grid-width(2.5);
padding: $gw-gutter; padding: $gw-gutter;
h2 { h2 {
font-size: 16px; font-size: 16px;
} }
h3 { h3 {
border-bottom: 0; border-bottom: 0;
box-shadow: none; box-shadow: none;
} }
input[type="text"] { input[type="text"] {
width: 68%; width: 68%;
} }
#displayTagFilterControl { #displayTagFilterControl {
margin-top: 10px; margin-top: 10px;
}
} }
} }
}
.footer-wrapper { footer {
@extend .clearfix; margin: 0 auto;
@extend .wrapper; padding: 0;
@include box-shadow(0 1px 0 #fff);
@include box-sizing(border-box); .footer-wrapper {
border-top: 0; @extend .clearfix;
padding: 0 $gw-gutter/2; @extend .wrapper;
@include box-shadow(0 1px 0 #fff);
@include box-sizing(border-box);
background-color: #000;
border-top: 0;
padding: $gw-gutter/2;
}
}
} }
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