diff --git a/sass/discussion/_askbot-original.scss b/sass/discussion/_askbot-original.scss index a1ff71cb0e..811be0496c 100644 --- a/sass/discussion/_askbot-original.scss +++ b/sass/discussion/_askbot-original.scss @@ -650,17 +650,17 @@ body.anon #searchBar { // padding-top: 6px; // font-family: 'Yanone Kaffeesatz',sans-serif; } -#listSearchTags { - float: left; - margin-top: 3px; - color: #707070; - font-size: 16px; - font-family: 'Yanone Kaffeesatz',sans-serif; } +// #listSearchTags { +// float: left; +// margin-top: 3px; +// color: #707070; +// font-size: 16px; +// font-family: 'Yanone Kaffeesatz',sans-serif; } -ul#searchTags { - margin-left: 10px; - float: right; - padding-top: 2px; } +// ul#searchTags { +// margin-left: 10px; +// float: right; +// padding-top: 2px; } // .search-tips { // font-size: 16px; diff --git a/sass/discussion/_discussion.scss b/sass/discussion/_discussion.scss index 58250f9b73..111d23bff0 100644 --- a/sass/discussion/_discussion.scss +++ b/sass/discussion/_discussion.scss @@ -17,73 +17,19 @@ text-decoration: none; } } +.action-link { + a { + color: darken(#F6EFD4, 50%); + + &:hover { + text-decoration: none; + color: darken(#F6EFD4, 70%); + } + } +} // Layout 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: 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); - } - } - - } - } - } section.main-content { div.discussion-wrapper { @@ -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; - // } - // } } diff --git a/sass/discussion/_question-view.scss b/sass/discussion/_question-view.scss index 1fae85f023..090551b052 100644 --- a/sass/discussion/_question-view.scss +++ b/sass/discussion/_question-view.scss @@ -93,6 +93,7 @@ div.question-header { float: left; margin-right: flex-gutter(8); width: flex-grid(6.2,8); + } div.post-update-container { diff --git a/sass/discussion/_questions.scss b/sass/discussion/_questions.scss index a776c316d4..d508ba6161 100644 --- a/sass/discussion/_questions.scss +++ b/sass/discussion/_questions.scss @@ -1,58 +1,104 @@ -div.question-controls { +div.question-list-header { display: block; - margin-bottom: 30px; + margin-bottom: 15px; overflow: hidden; width: flex-grid(9,9); - div { - display: inline-block; - } + section.question-list-meta { + display: block; + overflow: hidden; + width: 100%; - div.question-count { - margin-right: flex-gutter(); - width: flex-grid(4,9); + div { + display: inline-block; + float: left; + } - h1 { - margin-top: 0; + span.label { + color: #555; + } + + div.question-list-title { + margin-right: flex-gutter(); + + h1 { + margin-top: 0; + } + } + + + div.question-sort { + float: right; + margin-left: flex-gutter(); + // width: flex-grid(3,9); + + // @media screen and (max-width: 1300px) { + // width: 100%; + // } + + nav { + @extend .action-link; + float: right; + + // @media screen and (max-width: 1300px) { + // float: left; + // } + + a { + &.on span{ + font-weight: bold; + } + + &:before { + content: '|'; + color: darken(#F6EFD4, 10%); + font-size: 22px; + } + } + } } } - div.question-sort { - vertical-align: bottom; - width: flex-grid(5,9); + section.question-tags-list { + display: block; + min-height: 40px; + overflow: hidden; + width: 100%; - nav { - @include border-radius(35px); - background-color: lighten(#F6EFD4, 5%) ; - height: 30px; - float: right; - font-size: 16px; - margin: 3px 0; - padding:0px 20px 5px; + div.tags-list { + padding-top:8px; + display: inline-block; + float: left; - a { - color: darken(#F6EFD4, 50%); + ul.tags { + display: inline; - &.on span{ - font-weight: bold; - } + li { + span.delete-icon, div.delete-icon { + @include border-radius(0 4px 4px 0); + background: #555; + color: #eee; + cursor: pointer; + float: none; + display: inline; + clear: none; + left: 10px; + padding: 3px 6px; + position: relative; + top: 1px; + opacity: 0.5; - &:before { - content: '|'; - color: darken(#F6EFD4, 10%); - font-size: 22px; - } - - &:hover { - text-decoration: none; - color: darken(#F6EFD4, 70%); + &:hover { + opacity: 1; + } + } } } } } } -ul.question-list { +ul.question-list, div#question-list { width: flex-grid(9,9); li.single-question { @@ -75,7 +121,7 @@ ul.question-list { h2 { font-size: 16px; - font-weight: normal; + font-weight: bold; margin: 0px 0 15px 0; text-transform: none; } @@ -151,9 +197,5 @@ ul.question-list { } } -div.search-tips { - display: block; -} - .search-result-summary { }