diff --git a/pkg/api/login.go b/pkg/api/login.go index a9fcbee8e8e..f31ea01b108 100644 --- a/pkg/api/login.go +++ b/pkg/api/login.go @@ -137,6 +137,8 @@ func loginUserWithUser(user *m.User, c *middleware.Context) { log.Error(3, "User login with nil user") } + c.Resp.Header().Del("Set-Cookie") + days := 86400 * setting.LogInRememberDays if days > 0 { c.SetCookie(setting.CookieUserName, user.Login, days, setting.AppSubUrl+"/") diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html index 50730f3eede..515aec5d46b 100644 --- a/public/app/features/plugins/partials/ds_edit.html +++ b/public/app/features/plugins/partials/ds_edit.html @@ -66,7 +66,7 @@
- + diff --git a/public/sass/_variables.scss b/public/sass/_variables.scss index 31fdbfc49f7..d76111b080b 100644 --- a/public/sass/_variables.scss +++ b/public/sass/_variables.scss @@ -206,8 +206,8 @@ $zindex-modal: 1050; // $btn-padding-x: 1rem !default; -$btn-padding-y: .6rem !default; -$btn-line-height: 1.25 !default; +$btn-padding-y: .8rem !default; +$btn-line-height: 1 !default; $btn-font-weight: 500 !default; $btn-padding-x-sm: .5rem !default; diff --git a/public/sass/mixins/_buttons.scss b/public/sass/mixins/_buttons.scss index 92a41840af6..7f07b768ad3 100644 --- a/public/sass/mixins/_buttons.scss +++ b/public/sass/mixins/_buttons.scss @@ -1,7 +1,7 @@ // Button backgrounds // ------------------ -@mixin buttonBackground($startColor, $endColor, $text-color: #fff, $textShadow: 0px 1px 0 rgba(0,0,0,.5)) { +@mixin buttonBackground($startColor, $endColor, $text-color: #fff, $textShadow: 0px 1px 0 rgba(0,0,0,.1)) { // gradientBar will set the background to a pleasing blend of these, to support IE<=9 @include gradientBar($startColor, $endColor, $text-color, $textShadow);