diff --git a/pkg/api/index.go b/pkg/api/index.go index d8c378b9059..854fe880e6d 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -265,8 +265,8 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { Icon: "fa fa-fw fa-shield", Url: setting.AppSubUrl + "/admin", Children: []*dtos.NavLink{ - {Text: "Global Users", Id: "global-users", Url: setting.AppSubUrl + "/admin/users"}, - {Text: "Global Orgs", Id: "global-orgs", Url: setting.AppSubUrl + "/admin/orgs"}, + {Text: "Users", Id: "global-users", Url: setting.AppSubUrl + "/admin/users"}, + {Text: "Orgs", Id: "global-orgs", Url: setting.AppSubUrl + "/admin/orgs"}, {Text: "Server Settings", Id: "server-settings", Url: setting.AppSubUrl + "/admin/settings"}, {Text: "Server Stats", Id: "server-stats", Url: setting.AppSubUrl + "/admin/stats"}, {Text: "Style Guide", Id: "styleguide", Url: setting.AppSubUrl + "/admin/styleguide"}, diff --git a/public/app/features/alerting/partials/notifications_list.html b/public/app/features/alerting/partials/notifications_list.html index 0ac2cfb105f..2d753d83dd9 100644 --- a/public/app/features/alerting/partials/notifications_list.html +++ b/public/app/features/alerting/partials/notifications_list.html @@ -4,7 +4,7 @@
- + New Channel diff --git a/public/app/features/org/org_users_ctrl.ts b/public/app/features/org/org_users_ctrl.ts index 3948748e3f4..f9ab6b81645 100644 --- a/public/app/features/org/org_users_ctrl.ts +++ b/public/app/features/org/org_users_ctrl.ts @@ -44,11 +44,9 @@ export class OrgUsersCtrl { getAddUserBtnName(): string { if (this.externalUserMngLinkName) { return this.externalUserMngLinkName; - } else if (config.disableLoginForm) { - return "Add Users"; - } else { - return "Add"; } + + return "Add Members"; } get() { diff --git a/public/app/features/org/partials/orgDetails.html b/public/app/features/org/partials/orgDetails.html index 39f74cfb294..69422925dee 100644 --- a/public/app/features/org/partials/orgDetails.html +++ b/public/app/features/org/partials/orgDetails.html @@ -12,55 +12,15 @@ Organization name
-
- -
+ +
+ +
-

Address

- -
-
-
- Address1 - -
-
- Address2 - -
-
- -
-
- City - -
-
- Postal code - -
-
- -
-
- State - -
-
- Country - -
-
- -
- -
-
- diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html index eeaff564327..7ff9c2c82db 100644 --- a/public/app/features/org/partials/orgUsers.html +++ b/public/app/features/org/partials/orgUsers.html @@ -4,7 +4,7 @@
- @@ -22,9 +22,9 @@ Users ({{ctrl.users.length}}) -
  • +
  • - Pending Invitations ({{ctrl.pendingInvites.length}}) + Pending Invites ({{ctrl.pendingInvites.length}})
    • diff --git a/public/app/features/org/partials/profile.html b/public/app/features/org/partials/profile.html index 810e457c0fb..8113288e15a 100644 --- a/public/app/features/org/partials/profile.html +++ b/public/app/features/org/partials/profile.html @@ -23,7 +23,7 @@
    - +
    diff --git a/public/app/features/org/prefs_control.ts b/public/app/features/org/prefs_control.ts index 3ea3ec95b5f..776ce6ad6ca 100644 --- a/public/app/features/org/prefs_control.ts +++ b/public/app/features/org/prefs_control.ts @@ -74,7 +74,7 @@ var template = `
    - +
    `; diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html index ba74f1c0512..50730f3eede 100644 --- a/public/app/features/plugins/partials/ds_edit.html +++ b/public/app/features/plugins/partials/ds_edit.html @@ -66,8 +66,7 @@
    - - + diff --git a/public/app/features/plugins/partials/ds_list.html b/public/app/features/plugins/partials/ds_list.html index b8e9969d3e3..bbc42ce5aa4 100644 --- a/public/app/features/plugins/partials/ds_list.html +++ b/public/app/features/plugins/partials/ds_list.html @@ -5,7 +5,7 @@
    - + Add data source diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss index 0e5629bf00a..19a99dadc49 100644 --- a/public/sass/_variables.dark.scss +++ b/public/sass/_variables.dark.scss @@ -133,8 +133,8 @@ $table-border: $dark-3; // table and cell border // Buttons // ------------------------- -$btn-primary-bg: $brand-primary; -$btn-primary-bg-hl: lighten($brand-primary, 8%); +$btn-primary-bg: #ff6600; +$btn-primary-bg-hl: #bc3e06; $btn-secondary-bg: $blue-dark; $btn-secondary-bg-hl: lighten($blue-dark, 5%); diff --git a/public/sass/_variables.scss b/public/sass/_variables.scss index 204fcc5a8b1..31fdbfc49f7 100644 --- a/public/sass/_variables.scss +++ b/public/sass/_variables.scss @@ -208,7 +208,7 @@ $zindex-modal: 1050; $btn-padding-x: 1rem !default; $btn-padding-y: .6rem !default; $btn-line-height: 1.25 !default; -$btn-font-weight: normal !default; +$btn-font-weight: 500 !default; $btn-padding-x-sm: .5rem !default; $btn-padding-y-sm: .25rem !default; @@ -216,7 +216,7 @@ $btn-padding-y-sm: .25rem !default; $btn-padding-x-lg: 1.5rem !default; $btn-padding-y-lg: .75rem !default; -$btn-border-radius: 2px; +$btn-border-radius: 3px; // sidemenu $side-menu-width: 60px; diff --git a/public/sass/components/_buttons.scss b/public/sass/components/_buttons.scss index 4be896d8ec0..cea04c28cd7 100644 --- a/public/sass/components/_buttons.scss +++ b/public/sass/components/_buttons.scss @@ -14,7 +14,7 @@ text-align: center; vertical-align: middle; cursor: pointer; - border: $input-btn-border-width solid transparent; + border: none; @include button-size($btn-padding-y, $btn-padding-x, $font-size-base, $btn-border-radius); diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss index 0f96c23a67f..5f92beba9bd 100644 --- a/public/sass/components/_gf-form.scss +++ b/public/sass/components/_gf-form.scss @@ -239,8 +239,6 @@ $gf-form-margin: 1px; line-height: $input-line-height; font-size: $font-size-sm; box-shadow: none; - border: $input-btn-border-width solid transparent; - @include border-radius($label-border-radius-sm); flex-shrink: 0; flex-grow: 0; diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss index 3c412ca60fc..7e7cceb3650 100644 --- a/public/sass/layout/_page.scss +++ b/public/sass/layout/_page.scss @@ -74,9 +74,17 @@ a, button { float: right; margin-left: $spacer; + + // better align icons + .fa { + position: relative; + top: 1px; + } } } + + .page-heading { font-size: 1.25rem; margin-top: 0; diff --git a/public/sass/mixins/_buttons.scss b/public/sass/mixins/_buttons.scss index f77adc859c3..92a41840af6 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: 0 -1px 0 rgba(0,0,0,.25)) { +@mixin buttonBackground($startColor, $endColor, $text-color: #fff, $textShadow: 0px 1px 0 rgba(0,0,0,.5)) { // gradientBar will set the background to a pleasing blend of these, to support IE<=9 @include gradientBar($startColor, $endColor, $text-color, $textShadow);