From cf61ef7138e401a2d4134c58d683e1726bb3d428 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@discourse.org>
Date: Thu, 10 Jul 2014 13:28:53 -0700
Subject: [PATCH] category-list-item only used in mobile layout
---
.../mobile/discovery/categories.js.handlebars | 6 ----
.../stylesheets/common/base/_topic-list.scss | 33 -------------------
.../stylesheets/desktop/topic-list.scss | 13 --------
app/assets/stylesheets/mobile/topic-list.scss | 30 ++++++++++++++++-
4 files changed, 29 insertions(+), 53 deletions(-)
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.js.handlebars b/app/assets/javascripts/discourse/templates/mobile/discovery/categories.js.handlebars
index 191bf3fab..fb4038a44 100644
--- a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/mobile/discovery/categories.js.handlebars
@@ -4,12 +4,6 @@
<tr>
<th class="main-link">
{{category-link this allowUncategorized=true}}
-
- <div class='posters'>
- {{#each featured_users}}
- <a href="/users/{{unbound username_lower}}">{{avatar this imageSize="small"}}</a>
- {{/each}}
- </div>
</th>
<th class='num posts'>{{i18n posts}}</th>
<th class='num age'>{{i18n age}}</th>
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index cfb6d1115..331573b6c 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -123,39 +123,6 @@
}
-.category-list-item {
- margin-bottom: 10px;
- #topic-list tbody tr:nth-child(even) {
- background-color: darken($secondary, 3%);
- }
- th .badge-category {
- float: left;
- margin: 1px 4px 0 0;
- }
- .posters {
- float: left;
- }
- > footer {
- border-top: 0;
- padding: 7px 10px;
- figure {
- float: left;
- margin: 3px 7px 0 0;
- color: scale-color($primary, $lightness: 10%);
- font-weight: bold;
- font-size: 12px;
- }
- figcaption {
- display: inline;
- font-weight: normal;
- }
- .btn {
- float: right;
- margin-left: 7px;
- }
- }
-}
-
.loading #topic-list {
border: 0;
@include box-shadow(none);
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 8710f5ceb..9cdc40ab5 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -232,19 +232,6 @@
}
}
-// Category list
-// --------------------------------------------------
-
-.category-list-item {
- th .badge-category {
- float: left;
- }
- .posters {
- display: block;
- width: 165px;
- }
-}
-
#topic-list-bottom {
margin: 20px 0;
}
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index e168b90c1..bf3546b43 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -134,11 +134,39 @@
}
.category-list-item {
+ margin-bottom: 10px;
+ #topic-list tbody tr:nth-child(even) {
+ background-color: darken($secondary, 3%);
+ }
+ th .badge-category {
+ float: left;
+ margin: 1px 4px 0 0;
+ }
.posters {
- display: none;
+ float: left;
+ }
+ > footer {
+ border-top: 0;
+ padding: 7px 10px;
+ figure {
+ float: left;
+ margin: 3px 7px 0 0;
+ color: scale-color($primary, $lightness: 10%);
+ font-weight: bold;
+ font-size: 12px;
+ }
+ figcaption {
+ display: inline;
+ font-weight: normal;
+ }
+ .btn {
+ float: right;
+ margin-left: 7px;
+ }
}
}
+
#topic-list-bottom {
margin: 20px 12px 0 12px;
}