Skip to content

E
edx-platform
Commit 3176123c by Reda Lemeden
Options

Started redesigning the question filtering and navigation

parent fdcb5848
Showing with 111 additions and 121 deletions
sass/_askbot-original.scss
...@@ -650,17 +650,17 @@ body.anon #searchBar { ...@@ -650,17 +650,17 @@ body.anon #searchBar {
// padding-top: 6px; // padding-top: 6px;
// font-family: 'Yanone Kaffeesatz',sans-serif; } // font-family: 'Yanone Kaffeesatz',sans-serif; }
#listSearchTags { // #listSearchTags {
float: left; // float: left;
margin-top: 3px; // margin-top: 3px;
color: #707070; // color: #707070;
font-size: 16px; // font-size: 16px;
font-family: 'Yanone Kaffeesatz',sans-serif; } // font-family: 'Yanone Kaffeesatz',sans-serif; }
ul#searchTags { // ul#searchTags {
margin-left: 10px; // margin-left: 10px;
float: right; // float: right;
padding-top: 2px; } // padding-top: 2px; }
// .search-tips { // .search-tips {
// font-size: 16px; // font-size: 16px;
......
sass/_discussion-questions.scss
div.question-controls { div.question-list-header {
display: block; display: block;
margin-bottom: 30px; margin-bottom: 15px;
overflow: hidden; overflow: hidden;
width: flex-grid(9,9); width: flex-grid(9,9);
div { section.question-list-meta, section.question-sort-filter {
display: inline-block; display: block;
overflow: hidden;
width: 100%;
div {
display: inline;
float: left;
}
} }
div.question-count { section.question-list-meta {
margin-right: flex-gutter(); div.question-list-title {
width: flex-grid(4,9); margin-right: flex-gutter();
// width: flex-grid(3,9);
h1 { h1 {
margin-top: 0; margin-top: 0;
}
}
div.question-list-tags {
// width: flex-grid(6,9);
padding-top:8px;
ul.tags {
display: inline;
// float: left;
li {
span.delete-icon, div.delete-icon {
@include border-radius(0 4px 4px 0);
background: #555;
color: #eee;
cursor: pointer;
float: none;
left: 10px;
padding: 3px 6px;
position: relative;
top: 1px;
opacity: 0.5;
&:hover {
opacity: 1;
}
}
}
}
} }
} }
section.question-sort-filter {
font-size: 16px;
div.question-sort { span.label {
vertical-align: bottom; color: #555;
width: flex-grid(5,9); }
nav { div.question-filter {
@include border-radius(35px); margin-right: flex-gutter(9);
background-color: lighten(#F6EFD4, 5%) ;
height: 30px;
float: right;
font-size: 16px;
margin: 3px 0;
padding:0px 20px 5px;
a { ul.scope-filters {
color: darken(#F6EFD4, 50%); @extend .action-link;
&.on span{ li {
font-weight: bold; display: inline;
}
a {
&.on {
font-weight: bold;
}
&:before { &:before {
content: '|'; content: '|';
color: darken(#F6EFD4, 10%); color: darken(#F6EFD4, 10%);
font-size: 22px; font-size: 22px;
}
}
} }
}
}
&:hover { div.question-sort {
text-decoration: none; margin-left: flex-gutter();
color: darken(#F6EFD4, 70%); float: right;
nav {
@extend .action-link;
a {
&.on span{
font-weight: bold;
}
&:before {
content: '|';
color: darken(#F6EFD4, 10%);
font-size: 22px;
}
} }
} }
} }
} }
} }
ul.question-list { ul.question-list {
...@@ -75,7 +132,7 @@ ul.question-list { ...@@ -75,7 +132,7 @@ ul.question-list {
h2 { h2 {
font-size: 16px; font-size: 16px;
font-weight: normal; font-weight: bold;
margin: 0px 0 15px 0; margin: 0px 0 15px 0;
text-transform: none; text-transform: none;
} }
......
sass/_discussion.scss
...@@ -17,73 +17,19 @@ ...@@ -17,73 +17,19 @@
text-decoration: none; text-decoration: none;
} }
} }
.action-link {
a {
color: darken(#F6EFD4, 50%);
// Layout &:hover {
body.askbot { text-decoration: none;
.secondary-nav { color: darken(#F6EFD4, 70%);
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: flex-grid(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;
&.on {
font-weight: bold;
}
}
}
}
}
&.search-box {
margin-left:2%;
text-align:right;
width: flex-grid(8);
input[type="text"] {
margin-right: 6px;
width: flex-grid(2,8);
}
}
}
} }
} }
}
// Layout
body.askbot {
section.main-content { section.main-content {
div.discussion-wrapper { div.discussion-wrapper {
...@@ -149,18 +95,4 @@ body.askbot { ...@@ -149,18 +95,4 @@ body.askbot {
} }
} }
// footer {
// margin: 0 auto;
// padding: 0;
// div.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;
// }
// }
} }
sass/_question-view.scss
...@@ -93,6 +93,7 @@ div.question-header { ...@@ -93,6 +93,7 @@ div.question-header {
float: left; float: left;
margin-right: flex-gutter(8); margin-right: flex-gutter(8);
width: flex-grid(6.2,8); width: flex-grid(6.2,8);
} }
div.post-update-container { div.post-update-container {
......
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