summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJulius Haertl <jus@bitgrid.net>2017-02-21 17:33:07 +0100
committerJulius Härtl <jus@bitgrid.net>2017-03-20 12:49:07 +0100
commit5b3a1a558eb6ebf5e62a182d29063e36d83072fc (patch)
tree9e558c0352ae9e142d7b547e01273cf99acc9b44 /core
parent8ff3db1be8f98d1305d252818e1a614463128f91 (diff)
downloadnextcloud-server-5b3a1a558eb6ebf5e62a182d29063e36d83072fc.tar.gz
nextcloud-server-5b3a1a558eb6ebf5e62a182d29063e36d83072fc.zip
Remove separate error colors
Signed-off-by: Julius Haertl <jus@bitgrid.net>
Diffstat (limited to 'core')
-rw-r--r--core/css/styles.scss4
-rw-r--r--core/css/variables.scss3
2 files changed, 3 insertions, 4 deletions
diff --git a/core/css/styles.scss b/core/css/styles.scss
index 713f0d63a97..524ec978dd2 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -518,7 +518,7 @@ label.infield {
}
.errors {
background: rgba($color-error, .35);
- border: 1px solid $color-main-old-ff0000;
+ border: 1px solid $color-error;
list-style-indent: inside;
margin: 0 0 2em;
padding: 1em;
@@ -672,7 +672,7 @@ label.infield {
#body-user .warning, #body-settings .warning {
margin-top: 8px;
padding: 5px;
- background: $color-main-old-ffdddd;
+ background: rgba($color-error, .15);
border-radius: 3px;
}
diff --git a/core/css/variables.scss b/core/css/variables.scss
index 93612bc9ca4..da41ec62c89 100644
--- a/core/css/variables.scss
+++ b/core/css/variables.scss
@@ -19,11 +19,10 @@ $color-loading-dark: #bbbbbb;
// need to be reduced/replaced
-$color-main-old-ff0000: $color-error;
-$color-main-old-ffdddd: rgba($color-error, .15);
$color-main-old-f8f8f8: #f8f8f8;
$color-main-old-eeeeee: #eee;
+
$color-main-old-dddddd: #ddd;
$color-main-old-dcdcdc: rgb(220, 220, 200);
$color-main-old-d3d3d3: #d3d3d3;