From 5bca3a2d8d98fe01d4595f336e53fa0d266dd33f Mon Sep 17 00:00:00 2001
From: Felix Hammerl <fhammerl@thoughtworks.com>
Date: Thu, 14 Apr 2016 11:43:15 +0200
Subject: Issue #670: Move unread count to template

---
 web-ui/app/scss/_mixins.scss                 | 11 ---------
 web-ui/app/scss/style.scss                   |  1 +
 web-ui/app/scss/templates/_unread-count.scss | 14 ++++++++++++
 web-ui/app/scss/views/_navigation.scss       | 34 ++++------------------------
 4 files changed, 19 insertions(+), 41 deletions(-)
 create mode 100644 web-ui/app/scss/templates/_unread-count.scss

(limited to 'web-ui/app/scss')

diff --git a/web-ui/app/scss/_mixins.scss b/web-ui/app/scss/_mixins.scss
index e6e7a9a2..5dca95a0 100644
--- a/web-ui/app/scss/_mixins.scss
+++ b/web-ui/app/scss/_mixins.scss
@@ -216,14 +216,3 @@
   }
 }
 
-@mixin mail-count($bg_color) {
-  background: $bg_color;
-  color: $white;
-  padding: 2px 5px;
-  font-size: 0.7em;
-  margin-left: 5px;
-  font-weight: 700;
-  position: relative;
-  @include border-radius(100px);
-}
-
diff --git a/web-ui/app/scss/style.scss b/web-ui/app/scss/style.scss
index 79262d0b..659a0631 100644
--- a/web-ui/app/scss/style.scss
+++ b/web-ui/app/scss/style.scss
@@ -18,6 +18,7 @@
 
 // templates
 @import "templates/no-content-placeholder";
+@import "templates/unread-count";
 
 // views
 @import "views/message-panel";
diff --git a/web-ui/app/scss/templates/_unread-count.scss b/web-ui/app/scss/templates/_unread-count.scss
new file mode 100644
index 00000000..f7852227
--- /dev/null
+++ b/web-ui/app/scss/templates/_unread-count.scss
@@ -0,0 +1,14 @@
+.mail-count {
+    background: $white;
+    border-radius: 50%;
+    border: 1px solid $white;
+    color: $white;
+    font-size: 0.7em;
+    font-weight: 700;
+    left: 0;
+    margin-left: 5px;
+    opacity: 0.95;
+    padding: 0px 5px 0;
+    position: absolute;
+    top: 1px;
+}
diff --git a/web-ui/app/scss/views/_navigation.scss b/web-ui/app/scss/views/_navigation.scss
index 9d98d9e8..98272483 100644
--- a/web-ui/app/scss/views/_navigation.scss
+++ b/web-ui/app/scss/views/_navigation.scss
@@ -379,34 +379,6 @@ div.side-nav-bottom {
     }
 
     ul#default-tag-list {
-        //            .unread-count, .total-count {
-        //                font-size: 0.5em;
-        //                padding: 1px 5px 0;
-        //                top: 1px;
-        //                left: 0;
-        //                border: 1px solid $white;
-        //                position: absolute;
-        //                opacity: 0.95;
-        //            }
-        //
-        //            .total-count {
-        //                background: $medium_light_grey;
-        //            }
-
-        .unread-count, .total-count {
-            font-size: 0.7em;
-            padding: 0px 5px 0;
-            top: 1px;
-            left: 0;
-            border: 1px solid $white;
-            border-bottom: 1px solid white;
-            position: absolute;
-            opacity: 0.95;
-        }
-
-        .total-count {
-            background: $medium_light_grey;
-        }
 
         span.tag-label {
             padding-left: 2px;
@@ -591,9 +563,11 @@ div.side-nav-bottom {
 }
 
 .unread-count {
-    @include mail-count($secondary_callout);
+    @extend .mail-count;
+    background: $secondary_callout;
 }
 
 .total-count {
-    @include mail-count($medium_light_grey);
+    @extend .mail-count;
+    background: $medium_light_grey;
 }
-- 
cgit v1.2.3