diff options
-rw-r--r-- | service/pixelated/adapter/model/mail.py | 2 | ||||
-rw-r--r-- | service/test/unit/resources/__init__.py | 1 | ||||
-rw-r--r-- | service/test/unit/resources/test_keys_resources.py | 1 | ||||
-rw-r--r-- | web-ui/app/scss/_colors.scss | 3 | ||||
-rw-r--r-- | web-ui/app/scss/_mixins.scss | 6 |
5 files changed, 8 insertions, 5 deletions
diff --git a/service/pixelated/adapter/model/mail.py b/service/pixelated/adapter/model/mail.py index cf665c9e..b2b0986a 100644 --- a/service/pixelated/adapter/model/mail.py +++ b/service/pixelated/adapter/model/mail.py @@ -378,7 +378,7 @@ class PixelatedMail(Mail): @property def encrypted(self): return self.hdoc.content["headers"].get("OpenPGP", None) is not None or \ - self.hdoc.content["headers"].get("X-Pixelated-encryption-status", "false") == "true" + self.hdoc.content["headers"].get("X-Pixelated-encryption-status", "false") == "true" def as_dict(self): dict_mail = {'header': {k.lower(): v for k, v in self.headers.items()}, diff --git a/service/test/unit/resources/__init__.py b/service/test/unit/resources/__init__.py index b8214a8c..5abd502b 100644 --- a/service/test/unit/resources/__init__.py +++ b/service/test/unit/resources/__init__.py @@ -20,4 +20,3 @@ def resolve_result(request, result): class DummySite(Site): def get(self, request): return resolve_result(request, self.getResourceFor(request).render(request)) - diff --git a/service/test/unit/resources/test_keys_resources.py b/service/test/unit/resources/test_keys_resources.py index 7113889e..fb085cad 100644 --- a/service/test/unit/resources/test_keys_resources.py +++ b/service/test/unit/resources/test_keys_resources.py @@ -56,4 +56,3 @@ class TestKeysResource(unittest.TestCase): d.addCallback(assert_response) return d - diff --git a/web-ui/app/scss/_colors.scss b/web-ui/app/scss/_colors.scss index d011e23c..22897ac0 100644 --- a/web-ui/app/scss/_colors.scss +++ b/web-ui/app/scss/_colors.scss @@ -14,3 +14,6 @@ $primary_color: #EF4E2F; $action_buttons: #2ba6cb; $secondary_callout: #FF7902; + +$will_be_encrypted: #41cd60; +$wont_be_encrypted: #F6A40A; diff --git a/web-ui/app/scss/_mixins.scss b/web-ui/app/scss/_mixins.scss index ddce49a7..18871995 100644 --- a/web-ui/app/scss/_mixins.scss +++ b/web-ui/app/scss/_mixins.scss @@ -1,3 +1,5 @@ +@import 'colors'; + // SHARED MIXINS @mixin btn-transition { @include transition-property(background-color); @@ -192,10 +194,10 @@ border: 1px solid #666666; } &.encrypted { - border-bottom-color: limegreen; + border-bottom-color: $will_be_encrypted; } &.not-encrypted { - border-bottom-color: orangered; + border-bottom-color: $wont_be_encrypted; } background-color: #F5F5F5; border: 1px solid #D9D9D9; |