Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FEATURE: show date ranges in top period chooser

This commit is contained in:
Neil Lalonde 2016-01-15 17:45:00 -05:00
parent 6e3d52901a
commit 89be23a5d4
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/components/period-chooser.hbs
View File

@ -4,7 +4,7 @@
<div id='period-popup' {{bind-attr class="showPeriods::hidden :period-popup"}}> <div id='period-popup' {{bind-attr class="showPeriods::hidden :period-popup"}}>
<ul> <ul>
{{#each p in site.periods}} {{#each p in site.periods}}
<li><a href {{action "changePeriod" p}}>{{period-title p}}</a></li> <li><a href {{action "changePeriod" p}}>{{period-title p showDateRange=true}}</a></li>
{{/each}} {{/each}}
</ul> </ul>
</div> </div>

14
app/assets/stylesheets/common/base/_topic-list.scss
View File

@ -241,15 +241,17 @@ ol.category-breadcrumb {
h2 { h2 {
float: left; float: left;
margin: 5px 0 10px; margin: 5px 0 10px;
.top-date-string { .top-date-string {
color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
font-weight: normal;
font-size: 0.7em; font-size: 0.7em;
text-transform: uppercase;
} }
} }
.top-date-string {
color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
font-weight: normal;
text-transform: uppercase;
}
button { button {
outline: 0; outline: 0;
background: transparent; background: transparent;
@ -262,6 +264,7 @@ ol.category-breadcrumb {
@include unselectable; @include unselectable;
font-size: 1.2em;
border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
padding: 5px; padding: 5px;
background: $secondary; background: $secondary;
@ -281,6 +284,9 @@ ol.category-breadcrumb {
display: block; display: block;
padding: 5px; padding: 5px;
} }
.top-date-string {
font-size: 0.8em;
}
&:hover { &:hover {
background-color: dark-light-diff($highlight, $secondary, 50%, -70%); background-color: dark-light-diff($highlight, $secondary, 50%, -70%);
} }