Skip to content

E
edx-platform
Commit b8bc5201 by Reda Lemeden
Options

new question list layout

parent 5d257f7d
Showing with 358 additions and 196 deletions
sass/_askbot-original.scss
...@@ -662,116 +662,116 @@ ul#searchTags { ...@@ -662,116 +662,116 @@ ul#searchTags {
float: right; float: right;
padding-top: 2px; } padding-top: 2px; }
.search-tips { // .search-tips {
font-size: 16px; // font-size: 16px;
line-height: 17px; // line-height: 17px;
color: #707070; // color: #707070;
margin: 5px 0 10px 0; // margin: 5px 0 10px 0;
padding: 0px; // padding: 0px;
float: left; // float: left;
font-family: 'Yanone Kaffeesatz',sans-serif; // font-family: 'Yanone Kaffeesatz',sans-serif;
a { // a {
text-decoration: underline; // text-decoration: underline;
color: #1b79bd; } } // color: #1b79bd; } }
#question-list {
float: left;
position: relative;
background-color: #FFF;
padding: 0;
width: 100%; }
.short-summary { // #question-list {
position: relative; // float: left;
filter: inherit; // position: relative;
padding: 10px; // background-color: #FFF;
border-bottom: 1px solid #DDDBCE; // padding: 0;
margin-bottom: 1px; // width: 100%; }
overflow: hidden;
width: 710px; // .short-summary {
float: left; // position: relative;
background: url(../images/summary-background.png) repeat-x; // filter: inherit;
h2 { // padding: 10px;
font-size: 24px; // border-bottom: 1px solid #DDDBCE;
font-weight: normal; // margin-bottom: 1px;
line-height: 26px; // overflow: hidden;
padding-left: 0; // width: 710px;
margin-bottom: 6px; // float: left;
display: block; // background: url(../images/summary-background.png) repeat-x;
font-family: 'Yanone Kaffeesatz',sans-serif; } // h2 {
a { // font-size: 24px;
color: #464646; } // font-weight: normal;
.userinfo { // line-height: 26px;
text-align: right; // padding-left: 0;
line-height: 16px; // margin-bottom: 6px;
font-family: Arial; // display: block;
padding-right: 4px; // font-family: 'Yanone Kaffeesatz',sans-serif; }
.relativetime { // a {
font-size: 11px; // color: #464646; }
clear: both; // .userinfo {
font-weight: normal; // text-align: right;
color: #555; } } // line-height: 16px;
span.anonymous { // font-family: Arial;
font-size: 11px; // padding-right: 4px;
clear: both; // .relativetime {
font-weight: normal; // font-size: 11px;
color: #555; } // clear: both;
.userinfo a { // font-weight: normal;
font-weight: bold; // color: #555; } }
font-size: 11px; } // span.anonymous {
.counts { // font-size: 11px;
float: right; // clear: both;
margin: 4px 0 0 5px; // font-weight: normal;
font-family: 'Yanone Kaffeesatz',sans-serif; // color: #555; }
.item-count { // .userinfo a {
padding: 0px 5px 0px 5px; // font-weight: bold;
font-size: 25px; // font-size: 11px; }
font-family: 'Yanone Kaffeesatz',sans-serif; } // .counts {
.votes div, .views div, .answers div, .favorites div { // float: right;
margin-top: 3px; // margin: 4px 0 0 5px;
font-size: 14px; // font-family: 'Yanone Kaffeesatz',sans-serif;
line-height: 14px; // .item-count {
color: #646464; } } // padding: 0px 5px 0px 5px;
.tags { // font-size: 25px;
margin-top: 0; } // font-family: 'Yanone Kaffeesatz',sans-serif; }
.votes, .answers, .favorites, .views { // .votes div, .views div, .answers div, .favorites div {
text-align: center; // margin-top: 3px;
margin: 0 3px; // font-size: 14px;
padding: 8px 2px 0px 2px; // line-height: 14px;
width: 51px; // color: #646464; } }
float: right; // .tags {
height: 44px; // margin-top: 0; }
border: #dbdbd4 1px solid; } // .votes, .answers, .favorites, .views {
.votes { // text-align: center;
background: url(../images/vote-background.png) repeat-x; } // margin: 0 3px;
.answers { // padding: 8px 2px 0px 2px;
background: url(../images/answers-background.png) repeat-x; } // width: 51px;
.views { // float: right;
background: url(../images/view-background.png) repeat-x; } // height: 44px;
.no-votes .item-count { // border: #dbdbd4 1px solid; }
color: #b1b5b6; } // .votes {
.some-votes .item-count { // background: url(../images/vote-background.png) repeat-x; }
color: #4a757f; } // .answers {
.no-answers .item-count { // background: url(../images/answers-background.png) repeat-x; }
color: #b1b5b6; } // .views {
.some-answers .item-count { // background: url(../images/view-background.png) repeat-x; }
color: #eab243; } // .no-votes .item-count {
.no-views .item-count { // color: #b1b5b6; }
color: #b1b5b6; } // .some-votes .item-count {
.some-views .item-count { // color: #4a757f; }
color: #d33f00; } // .no-answers .item-count {
.accepted .item-count { // color: #b1b5b6; }
background: url(../images/accept.png) no-repeat top right; // .some-answers .item-count {
display: block; // color: #eab243; }
text-align: center; // .no-views .item-count {
width: 40px; // color: #b1b5b6; }
color: #eab243; } // .some-views .item-count {
.some-favorites .item-count { // color: #d33f00; }
background: #338333; // .accepted .item-count {
color: #d0f5a9; } // background: url(../images/accept.png) no-repeat top right;
.no-favorites .item-count { // display: block;
background: #eab243; // text-align: center;
color: yellow; } } // width: 40px;
// color: #eab243; }
// .some-favorites .item-count {
// background: #338333;
// color: #d0f5a9; }
// .no-favorites .item-count {
// background: #eab243;
// color: yellow; } }
// .evenMore { // .evenMore {
// font-size: 13px; // font-size: 13px;
...@@ -869,31 +869,31 @@ ul#searchTags { ...@@ -869,31 +869,31 @@ ul#searchTags {
.tag-size-10 { .tag-size-10 {
font-size: 21px; } font-size: 21px; }
ul { // ul {
&.tags { // &.tags {
list-style: none; // list-style: none;
margin: 0; // margin: 0;
padding: 0; // padding: 0;
line-height: 170%; // line-height: 170%;
display: block; // display: block;
&.marked-tags { // &.marked-tags {
list-style: none; // list-style: none;
margin: 0; // margin: 0;
padding: 0; // padding: 0;
line-height: 170%; // line-height: 170%;
display: block; } } // display: block; } }
&#related-tags { // &#related-tags {
list-style: none; // list-style: none;
margin: 0; // margin: 0;
padding: 0; // padding: 0;
line-height: 170%; // line-height: 170%;
display: block; } // display: block; }
&.tags li { // &.tags li {
float: left; // float: left;
display: block; // display: block;
margin: 0 8px 0 0; // margin: 0 8px 0 0;
padding: 0; // padding: 0;
height: 20px; } } // height: 20px; } }
.wildcard-tags { .wildcard-tags {
clear: both; } clear: both; }
...@@ -919,35 +919,35 @@ ul { ...@@ -919,35 +919,35 @@ ul {
float: left; float: left;
clear: left; } } clear: left; } }
.tag-left { // .tag-left {
cursor: pointer; // cursor: pointer;
display: block; // display: block;
float: left; // float: left;
height: 17px; // height: 17px;
margin: 0 5px 0 0; // margin: 0 5px 0 0;
padding: 0; // padding: 0;
-webkit-box-shadow: 0px 0px 5px #d3d6d7; // -webkit-box-shadow: 0px 0px 5px #d3d6d7;
-moz-box-shadow: 0px 0px 5px #d3d6d7; // -moz-box-shadow: 0px 0px 5px #d3d6d7;
box-shadow: 0px 0px 5px #d3d6d7; } // box-shadow: 0px 0px 5px #d3d6d7; }
.tag-right { // .tag-right {
background: #f3f6f6; // background: #f3f6f6;
border: #fff 1px solid; // border: #fff 1px solid;
border-top: #fff 2px solid; // border-top: #fff 2px solid;
outline: #cfdbdb 1px solid; // outline: #cfdbdb 1px solid;
display: block; // display: block;
float: left; // float: left;
height: 17px; // height: 17px;
line-height: 17px; // line-height: 17px;
font-weight: normal; // font-weight: normal;
font-size: 11px; // font-size: 11px;
padding: 0px 8px 0px 8px; // padding: 0px 8px 0px 8px;
text-decoration: none; // text-decoration: none;
text-align: center; // text-align: center;
white-space: nowrap; // white-space: nowrap;
vertical-align: middle; // vertical-align: middle;
font-family: Arial; // font-family: Arial;
color: #717179; } // color: #717179; }
.deletable-tag { .deletable-tag {
margin-right: 3px; margin-right: 3px;
...@@ -2563,13 +2563,13 @@ p.signup_p { ...@@ -2563,13 +2563,13 @@ p.signup_p {
margin-bottom: 7px; margin-bottom: 7px;
font-size: 14px; } } font-size: 14px; } }
.search-result-summary { // .search-result-summary {
font-weight: bold; // font-weight: bold;
font-size: 18px; // font-size: 18px;
line-height: 22px; // line-height: 22px;
margin: 0px 0px 0px 0px; // margin: 0px 0px 0px 0px;
padding: 2px 0 0 0; // padding: 2px 0 0 0;
float: left; } // float: left; }
.faq-rep-item { .faq-rep-item {
text-align: right; text-align: right;
......
sass/_discussion-questions.scss
div.question-controls {
display: block;
margin-bottom: 30px;
overflow: hidden;
width: flex-grid(9,9);
div {
display: inline-block;
}
div.question-count {
margin-right: flex-gutter();
width: flex-grid(5.5,9);
h1 {
margin-top: 0;
}
}
div.question-sort {
vertical-align: bottom;
width: flex-grid(3.5,9);
nav {
@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;
}
&:hover {
text-decoration: none;
color: darken(#F6EFD4, 70%);
}
}
}
}
}
ul.question-list {
width: flex-grid(9,9);
li.single-question {
border-top: 1px solid #eee;
list-style: none;
padding: 10px 0;
&:hover {
background: lighten(#F6EFD4, 8%);
}
div {
display: inline-block;
&.question-body {
@include box-sizing(border-box);
margin-right: flex-gutter();
padding-left: 10px;
width: flex-grid(5.5,9);
h2 {
font-size: 16px;
font-weight: normal;
margin: 0px 0 15px 0;
text-transform: none;
a {
color: #000;
}
}
div.user-info {
display: inline-block;
vertical-align: top;
span.relative-time {
font-weight: normal;
}
a {
color: $mit-red;
}
}
ul.tags {
display: inline-block;
}
}
&.question-meta {
width: flex-grid(3.5,9);
ul {
text-align: right;
li {
@include border-radius(3px);
display: inline-block;
height:60px;
margin-right: 10px;
width: 60px;
&.views {
background: lighten(#F6EFD4, 5%);
}
&.answers {
background: #F6EFD4;
}
&.votes {
background: darken(#F6EFD4, 5%);
}
span, div {
@include box-sizing(border-box);
color: darken(#F6EFD4, 60%);
display: block;
text-align: center;
}
span {
font-size: 16px;
font-weight: bold;
height: 35px;
padding-top: 15px;
vertical-align: middle;
}
div {
height: 25px;
font-size: 12px;
}
}
}
}
}
}
}
div.search-tips {
display: block;
}
.search-result-summary {
}
sass/_discussion-tags.scss 0 → 100644
ul.tags {
list-style: none;
li, a {
position: relative;
}
li {
@include border-radius(4px);
background: #eee;
color: #555;
display: inline;
font-size: 12px;
margin-left: 15px;
padding: 5px 10px 5px 5px;
&:before {
content:"";
position:absolute;
top:0;
left:-12px;
width:0;
height:0;
border-color:transparent #eee transparent transparent;
border-style:solid;
border-width:12px 12px 12px 0;
}
}
}
sass/_discussion.scss
...@@ -75,31 +75,6 @@ body.askbot { ...@@ -75,31 +75,6 @@ body.askbot {
vertical-align: top; vertical-align: top;
width: flex-grid(9); width: flex-grid(9);
div.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;
}
&:hover {
text-decoration: none;
color: darken(#F6EFD4, 70%);
}
}
}
p.tabula-rasa { p.tabula-rasa {
@include border-radius(5px); @include border-radius(5px);
background-color: #f6f6f6; background-color: #f6f6f6;
......
sass/application.scss
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
@import "wiki-create", "wiki"; @import "wiki-create", "wiki";
@import "activation"; @import "activation";
@import "help"; @import "help";
@import "discussion", "discussion-questions", "askbot-original"; @import "askbot-original", "discussion", "discussion-questions", "discussion-tags" ;
// left over // left over
@import "theme"; @import "theme";
......
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