Merge branch 'master' of github.com:planetcyborg/engelsystem

Conflicts:
	themes/theme1.scss

1 files changed, 7 insertions, 6 deletions

diff --git a/themes/theme1.scss b/themes/theme1.scss
index 74915432..2cd2519b 100644
--- a/themes/theme1.scss
+++ b/themes/theme1.scss
@@ -167,27 +167,28 @@ $btn-font-weight:                normal;
 
 $btn-default-color:              #fff;
 $btn-default-bg:                 lighten($gray-dark, 10%);
-$btn-default-border:             #282828;
+
+$btn-default-border:             darken($btn-default-bg, 10%);
 
 $btn-primary-color:              $btn-default-color;
 $btn-primary-bg:                 $brand-primary;
-$btn-primary-border:             $btn-primary-bg;
+$btn-primary-border:             darken($btn-default-bg, 10%);
 
 $btn-success-color:              $btn-default-color;
 $btn-success-bg:                 $brand-success;
-$btn-success-border:             $btn-success-bg;
+$btn-success-border:             darken($btn-default-bg, 10%);
 
 $btn-info-color:                 $btn-default-color;
 $btn-info-bg:                    $brand-info;
-$btn-info-border:                $btn-info-bg;
+$btn-info-border:                darken($btn-default-bg, 10%);
 
 $btn-warning-color:              $btn-default-color;
 $btn-warning-bg:                 $brand-warning;
-$btn-warning-border:             $btn-warning-bg;
+$btn-warning-border:             darken($btn-default-bg, 10%);
 
 $btn-danger-color:               $btn-default-color;
 $btn-danger-bg:                  $brand-danger;
-$btn-danger-border:              $btn-danger-bg;
+$btn-danger-border:              darken($btn-default-bg, 10%);
 
 $btn-link-disabled-color:        $gray-light;