summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Albo <gabriel@albo.com.br>2015-03-31 14:52:52 -0300
committerGabriel Albo <gabriel@albo.com.br>2015-03-31 14:53:00 -0300
commit774e6fa6a0d1d62b1ebd6ded059966fd229d9c19 (patch)
tree49ebe4ecd323ff74c1a0e8ae6a6fab34a7694a2d
parent46ea4c16a78b0dcb18ccdd301c164963150204a4 (diff)
Changing feedback colors to be in sync with the color palette and making the left pane have consistent color scheme
-rw-r--r--web-ui/app/scss/_colors.scss8
-rw-r--r--web-ui/app/scss/styles.scss6
2 files changed, 7 insertions, 7 deletions
diff --git a/web-ui/app/scss/_colors.scss b/web-ui/app/scss/_colors.scss
index da571405..4a1eba33 100644
--- a/web-ui/app/scss/_colors.scss
+++ b/web-ui/app/scss/_colors.scss
@@ -23,16 +23,16 @@ $secondary_callout: darken($primary_highlight, 5);
/* Grayscale */
$contrast: #EEE;
-$top_pane: #EAEAEA;
+$top_pane: $contrast;
$total_count_bg: #C0B9B9;
/* Feedback to Users */
$warning: #F7E8AF;
$search-highlight: #FFEF29;
-$error: #D72A25;
-$attention: #F6A40A;
-$success: #2DAB49;
+$error: #D93C38;
+$attention: #F6A41C;
+$success: #50BA5B;
$will_be_encrypted: #41cd60;
$wont_be_encrypted: #F6A40A;
diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/styles.scss
index 56c9ebbd..2e47dad7 100644
--- a/web-ui/app/scss/styles.scss
+++ b/web-ui/app/scss/styles.scss
@@ -29,7 +29,7 @@
margin: 0;
border-top: 1px solid #FFF;
border-bottom: 2px solid lighten($top_pane, 30%);
- background: darken($top_pane, 5%);
+ background: $top_pane;
clear: both;
overflow: hidden;
li {
@@ -191,7 +191,7 @@ section {
&#top-pane {
height: auto;
overflow: hidden;
- background: darken($top_pane, 10%);
+ background: $top_pane;
border-top: 1px solid $top_pane;
@include list-actions;
#compose-search-trigger {
@@ -205,7 +205,7 @@ section {
margin-right: -5px;
a {
transition: background-color 150ms ease-out;
- background: lighten($top_pane, 10%);
+ background: $top_pane;
color: #FFF;
font-size: 1.5em;
display: block;