Skip to content

E
edx-platform
Commit e0251650 by Ernie Park
Options

merge

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