Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
21a7f572
Commit
21a7f572
authored
Aug 20, 2017
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ux: changed cta button style
parent
3e3501b5
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
29 additions
and
66 deletions
+29
-66
pkg/api/index.go
+2
-2
public/app/features/alerting/partials/notifications_list.html
+1
-1
public/app/features/org/org_users_ctrl.ts
+2
-4
public/app/features/org/partials/orgDetails.html
+3
-43
public/app/features/org/partials/orgUsers.html
+3
-3
public/app/features/org/partials/profile.html
+1
-1
public/app/features/org/prefs_control.ts
+1
-1
public/app/features/plugins/partials/ds_edit.html
+1
-2
public/app/features/plugins/partials/ds_list.html
+1
-1
public/sass/_variables.dark.scss
+2
-2
public/sass/_variables.scss
+2
-2
public/sass/components/_buttons.scss
+1
-1
public/sass/components/_gf-form.scss
+0
-2
public/sass/layout/_page.scss
+8
-0
public/sass/mixins/_buttons.scss
+1
-1
No files found.
pkg/api/index.go
View file @
21a7f572
...
@@ -265,8 +265,8 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
...
@@ -265,8 +265,8 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
Icon
:
"fa fa-fw fa-shield"
,
Icon
:
"fa fa-fw fa-shield"
,
Url
:
setting
.
AppSubUrl
+
"/admin"
,
Url
:
setting
.
AppSubUrl
+
"/admin"
,
Children
:
[]
*
dtos
.
NavLink
{
Children
:
[]
*
dtos
.
NavLink
{
{
Text
:
"
Global
Users"
,
Id
:
"global-users"
,
Url
:
setting
.
AppSubUrl
+
"/admin/users"
},
{
Text
:
"Users"
,
Id
:
"global-users"
,
Url
:
setting
.
AppSubUrl
+
"/admin/users"
},
{
Text
:
"
Global
Orgs"
,
Id
:
"global-orgs"
,
Url
:
setting
.
AppSubUrl
+
"/admin/orgs"
},
{
Text
:
"Orgs"
,
Id
:
"global-orgs"
,
Url
:
setting
.
AppSubUrl
+
"/admin/orgs"
},
{
Text
:
"Server Settings"
,
Id
:
"server-settings"
,
Url
:
setting
.
AppSubUrl
+
"/admin/settings"
},
{
Text
:
"Server Settings"
,
Id
:
"server-settings"
,
Url
:
setting
.
AppSubUrl
+
"/admin/settings"
},
{
Text
:
"Server Stats"
,
Id
:
"server-stats"
,
Url
:
setting
.
AppSubUrl
+
"/admin/stats"
},
{
Text
:
"Server Stats"
,
Id
:
"server-stats"
,
Url
:
setting
.
AppSubUrl
+
"/admin/stats"
},
{
Text
:
"Style Guide"
,
Id
:
"styleguide"
,
Url
:
setting
.
AppSubUrl
+
"/admin/styleguide"
},
{
Text
:
"Style Guide"
,
Id
:
"styleguide"
,
Url
:
setting
.
AppSubUrl
+
"/admin/styleguide"
},
...
...
public/app/features/alerting/partials/notifications_list.html
View file @
21a7f572
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<div
class=
"page-header"
>
<div
class=
"page-header"
>
<page-h1
model=
"ctrl.navModel"
></page-h1>
<page-h1
model=
"ctrl.navModel"
></page-h1>
<a
href=
"alerting/notification/new"
class=
"btn btn-
success
pull-right"
>
<a
href=
"alerting/notification/new"
class=
"btn btn-
primary
pull-right"
>
<i
class=
"fa fa-plus"
></i>
<i
class=
"fa fa-plus"
></i>
New Channel
New Channel
</a>
</a>
...
...
public/app/features/org/org_users_ctrl.ts
View file @
21a7f572
...
@@ -44,11 +44,9 @@ export class OrgUsersCtrl {
...
@@ -44,11 +44,9 @@ export class OrgUsersCtrl {
getAddUserBtnName
():
string
{
getAddUserBtnName
():
string
{
if
(
this
.
externalUserMngLinkName
)
{
if
(
this
.
externalUserMngLinkName
)
{
return
this
.
externalUserMngLinkName
;
return
this
.
externalUserMngLinkName
;
}
else
if
(
config
.
disableLoginForm
)
{
return
"Add Users"
;
}
else
{
return
"Add"
;
}
}
return
"Add Members"
;
}
}
get
()
{
get
()
{
...
...
public/app/features/org/partials/orgDetails.html
View file @
21a7f572
...
@@ -12,55 +12,15 @@
...
@@ -12,55 +12,15 @@
<span
class=
"gf-form-label"
>
Organization name
</span>
<span
class=
"gf-form-label"
>
Organization name
</span>
<input
class=
"gf-form-input"
type=
"text"
required
ng-model=
"org.name"
>
<input
class=
"gf-form-input"
type=
"text"
required
ng-model=
"org.name"
>
</div>
</div>
<div
class=
"gf-form"
>
<button
type=
"submit"
class=
"btn gf-form-btn btn-success"
ng-click=
"update()"
>
Update
</button>
</div>
</div>
</form>
<prefs-control
mode=
"org"
></prefs-control>
<h3
class=
"page-heading"
>
Address
</h3>
<form
name=
"addressForm"
class=
"gf-form-group"
>
<div
class=
"gf-form-inline"
>
<div
class=
"gf-form max-width-28"
>
<span
class=
"gf-form-label width-7"
>
Address1
</span>
<input
class=
"gf-form-input"
type=
"text"
ng-model=
"address.address1"
>
</div>
<div
class=
"gf-form max-width-28"
>
<span
class=
"gf-form-label width-7"
>
Address2
</span>
<input
class=
"gf-form-input"
type=
"text"
ng-model=
"address.address2"
>
</div>
</div>
<div
class=
"gf-form-inline"
>
<div
class=
"gf-form max-width-28"
>
<span
class=
"gf-form-label width-7"
>
City
</span>
<input
class=
"gf-form-input"
type=
"text"
ng-model=
"address.city"
>
</div>
<div
class=
"gf-form max-width-28"
>
<span
class=
"gf-form-label width-7"
>
Postal code
</span>
<input
class=
"gf-form-input"
type=
"text"
ng-model=
"address.zipCode"
>
</div>
</div>
<div
class=
"gf-form-inline"
>
<div
class=
"gf-form max-width-28"
>
<span
class=
"gf-form-label width-7"
>
State
</span>
<input
class=
"gf-form-input"
type=
"text"
ng-model=
"address.state"
>
</div>
<div
class=
"gf-form max-width-28"
>
<span
class=
"gf-form-label width-7"
>
Country
</span>
<input
class=
"gf-form-input"
type=
"text"
ng-model=
"address.country"
>
</div>
</div>
</div>
<div
class=
"gf-form-button-row"
>
<div
class=
"gf-form-button-row"
>
<button
type=
"submit"
class=
"btn btn-success"
ng-click=
"updateAddress()"
>
Updat
e
</button>
<button
type=
"submit"
class=
"btn btn-success"
ng-click=
"update()"
>
Sav
e
</button>
</div>
</div>
</form>
</form>
<prefs-control
mode=
"org"
></prefs-control>
</div>
</div>
public/app/features/org/partials/orgUsers.html
View file @
21a7f572
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<div
class=
"page-header"
>
<div
class=
"page-header"
>
<page-h1
model=
"ctrl.navModel"
></page-h1>
<page-h1
model=
"ctrl.navModel"
></page-h1>
<button
class=
"btn btn-
success
"
ng-click=
"ctrl.openAddUsersView()"
ng-hide=
"ctrl.externalUserMngLinkUrl"
>
<button
class=
"btn btn-
primary
"
ng-click=
"ctrl.openAddUsersView()"
ng-hide=
"ctrl.externalUserMngLinkUrl"
>
<i
class=
"fa fa-plus"
></i>
<i
class=
"fa fa-plus"
></i>
<span>
{{ctrl.addUsersBtnName}}
</span>
<span>
{{ctrl.addUsersBtnName}}
</span>
</button>
</button>
...
@@ -22,9 +22,9 @@
...
@@ -22,9 +22,9 @@
Users ({{ctrl.users.length}})
Users ({{ctrl.users.length}})
</a>
</a>
</li>
</li>
<li
class=
"gf-tabs-item"
ng-show=
"ctrl.pendingInvites.length"
>
<li
class=
"gf-tabs-item"
>
<a
class=
"gf-tabs-link"
ng-click=
"ctrl.editor.index = 1"
ng-class=
"{active: ctrl.editor.index === 1}"
>
<a
class=
"gf-tabs-link"
ng-click=
"ctrl.editor.index = 1"
ng-class=
"{active: ctrl.editor.index === 1}"
>
Pending Invit
ation
s ({{ctrl.pendingInvites.length}})
Pending Invit
e
s ({{ctrl.pendingInvites.length}})
</a>
</a>
</li>
</li>
</ul>
</ul>
...
...
public/app/features/org/partials/profile.html
View file @
21a7f572
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
<i
ng-if=
"ctrl.readonlyLoginFields"
class=
"fa fa-lock gf-form-icon--right-absolute"
bs-tooltip=
"'Login Details Locked - managed in another system.'"
></i>
<i
ng-if=
"ctrl.readonlyLoginFields"
class=
"fa fa-lock gf-form-icon--right-absolute"
bs-tooltip=
"'Login Details Locked - managed in another system.'"
></i>
</div>
</div>
<div
class=
"gf-form-button-row"
>
<div
class=
"gf-form-button-row"
>
<button
type=
"submit"
class=
"btn btn-success"
ng-click=
"ctrl.update()"
>
Updat
e
</button>
<button
type=
"submit"
class=
"btn btn-success"
ng-click=
"ctrl.update()"
>
Sav
e
</button>
</div>
</div>
</form>
</form>
...
...
public/app/features/org/prefs_control.ts
View file @
21a7f572
...
@@ -74,7 +74,7 @@ var template = `
...
@@ -74,7 +74,7 @@ var template = `
</div>
</div>
<div class="gf-form-button-row">
<div class="gf-form-button-row">
<button type="submit" class="btn btn-success" ng-click="ctrl.updatePrefs()">
Updat
e</button>
<button type="submit" class="btn btn-success" ng-click="ctrl.updatePrefs()">
Sav
e</button>
</div>
</div>
</form>
</form>
`
;
`
;
...
...
public/app/features/plugins/partials/ds_edit.html
View file @
21a7f572
...
@@ -66,8 +66,7 @@
...
@@ -66,8 +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()"
>
Add
</button>
<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-show=
"!ctrl.isNew"
ng-click=
"ctrl.saveChanges()"
>
Save
&
Test
</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>
...
...
public/app/features/plugins/partials/ds_list.html
View file @
21a7f572
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<div
class=
"page-header"
>
<div
class=
"page-header"
>
<page-h1
model=
"ctrl.navModel"
></page-h1>
<page-h1
model=
"ctrl.navModel"
></page-h1>
<a
class=
"page-header__cta btn btn-
success
"
href=
"datasources/new"
>
<a
class=
"page-header__cta btn btn-
primary
"
href=
"datasources/new"
>
<i
class=
"fa fa-plus"
></i>
<i
class=
"fa fa-plus"
></i>
Add data source
Add data source
</a>
</a>
...
...
public/sass/_variables.dark.scss
View file @
21a7f572
...
@@ -133,8 +133,8 @@ $table-border: $dark-3; // table and cell border
...
@@ -133,8 +133,8 @@ $table-border: $dark-3; // table and cell border
// Buttons
// Buttons
// -------------------------
// -------------------------
$btn-primary-bg
:
$brand-primary
;
$btn-primary-bg
:
#ff6600
;
$btn-primary-bg-hl
:
lighten
(
$brand-primary
,
8%
)
;
$btn-primary-bg-hl
:
#bc3e06
;
$btn-secondary-bg
:
$blue-dark
;
$btn-secondary-bg
:
$blue-dark
;
$btn-secondary-bg-hl
:
lighten
(
$blue-dark
,
5%
);
$btn-secondary-bg-hl
:
lighten
(
$blue-dark
,
5%
);
...
...
public/sass/_variables.scss
View file @
21a7f572
...
@@ -208,7 +208,7 @@ $zindex-modal: 1050;
...
@@ -208,7 +208,7 @@ $zindex-modal: 1050;
$btn-padding-x
:
1rem
!
default
;
$btn-padding-x
:
1rem
!
default
;
$btn-padding-y
:
.6rem
!
default
;
$btn-padding-y
:
.6rem
!
default
;
$btn-line-height
:
1
.25
!
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-x-sm
:
.5rem
!
default
;
$btn-padding-y-sm
:
.25rem
!
default
;
$btn-padding-y-sm
:
.25rem
!
default
;
...
@@ -216,7 +216,7 @@ $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-x-lg
:
1
.5rem
!
default
;
$btn-padding-y-lg
:
.75rem
!
default
;
$btn-padding-y-lg
:
.75rem
!
default
;
$btn-border-radius
:
2
px
;
$btn-border-radius
:
3
px
;
// sidemenu
// sidemenu
$side-menu-width
:
60px
;
$side-menu-width
:
60px
;
...
...
public/sass/components/_buttons.scss
View file @
21a7f572
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
text-align
:
center
;
text-align
:
center
;
vertical-align
:
middle
;
vertical-align
:
middle
;
cursor
:
pointer
;
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
);
@include
button-size
(
$btn-padding-y
,
$btn-padding-x
,
$font-size-base
,
$btn-border-radius
);
...
...
public/sass/components/_gf-form.scss
View file @
21a7f572
...
@@ -239,8 +239,6 @@ $gf-form-margin: 1px;
...
@@ -239,8 +239,6 @@ $gf-form-margin: 1px;
line-height
:
$input-line-height
;
line-height
:
$input-line-height
;
font-size
:
$font-size-sm
;
font-size
:
$font-size-sm
;
box-shadow
:
none
;
box-shadow
:
none
;
border
:
$input-btn-border-width
solid
transparent
;
@include
border-radius
(
$label-border-radius-sm
);
flex-shrink
:
0
;
flex-shrink
:
0
;
flex-grow
:
0
;
flex-grow
:
0
;
...
...
public/sass/layout/_page.scss
View file @
21a7f572
...
@@ -74,9 +74,17 @@
...
@@ -74,9 +74,17 @@
a
,
button
{
a
,
button
{
float
:
right
;
float
:
right
;
margin-left
:
$spacer
;
margin-left
:
$spacer
;
// better align icons
.fa
{
position
:
relative
;
top
:
1px
;
}
}
}
}
}
.page-heading
{
.page-heading
{
font-size
:
1
.25rem
;
font-size
:
1
.25rem
;
margin-top
:
0
;
margin-top
:
0
;
...
...
public/sass/mixins/_buttons.scss
View file @
21a7f572
// Button backgrounds
// Button backgrounds
// ------------------
// ------------------
@mixin
buttonBackground
(
$startColor
,
$endColor
,
$text-color
:
#fff
,
$textShadow
:
0
-1px
0
rgba
(
0
,
0
,
0
,.
2
5
))
{
@mixin
buttonBackground
(
$startColor
,
$endColor
,
$text-color
:
#fff
,
$textShadow
:
0
px
1px
0
rgba
(
0
,
0
,
0
,.
5
))
{
// 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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment