Skip to content

E
edx-platform
Commit b5e40a69 by Kyle Fiedler
Options

Merge

parents 94f0b58b 589aa6ba
Showing with 277 additions and 246 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;
...@@ -100,19 +100,19 @@ ...@@ -100,19 +100,19 @@
// .clearfix, .paginator { // .clearfix, .paginator {
// min-height: 1%; } } // min-height: 1%; } }
.clearfix:after, .paginator:after { // .clearfix:after, .paginator:after {
clear: both; // clear: both;
content: "."; // content: ".";
display: block; // display: block;
height: 0; // height: 0;
visibility: hidden; } // visibility: hidden; }
.badges a { .badges a {
color: #763333; color: #763333;
text-decoration: underline; } text-decoration: underline; }
a:hover { // a:hover {
text-decoration: underline; } // text-decoration: underline; }
.badge-context-toggle.active { .badge-context-toggle.active {
cursor: pointer; cursor: pointer;
...@@ -125,18 +125,18 @@ a:hover { ...@@ -125,18 +125,18 @@ a:hover {
body.user-messages { body.user-messages {
margin-top: 2.4em; } margin-top: 2.4em; }
.left { // .left {
float: left; } // float: left; }
.right { // .right {
float: right; } // float: right; }
.clean { // .clean {
clear: both; } // clear: both; }
.center { // .center {
margin: 0 auto; // margin: 0 auto;
padding: 0; } // padding: 0; }
.notify { .notify {
position: fixed; position: fixed;
...@@ -241,50 +241,50 @@ body.user-messages { ...@@ -241,50 +241,50 @@ body.user-messages {
#navBadges { #navBadges {
background: -210px -5px url(../images/sprites.png) no-repeat; } } background: -210px -5px url(../images/sprites.png) no-repeat; } }
#header { // #header {
&.with-logo #userToolsNav { // &.with-logo #userToolsNav {
position: absolute; // position: absolute;
bottom: 0; // bottom: 0;
right: 0px; } // right: 0px; }
&.without-logo { // &.without-logo {
#userToolsNav { // #userToolsNav {
float: left; // float: left;
margin-top: 7px; } // margin-top: 7px; }
#metaNav { // #metaNav {
margin-bottom: 7px; } } } // margin-bottom: 7px; } } }
/*#secondaryHeader { // #secondaryHeader {
height: 55px; // height: 55px;
background: #e9e9e1; // background: #e9e9e1;
border-bottom: #d3d3c2 1px solid; // border-bottom: #d3d3c2 1px solid;
border-top: #fcfcfc 1px solid; // border-top: #fcfcfc 1px solid;
margin-bottom: 10px; // margin-bottom: 10px;
font-family: 'Yanone Kaffeesatz',sans-serif; // font-family: 'Yanone Kaffeesatz',sans-serif;
#homeButton { // #homeButton {
border-right: #afaf9e 1px solid; // border-right: #afaf9e 1px solid;
background: -6px -36px url(../images/sprites.png) no-repeat; // background: -6px -36px url(../images/sprites.png) no-repeat;
height: 55px; // height: 55px;
width: 43px; // width: 43px;
display: block; // display: block;
float: left; // float: left;
&:hover { // &:hover {
background: -51px -36px url(../images/sprites.png) no-repeat; } } // background: -51px -36px url(../images/sprites.png) no-repeat; } }
#scopeWrapper { // #scopeWrapper {
width: 688px; // width: 688px;
float: left; // float: left;
a { // a {
display: block; // display: block;
float: left; } // float: left; }
.scope-selector { // .scope-selector {
font-size: 21px; // font-size: 21px;
color: #5a5a4b; // color: #5a5a4b;
height: 55px; // height: 55px;
line-height: 55px; // line-height: 55px;
margin-left: 24px; } // margin-left: 24px; }
.on { // .on {
background: url(../images/scopearrow.png) no-repeat center bottom; } // background: url(../images/scopearrow.png) no-repeat center bottom; }
.ask-message { // .ask-message {
font-size: 24px; } } }*/ // font-size: 24px; } } }
#searchBar { #searchBar {
display: inline-block; display: inline-block;
...@@ -560,85 +560,85 @@ body.anon #searchBar { ...@@ -560,85 +560,85 @@ body.anon #searchBar {
a { a {
font-size: 16px; } } font-size: 16px; } }
.tabBar { // .tabBar {
background-color: #eff5f6; // background-color: #eff5f6;
height: 30px; // height: 30px;
margin-bottom: 3px; // margin-bottom: 3px;
margin-top: 3px; // margin-top: 3px;
float: right; // float: right;
font-family: Georgia,serif; // font-family: Georgia,serif;
font-size: 16px; // font-size: 16px;
border-radius: 5px; // border-radius: 5px;
-ms-border-radius: 5px; // -ms-border-radius: 5px;
-moz-border-radius: 5px; // -moz-border-radius: 5px;
-webkit-border-radius: 5px; // -webkit-border-radius: 5px;
-khtml-border-radius: 5px; // -khtml-border-radius: 5px;
h2 { // h2 {
float: left; } } // float: left; } }
.tabsA, .tabsC { // .tabsA, .tabsC {
float: right; // float: right;
position: relative; // position: relative;
display: block; // display: block;
height: 20px; } // height: 20px; }
.tabsA { // .tabsA {
float: right; } // float: right; }
.tabsC { // .tabsC {
float: left; } // float: left; }
.tabsA a, .tabsC a { // .tabsA a, .tabsC a {
border-left: 1px solid #d0e1e4; // border-left: 1px solid #d0e1e4;
color: #7ea9b3; // color: #7ea9b3;
display: block; // display: block;
float: left; // float: left;
height: 20px; // height: 20px;
line-height: 20px; // line-height: 20px;
padding: 4px 7px 4px 7px; // padding: 4px 7px 4px 7px;
text-decoration: none; } // text-decoration: none; }
.tabsA a.on, .tabsC a.on, .tabsA a:hover, .tabsC a:hover { // .tabsA a.on, .tabsC a.on, .tabsA a:hover, .tabsC a:hover {
color: #4a757f; } // color: #4a757f; }
.tabsA .label, .tabsC .label { // .tabsA .label, .tabsC .label {
float: left; // float: left;
color: #646464; // color: #646464;
margin-top: 4px; // margin-top: 4px;
margin-right: 5px; } // margin-right: 5px; }
.main-page .tabsA .label { // .main-page .tabsA .label {
margin-left: 8px; } // margin-left: 8px; }
.tabsB a { // .tabsB a {
background: #eee; // background: #eee;
border: 1px solid #eee; // border: 1px solid #eee;
color: #777; // color: #777;
display: block; // display: block;
float: left; // float: left;
height: 22px; // height: 22px;
line-height: 28px; // line-height: 28px;
margin: 5px 0px 0 4px; // margin: 5px 0px 0 4px;
padding: 0 11px 0 11px; // padding: 0 11px 0 11px;
text-decoration: none; } // text-decoration: none; }
.tabsC .first { // .tabsC .first {
border: none; } // border: none; }
.rss { // .rss {
float: right; // float: right;
font-size: 16px; // font-size: 16px;
color: #f57900; // color: #f57900;
margin: 5px 0px 3px 7px; // margin: 5px 0px 3px 7px;
width: 52px; // width: 52px;
padding-left: 2px; // padding-left: 2px;
padding-top: 3px; // padding-top: 3px;
background: white url(../images/feed-icon-small.png) no-repeat center right; // background: white url(../images/feed-icon-small.png) no-repeat center right;
float: right; // float: right;
font-family: Georgia,serif; // font-family: Georgia,serif;
font-size: 16px; // font-size: 16px;
&:hover { // &:hover {
color: #F4A731 !important; } } // color: #F4A731 !important; } }
#questionCount { #questionCount {
font-weight: bold; font-weight: bold;
...@@ -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 { .main-content {
@extend .clearfix; .discussion-wrapper {
@extend .wrapper; display: table;
@include box-shadow(0 1px 0 #fff); width: 100%;
@include box-sizing(border-box);
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 { .discussion-content {
@extend .sidebar; @include box-sizing(border-box);
width: grid-width(2.5); display: table-cell;
padding: $gw-gutter; padding: $gw-gutter;
vertical-align: top;
width: grid-width(9);
h2 { .order-sort {
font-size: 16px; @include border-radius(35px);
} background-color: lighten(#F6EFD4, 5%) ;
height: 30px;
float: right;
font-size: 16px;
margin: 3px 0;
padding: 0 20px;
a {
color: darken(#F6EFD4, 50%);
&:before {
content: '|';
color: darken(#F6EFD4, 10%);
font-size: 22px;
}
h3 { &:hover {
border-bottom: 0; text-decoration: none;
box-shadow: none; color: darken(#F6EFD4, 70%);
} }
}
}
}
input[type="text"] { aside {
width: 68%; @extend .sidebar;
} width: grid-width(3);
padding: $gw-gutter;
h2 {
font-size: 16px;
}
h3 {
border-bottom: 0;
box-shadow: none;
}
#displayTagFilterControl { input[type="text"] {
margin-top: 10px; width: 68%;
}
#displayTagFilterControl {
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