diff --git a/app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars b/app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars index e363af35a36..2158f0f29be 100644 --- a/app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars +++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars @@ -30,13 +30,13 @@ {{topicStatus topic=topic}} {{{unbound topic.fancy_title}}} {{#if unread}} - {{unbound topic.unread}} + {{unbound topic.unread}} Unread {{/if}} {{#if topic.new_posts}} - {{unbound topic.new_posts}} + {{unbound topic.new_posts}} New {{/if}} {{#if topic.unseen}} - + New {{/if}} diff --git a/app/assets/javascripts/discourse/templates/discovery/categories.js.handlebars b/app/assets/javascripts/discourse/templates/discovery/categories.js.handlebars index b4704dc1744..a05f3e98271 100644 --- a/app/assets/javascripts/discourse/templates/discovery/categories.js.handlebars +++ b/app/assets/javascripts/discourse/templates/discovery/categories.js.handlebars @@ -20,10 +20,10 @@ {{#if controller.ordering}}{{/if}} {{categoryLink this allowUncategorized=true}} {{#if unreadTopics}} - {{unbound unreadTopics}} + {{unbound unreadTopics}} Unread {{/if}} {{#if newTopics}} - {{unbound newTopics}} + {{unbound newTopics}} New {{/if}}
@@ -47,7 +47,7 @@ {{unbound unreadTopics}} {{/if}} {{#if newTopics}} - {{unbound newTopics}} + {{unbound newTopics}} New {{/if}} {{/each}}
@@ -59,13 +59,13 @@ {{topicStatus topic=this}} {{{unbound fancy_title}}} {{#if unread}} - {{unread}} + {{unread}} Unread {{/if}} {{#if new_posts}} - {{new_posts}} + {{new_posts}} New {{/if}} {{#if unseen}} - + New {{/if}} {{#if controller.latestTopicOnly}} diff --git a/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars b/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars index ad1091e2d10..2d1a6ef16e9 100644 --- a/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars +++ b/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars @@ -14,13 +14,13 @@ {{topicStatus topic=this}} {{{topicLink this}}} {{#if unread}} - {{unread}} + {{unread}} Unread {{/if}} {{#if displayNewPosts}} - {{displayNewPosts}} + {{displayNewPosts}} New {{/if}} {{#if unseen}} - + New {{/if}} {{#if hasExcerpt}} diff --git a/app/assets/javascripts/discourse/templates/site_map/_category.js.handlebars b/app/assets/javascripts/discourse/templates/site_map/_category.js.handlebars index 638c709867b..f17cc4dd1d5 100644 --- a/app/assets/javascripts/discourse/templates/site_map/_category.js.handlebars +++ b/app/assets/javascripts/discourse/templates/site_map/_category.js.handlebars @@ -4,7 +4,7 @@ {{unreadTopics}} {{/if}} {{#if newTopics}} - {{newTopics}} + {{newTopics}} New {{/if}} {{else}} {{unbound topic_count}} diff --git a/app/assets/stylesheets/common/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss index e686599e0dd..34d5fb23930 100644 --- a/app/assets/stylesheets/common/components/badges.css.scss +++ b/app/assets/stylesheets/common/components/badges.css.scss @@ -67,7 +67,9 @@ h1 a.badge-category div {vertical-align: top;} // New posts &.new-posts, &.unread-posts { - background-color: $emphasis_text_color; + background-color: $emphasis_background_color; + color: $emphasis_text_color; + font-weight: normal; } // Click count @@ -75,7 +77,7 @@ h1 a.badge-category div {vertical-align: top;} &.clicks { font-weight: normal; background-color: #ddd; - top: -1px; + top: -1px; color: #888; position: relative; margin-left: 2px; diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss index b50ddbc2d17..89460f2b0d4 100644 --- a/app/assets/stylesheets/common/foundation/variables.scss +++ b/app/assets/stylesheets/common/foundation/variables.scss @@ -157,7 +157,7 @@ $controls_active: darken($blue, 10%); $primary_border_color: lighten($black, 60%); $secondary_border_color: lighten($black, 76%); -$tertiary_border_color: $white; +$tertiary_border_color: $white; $highlight_border_color: $yellow; $emphasis_border_color: $blue; $warning_border_color: lighten($red, 20%); diff --git a/app/assets/stylesheets/desktop/header.scss b/app/assets/stylesheets/desktop/header.scss index 6e1125cd2f8..fecb63df45c 100644 --- a/app/assets/stylesheets/desktop/header.scss +++ b/app/assets/stylesheets/desktop/header.scss @@ -11,7 +11,7 @@ top: 0; left: 0; z-index: 1000; - box-shadow: 0 1px 3px rgba($primary_shadow_color, .2); + border-bottom: 1px solid $primary_border_color; background-color: $primary_background_color; padding-top: 3px; .docked & { @@ -45,12 +45,12 @@ .current-username { float: left; a { - color: $primary_text_color; + color: $secondary_text_color; font-size: 14px; line-height: 40px; } button { - margin-top: 8px; + margin-top: 9px; } } .icons { @@ -60,22 +60,23 @@ list-style: none; > li { float: left; - &:last-child .icon { - border-right: 1px solid $primary_border_color; - } } .icon { display: block; - border-top: 1px solid $primary_border_color; - border-bottom: 1px solid $primary_border_color; - border-left: 1px solid $primary_border_color; padding: 3px; color: $nav-button-color; text-decoration: none; cursor: pointer; + border-top: 1px solid $tertiary_border_color; + border-left: 1px solid $tertiary_border_color; + border-right: 1px solid $tertiary_border_color; + &:hover { color: $nav-button-color-hover; background-color: $nav-button-background-color-hover; + border-top: 1px solid $primary_border_color; + border-left: 1px solid $primary_border_color; + border-right: 1px solid $primary_border_color; } &:active { color: $nav-button-color-active; @@ -87,7 +88,9 @@ color: #7b7b7b; background-color: $primary_background_color; cursor: default; - @include box-shadow((6px 0 6px -6px rgba($primary_shadow_color, 0.2), -6px 0 6px -6px rgba($primary_shadow_color, 0.2), inset 0 13px 13px -13px rgba($primary_shadow_color, 0.1))); + border-top: 1px solid $primary_border_color; + border-left: 1px solid $primary_border_color; + border-right: 1px solid $primary_border_color; &:after { display: block; position: absolute; @@ -99,6 +102,9 @@ content: ""; border-top: 1px solid $tertiary_border_color; } + &:hover { + border-bottom: none; + } } [class^="fa fa-"] { width: 32px; @@ -135,7 +141,7 @@ } #main-outlet { - padding-top: 75px; + padding-top: 80px; } // Dropdowns @@ -152,7 +158,7 @@ margin-top: -1px; border: 1px solid $primary_border_color; background-color: $primary_background_color; - @include box-shadow(0 3px 3px rgba($primary_shadow_color, .4)); + @include box-shadow(0 2px 2px rgba($primary_shadow_color, .4)); // Common diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss index fadd801e42c..7d454b46093 100644 --- a/app/assets/stylesheets/desktop/topic-list.scss +++ b/app/assets/stylesheets/desktop/topic-list.scss @@ -11,7 +11,7 @@ .list-controls { .nav { float: left; - margin-bottom: 15px; + margin-bottom: 20px; } .btn { @@ -63,6 +63,7 @@ border-collapse: separate; border-spacing: 0; margin: 0 0 10px; + a.title {color: $primary_text_color;} a.title:visited:not(.badge-notification) {color: lighten($primary_text_color, 35%);} > tbody > tr { @@ -87,7 +88,7 @@ } th, td { - padding: 9px 5px; + padding: 12px 5px; line-height: 1.25; text-align: left; vertical-align: middle; @@ -141,11 +142,12 @@ } .topic-excerpt { - font-size: 14px; + font-size: 13px; margin-top: 8px; color: lighten($primary_text_color, 35%); word-break: break-word; - padding-right: 20px; + padding-right: 50px; + line-height: 1.4; } @include medium-width { @@ -174,10 +176,11 @@ } .badge-notification { position: relative; - top: -1px; + top: -2px; } .category { - width: 140px; + padding: 0 20px 0 20px; + min-width: 80px; } .posters { min-width: 150px;