From 8817cc9aafdcf503e4450dd60e0ab052452e8e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 17 Aug 2017 21:32:23 +0200 Subject: [PATCH 1/3] ux: color tweaks --- public/app/features/dashboard/partials/settings.html | 8 ++------ public/app/partials/dashboard.html | 3 +-- public/sass/_variables.dark.scss | 3 ++- public/sass/_variables.light.scss | 1 + public/sass/components/_navbar.scss | 3 ++- public/sass/components/_sidemenu.scss | 6 +++++- public/sass/components/_tabbed_view.scss | 6 ++---- public/sass/components/_view_states.scss | 4 ++++ public/sass/layout/_page.scss | 4 +--- public/sass/pages/_dashboard.scss | 4 ++-- 10 files changed, 22 insertions(+), 20 deletions(-) diff --git a/public/app/features/dashboard/partials/settings.html b/public/app/features/dashboard/partials/settings.html index ddd21eae463..8c7af5d70cd 100644 --- a/public/app/features/dashboard/partials/settings.html +++ b/public/app/features/dashboard/partials/settings.html @@ -85,16 +85,12 @@ -
+
-
+
-
- -
-
diff --git a/public/app/partials/dashboard.html b/public/app/partials/dashboard.html index 86f3c275b76..b559f580f0b 100644 --- a/public/app/partials/dashboard.html +++ b/public/app/partials/dashboard.html @@ -3,9 +3,8 @@
+
-
-
diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss index 97150d3c853..0e5629bf00a 100644 --- a/public/sass/_variables.dark.scss +++ b/public/sass/_variables.dark.scss @@ -62,7 +62,8 @@ $text-shadow-faint: 1px 1px 4px rgb(45, 45, 45); // gradients $brand-gradient: linear-gradient(to right, rgba(255,213,0,0.7) 0%, rgba(255,68,0,0.7) 99%, rgba(255,68,0,0.7) 100%); -$page-gradient: linear-gradient(60deg, transparent 70%, darken($page-bg, 4%) 98%); +$page-gradient: linear-gradient(180deg, rgb(36, 36, 36) 40px, rgba(178, 31, 31, 0.03) 100px, rgba(253, 187, 45, 0.03)); +$dashboard-gradient: linear-gradient(180deg, #242424 10px, rgba(15, 15, 15, 1) 100px, rgb(10, 10, 10)); // Links // ------------------------- diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss index c803639f8fc..b5b118671d4 100644 --- a/public/sass/_variables.light.scss +++ b/public/sass/_variables.light.scss @@ -69,6 +69,7 @@ $text-shadow-faint: none; // gradients $brand-gradient: linear-gradient(to right, rgba(255,213,0,1.0) 0%, rgba(255,68,0,1.0) 99%, rgba(255,68,0,1.0) 100%); $page-gradient: linear-gradient(60deg, transparent 70%, darken($page-bg, 4%) 98%); +$dashboard-gradient: linear-gradient(60deg, transparent 70%, darken($page-bg, 4%) 98%); // Links // ------------------------- diff --git a/public/sass/components/_navbar.scss b/public/sass/components/_navbar.scss index 588663ff24f..3283a493336 100644 --- a/public/sass/components/_navbar.scss +++ b/public/sass/components/_navbar.scss @@ -4,13 +4,14 @@ overflow: visible; position: relative; margin-left: $side-menu-width; + box-shadow: 0 0 20px black; + z-index: 1; } .navbar-inner { min-height: $navbarHeight; padding-right: $spacer; background-color: $navbarBackground; - border-bottom: $navbarBorder; @include clearfix(); } diff --git a/public/sass/components/_sidemenu.scss b/public/sass/components/_sidemenu.scss index 25f42a7bd9d..09ad19ba19b 100644 --- a/public/sass/components/_sidemenu.scss +++ b/public/sass/components/_sidemenu.scss @@ -5,7 +5,8 @@ flex-direction: column; width: $side-menu-width; background: $navbarBackground; - z-index: 1; + z-index: 10; + box-shadow: 0 0 20px black; a:focus { text-decoration: none; @@ -17,6 +18,9 @@ background: $side-menu-bg; position: initial; height: auto; + box-shadow: 0 0 20px black; + position: relative; + z-index: 1; } .sidemenu__top, .sidemenu__bottom { diff --git a/public/sass/components/_tabbed_view.scss b/public/sass/components/_tabbed_view.scss index 6cc04f259d6..b9ebd1e9cdb 100644 --- a/public/sass/components/_tabbed_view.scss +++ b/public/sass/components/_tabbed_view.scss @@ -1,9 +1,7 @@ .tabbed-view { - background-color: $page-bg; - background-image: $page-gradient; - margin: (-$panel-margin*2) (-$panel-margin); - margin-bottom: $spacer*2; + background-color: $panel-bg; padding: $spacer*3; + margin-bottom: $dashboard-padding; &.tabbed-view--panel-edit { padding: 0; diff --git a/public/sass/components/_view_states.scss b/public/sass/components/_view_states.scss index 0b9fa38e636..2181936f9ce 100644 --- a/public/sass/components/_view_states.scss +++ b/public/sass/components/_view_states.scss @@ -48,6 +48,10 @@ } } + .navbar { + box-shadow: none; + } + .navbar-page-btn { border-color: transparent; background: transparent; diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss index 4c0f1bcb2b1..3c412ca60fc 100644 --- a/public/sass/layout/_page.scss +++ b/public/sass/layout/_page.scss @@ -11,9 +11,7 @@ .main-view { position: relative; flex-grow: 1; - - $gradient-opacity: 0.03; - background: linear-gradient(135deg, rgba(26, 42, 108, $gradient-opacity), rgba(178, 31, 31, $gradient-opacity), rgba(253, 187, 45, $gradient-opacity)); //Matt experiement + background: $page-gradient; } .page-container { diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss index 2cfc3ed4244..14ef492bd9d 100644 --- a/public/sass/pages/_dashboard.scss +++ b/public/sass/pages/_dashboard.scss @@ -1,14 +1,14 @@ .dashboard-container { padding: $dashboard-padding; + background: $dashboard-gradient; width: 100%; + min-height: 100%; } .template-variable { color: $variable; } - - div.flot-text { color: $text-color !important; } From bb7b55277c5c9d9f19abaf5e1389044d29c5e89d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 18 Aug 2017 08:17:35 +0200 Subject: [PATCH 2/3] users view update --- pkg/api/org_users.go | 9 +++++---- pkg/models/org_user.go | 1 + public/app/features/org/partials/orgUsers.html | 5 ++++- public/sass/components/_filter-table.scss | 6 +++++- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkg/api/org_users.go b/pkg/api/org_users.go index 02c376eed30..57a15bd8db5 100644 --- a/pkg/api/org_users.go +++ b/pkg/api/org_users.go @@ -1,6 +1,7 @@ package api import ( + "github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/middleware" m "github.com/grafana/grafana/pkg/models" @@ -31,10 +32,6 @@ func addOrgUserHelper(cmd m.AddOrgUserCommand) Response { userToAdd := userQuery.Result - // if userToAdd.Id == c.UserId { - // return ApiError(400, "Cannot add yourself as user", nil) - // } - cmd.UserId = userToAdd.Id if err := bus.Dispatch(&cmd); err != nil { @@ -64,6 +61,10 @@ func getOrgUsersHelper(orgId int64) Response { return ApiError(500, "Failed to get account user", err) } + for _, user := range query.Result { + user.AvatarUrl = dtos.GetGravatarUrl(user.Email) + } + return Json(200, query.Result) } diff --git a/pkg/models/org_user.go b/pkg/models/org_user.go index ef5fd76a813..7002c2206fa 100644 --- a/pkg/models/org_user.go +++ b/pkg/models/org_user.go @@ -115,6 +115,7 @@ type OrgUserDTO struct { OrgId int64 `json:"orgId"` UserId int64 `json:"userId"` Email string `json:"email"` + AvatarUrl string `json:"avatarUrl"` Login string `json:"login"` Role string `json:"role"` LastSeenAt time.Time `json:"lastSeenAt"` diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html index 22afa60acf4..a78df0e8fe9 100644 --- a/public/app/features/org/partials/orgUsers.html +++ b/public/app/features/org/partials/orgUsers.html @@ -8,7 +8,6 @@
-