From 5b0698192b6e0d0d4da7967b5c327ebcc7dc4acb Mon Sep 17 00:00:00 2001
From: Juan Cruz Viotti <jviotti@openmailbox.org>
Date: Fri, 2 Sep 2016 10:30:56 -0400
Subject: [PATCH] refactor(GUI): badge coloring (#675)

Move `.badge` coloring to the main page's style file, since the style we
currently hardcode on the component itself is very tied to the
particular context the badge is being instantiated in.

Signed-off-by: Juan Cruz Viotti <jviotti@openmailbox.org>
---
 build/css/main.css                   | 15 ++++++++-------
 lib/gui/pages/main/styles/_main.scss | 10 ++++++++++
 lib/gui/scss/components/_badge.scss  |  7 -------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/build/css/main.css b/build/css/main.css
index ac0e16a7..9bf22e26 100644
--- a/build/css/main.css
+++ b/build/css/main.css
@@ -6081,13 +6081,7 @@ body {
   padding: 7px 10px;
   position: relative;
   z-index: 10;
-  letter-spacing: 0;
-  background-color: #535760;
-  color: #fff; }
-
-.badge[disabled] {
-  background-color: #5a5d60;
-  color: #787c7f; }
+  letter-spacing: 0; }
 
 /*
  * Copyright 2016 Resin.io
@@ -6527,6 +6521,13 @@ body {
   .page-main .icon-caption[disabled] {
     color: #787c7f; }
 
+.page-main .badge {
+  background-color: #535760;
+  color: #fff; }
+  .page-main .badge[disabled] {
+    background-color: #5a5d60;
+    color: #787c7f; }
+
 .svg-icon[disabled] path {
   fill: #787c7f; }
 
diff --git a/lib/gui/pages/main/styles/_main.scss b/lib/gui/pages/main/styles/_main.scss
index 376d215f..9bd120a1 100644
--- a/lib/gui/pages/main/styles/_main.scss
+++ b/lib/gui/pages/main/styles/_main.scss
@@ -29,6 +29,16 @@
   }
 }
 
+.page-main .badge {
+  background-color: $palette-theme-dark-background;
+  color: $palette-theme-dark-foreground;
+
+  &[disabled] {
+    background-color: darken($palette-theme-dark-disabled-foreground, 12%);
+    color: $palette-theme-dark-disabled-foreground;
+  }
+}
+
 .svg-icon[disabled] path {
   fill: $palette-theme-dark-disabled-foreground;
 }
diff --git a/lib/gui/scss/components/_badge.scss b/lib/gui/scss/components/_badge.scss
index 6cdbd474..372e893a 100644
--- a/lib/gui/scss/components/_badge.scss
+++ b/lib/gui/scss/components/_badge.scss
@@ -21,11 +21,4 @@
   position: relative;
   z-index: 10;
   letter-spacing: 0;
-  background-color: $palette-theme-dark-background;
-  color: $palette-theme-dark-foreground;
-}
-
-.badge[disabled] {
-  background-color: darken($palette-theme-dark-disabled-foreground, 12%);
-  color: $palette-theme-dark-disabled-foreground;
 }