From b977901a6e3ae13d0a65434db9570f027a12a2ec Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Wed, 25 Jan 2012 11:39:25 -0500 Subject: [PATCH] Made the header and footer wrappers fixed width --- sass/_askbot-original.scss | 36 ++++---- sass/_discussion.scss | 178 ++++++++++++++++++++----------------- 2 files changed, 112 insertions(+), 102 deletions(-) diff --git a/sass/_askbot-original.scss b/sass/_askbot-original.scss index 0be40af3b6..c13d2c7c37 100644 --- a/sass/_askbot-original.scss +++ b/sass/_askbot-original.scss @@ -1,13 +1,13 @@ // Original styles -/*body { - background: #FFF; - font-size: 14px; - line-height: 150%; - margin: 0; - padding: 0; - color: #000; - font-family: Arial; }*/ +// body { +// background: #FFF; +// font-size: 14px; +// line-height: 150%; +// margin: 0; +// padding: 0; +// color: #000; +// font-family: Arial; } // div { // margin: 0 auto; @@ -2146,16 +2146,16 @@ ins { text-decoration: underline; font-weight: bold; } } -#ground { - width: 100%; - clear: both; - border-top: 1px solid #000; - padding: 6px 0 0 0; - background: #16160f; - font-size: 16px; - font-family: 'Yanone Kaffeesatz',sans-serif; - p { - margin-bottom: 0; } } +// #ground { +// width: 100%; +// clear: both; +// border-top: 1px solid #000; +// padding: 6px 0 0 0; +// background: #16160f; +// font-size: 16px; +// font-family: 'Yanone Kaffeesatz',sans-serif; +// p { +// margin-bottom: 0; } } .footer-links { color: #EEE; diff --git a/sass/_discussion.scss b/sass/_discussion.scss index 2ae7ea7004..73fcd8ceb8 100644 --- a/sass/_discussion.scss +++ b/sass/_discussion.scss @@ -1,108 +1,118 @@ -.secondary-nav { - @extend .topbar; - margin: 0; - padding: 15px 0; +body.askbot { + .secondary-nav { + margin: 0; - nav { - @extend .clearfix; - @extend .wrapper; - @include box-sizing(border-box); - padding: 0 $body-line-height; + nav { + @extend .clearfix; + @extend .topbar; + @extend .wrapper; + @include box-sizing(border-box); + border: 1px solid darken(#F6EFD4, 10%); + border-top: 0; + margin: 0 auto; + padding: $body-line-height; - div { - float: left; + div { + float: left; - &.question-filter { - font-size:16px; - margin-top: 4px; - width: grid-width(4); + &.question-filter { + font-size:16px; + margin-top: 4px; + width: grid-width(4); - ul { - @include border-radius(35px); - background: darken(#F6EFD4, 20%); - display: inline; - margin: 0 0 0 10px; - padding: $body-line-height/4 20px; + ul { + @include border-radius(35px); + background: darken(#F6EFD4, 20%); + display: inline; + margin: 0 0 0 10px; + padding: $body-line-height/4 20px; - li { - display: inline-block; - list-style: none; - margin-right: 10px; + li { + display: inline-block; + list-style: none; + margin-right: 10px; - &:last-child { - margin-right: 0; - } + &:last-child { + margin-right: 0; + } - a { - text-transform: capitalize; - text-shadow: none; - font-size: 14px; + a { + text-transform: capitalize; + text-shadow: none; + font-size: 14px; - &.on { - font-weight: bold; + &.on { + font-weight: bold; + } } } } } - } - &.search-box { - margin-left:2%; - text-align:right; - width: grid-width(8); - } + &.search-box { + margin-left:2%; + text-align:right; + width: grid-width(8); + } + } } } -} -.content-wrapper { - @extend .clearfix; - @extend .wrapper; - @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;*/ + .content-wrapper { + @extend .clearfix; + @extend .wrapper; + @include box-shadow(0 1px 0 #fff); @include box-sizing(border-box); - display: table-cell; - padding: $gw-gutter; - vertical-align: top; - width: grid-width(9); + background: #fff; + border: 1px solid #ccc; + border-top: 0; + + .discussion-content { + /*@extend .content;*/ + @include box-sizing(border-box); + display: table-cell; + padding: $gw-gutter; + vertical-align: top; + width: grid-width(9); + } + + aside { + @extend .sidebar; + width: grid-width(2.5); + padding: $gw-gutter; + + h2 { + font-size: 16px; + } + + h3 { + border-bottom: 0; + box-shadow: none; + } + + input[type="text"] { + width: 68%; + } + + #displayTagFilterControl { + margin-top: 10px; + } + } } - aside { - @extend .sidebar; - width: grid-width(2.5); - padding: $gw-gutter; + footer { + margin: 0 auto; + padding: 0; - h2 { - font-size: 16px; - } - - h3 { - border-bottom: 0; - box-shadow: none; - } - - input[type="text"] { - width: 68%; - } - - #displayTagFilterControl { - margin-top: 10px; + .footer-wrapper { + @extend .clearfix; + @extend .wrapper; + @include box-shadow(0 1px 0 #fff); + @include box-sizing(border-box); + background-color: #000; + border-top: 0; + padding: $gw-gutter/2; } } } - -.footer-wrapper { - @extend .clearfix; - @extend .wrapper; - @include box-shadow(0 1px 0 #fff); - @include box-sizing(border-box); - border-top: 0; - padding: 0 $gw-gutter/2; -}