IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

ux: minor button changes

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-08-21 11:08:58 +02:00
parent a95d587c96
commit 23b0795dcc
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/login.go
View File

@ -137,6 +137,8 @@ func loginUserWithUser(user *m.User, c *middleware.Context) {
log.Error(3, "User login with nil user") log.Error(3, "User login with nil user")
} }
c.Resp.Header().Del("Set-Cookie")
days := 86400 * setting.LogInRememberDays days := 86400 * setting.LogInRememberDays
if days > 0 { if days > 0 {
c.SetCookie(setting.CookieUserName, user.Login, days, setting.AppSubUrl+"/") c.SetCookie(setting.CookieUserName, user.Login, days, setting.AppSubUrl+"/")

2
public/app/features/plugins/partials/ds_edit.html
View File

@ -66,7 +66,7 @@
</div> </div>
<div class="gf-form-button-row"> <div class="gf-form-button-row">
<button type="submit" class="btn btn-success" ng-show="!ctrl.isNew" ng-click="ctrl.saveChanges()">Save</button> <button type="submit" class="btn btn-success" ng-click="ctrl.saveChanges()">Save</button>
<button type="submit" class="btn btn-danger" ng-show="!ctrl.isNew" ng-click="ctrl.delete()"> <button type="submit" class="btn btn-danger" ng-show="!ctrl.isNew" ng-click="ctrl.delete()">
Delete Delete
</button> </button>

4
public/sass/_variables.scss
View File

@ -206,8 +206,8 @@ $zindex-modal: 1050;
// //
$btn-padding-x: 1rem !default; $btn-padding-x: 1rem !default;
$btn-padding-y: .6rem !default; $btn-padding-y: .8rem !default;
$btn-line-height: 1.25 !default; $btn-line-height: 1 !default;
$btn-font-weight: 500 !default; $btn-font-weight: 500 !default;
$btn-padding-x-sm: .5rem !default; $btn-padding-x-sm: .5rem !default;

2
public/sass/mixins/_buttons.scss
View File

@ -1,7 +1,7 @@
// Button backgrounds // 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 // gradientBar will set the background to a pleasing blend of these, to support IE<=9
@include gradientBar($startColor, $endColor, $text-color, $textShadow); @include gradientBar($startColor, $endColor, $text-color, $textShadow);