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
4a062b6d
Commit
4a062b6d
authored
Feb 19, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ux(): colors refactoring
parent
6590e6fa
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
72 additions
and
80 deletions
+72
-80
public/app/features/datasources/partials/edit.html
+1
-1
public/sass/_variables.dark.scss
+16
-18
public/sass/_variables.light.scss
+31
-37
public/sass/_variables.scss
+4
-4
public/sass/components/_buttons.scss
+15
-15
public/sass/components/_dashboard.scss
+1
-1
public/sass/components/_navbar.scss
+2
-2
public/sass/components/_timepicker.scss
+1
-1
public/sass/pages/_login.scss
+1
-1
No files found.
public/app/features/datasources/partials/edit.html
View file @
4a062b6d
...
...
@@ -44,7 +44,7 @@
<button
type=
"submit"
class=
"btn btn-primary"
ng-show=
"!isNew"
ng-click=
"saveChanges(true)"
>
Test Connection
</button>
<a
class=
"btn
-text
"
href=
"datasources"
>
Cancel
</a>
<a
class=
"btn
btn-link
"
href=
"datasources"
>
Cancel
</a>
</div>
</form>
</div>
public/sass/_variables.dark.scss
View file @
4a062b6d
...
...
@@ -117,26 +117,25 @@ $table-border: $dark-3; // table and cell border
$btn-primary-bg
:
$brand-primary
;
$btn-primary-bg-hl
:
lighten
(
$brand-primary
,
8%
);
$btn
InfoBackground
:
lighten
(
$purple
,
3%
);
$btn
InfoBackgroundHighlight
:
darken
(
$purple
,
3%
);
$btn
-info-bg
:
lighten
(
$purple
,
3%
);
$btn
-info-bg-hl
:
darken
(
$purple
,
3%
);
$btn
SuccessBackgroundHighlight
:
darken
(
$green
,
3%
);
$btn
SuccessBackground
:
lighten
(
$green
,
3%
);
$btn
-success-bg-hl
:
darken
(
$green
,
3%
);
$btn
-success-bg
:
lighten
(
$green
,
3%
);
$btn
WarningBackground
:
$brand-warning
;
$btn
WarningBackgroundHighlight
:
lighten
(
$brand-warning
,
8%
);
$btn
-warning-bg
:
$brand-warning
;
$btn
-warning-bg-hl
:
lighten
(
$brand-warning
,
8%
);
$btn
DangerBackground
:
lighten
(
$red
,
3%
);
$btn
DangerBackgroundHighlight
:
darken
(
$red
,
3%
);
$btn
-danger-bg
:
lighten
(
$red
,
3%
);
$btn
-danger-bg-hl
:
darken
(
$red
,
3%
);
$btnInverseBackground
:
$dark-3
;
$btnInverseBackgroundHighlight
:
lighten
(
$dark-3
,
1%
);
$btnInverseText
:
$link-color
;
$btnInverseBorder
:
#333
;
$btn-inverse-bg
:
$dark-3
;
$btn-inverse-bg-hl
:
lighten
(
$dark-3
,
1%
);
$btn-inverse-text-color
:
$link-color
;
$btn
Text
:
$gray-3
;
$btn
-link-color
:
$gray-3
;
$iconContainerBackground
:
$black
;
$iconContainerBackground
:
$black
;
// Forms
// -------------------------
...
...
@@ -151,7 +150,6 @@ $input-box-shadow-focus: rgba(102,175,233,.6) !default;
$input-color-placeholder
:
#999
!
default
;
$input-label-bg
:
$dark-3
;
// Search
$searchShadow
:
0
0
35px
0
$body-bg
;
...
...
@@ -222,13 +220,13 @@ $state-warning-text: darken(#c09853, 10%);
$state-warning-bg
:
$brand-warning
;
$errorText
:
#b94a48
;
$errorBackground
:
$btn
DangerBackground
;
$errorBackground
:
$btn
-danger-bg
;
$successText
:
#468847
;
$successBackground
:
$btn
SuccessBackground
;
$successBackground
:
$btn
-success-bg
;
$infoText
:
$blue-dark
;
$infoBackground
:
$btn
InfoBackground
;
$infoBackground
:
$btn
-info-bg
;
// Tooltips and popovers
// -------------------------
...
...
public/sass/_variables.light.scss
View file @
4a062b6d
...
...
@@ -62,22 +62,22 @@ $text-color: $gray-1;
// Links
// -------------------------
$link-color
:
$gray-1
;
$link-color-disabled
:
lighten
(
$link-color
,
30%
);
$link-color-disabled
:
lighten
(
$link-color
,
30%
);
$link-hover-color
:
darken
(
$link-color
,
20%
);
// Typography
// -------------------------
$headings-color
:
$text-color
;
$headings-color
:
$text-color
;
$abbr-border-color
:
$gray-2
!
default
;
$text-muted
:
darken
(
$link-color
,
30%
);
$text-muted
:
darken
(
$link-color
,
30%
);
$blockquote-small-color
:
$gray-2
!
default
;
$blockquote-border-color
:
$gray-3
!
default
;
$hr-border-color
:
rgba
(
0
,
0
,
0
,.
1
)
!
default
;
$hr-border-color
:
$dark-3
!
default
;
// Components
$component-active-color
:
#fff
!
default
;
$component-active-color
:
$white
!
default
;
$component-active-bg
:
$brand-primary
!
default
;
// Panel
...
...
@@ -96,58 +96,52 @@ $tight-form-func-bg: $gray-5;
$tight-form-func-highlight-bg
:
$gray-6
;
$modal-background
:
$body-bg
;
$code-tag-bg
:
#ddd
;
$code-tag-bg
:
$dark-5
;
// Lists
$grafanaListBackground
:
darken
(
$gray-3
,
5%
);
$grafanaListAccent
:
darken
(
$gray-3
,
8%
);
$grafanaListBorderTop
:
#eee
;
$grafanaListBorderBottom
:
#eee
;
$grafanaListHighlight
:
darken
(
$gray-3
,
10%
);
$grafanaListHighlightContrast
:
#ddd
;
$grafanaListBackground
:
$gray-6
;
$grafanaListAccent
:
$gray-5
;
$grafanaListBorderTop
:
$gray-3
;
$grafanaListBorderBottom
:
$gray-3
;
$grafanaListHighlight
:
$gray-5
;
$grafanaListMainLinkColor
:
$text-color
;
// Tables
// -------------------------
$table-bg
:
transparent
;
// overall background-color
$table-bg-accent
:
#f9f9f9
;
// for striping
$table-bg-hover
:
#E8F8FD
;
// for hover
$table-bg-accent
:
$gray-5
;
// for striping
$table-bg-hover
:
$gray-5
;
// for hover
$table-bg-active
:
$table-bg-hover
!
default
;
$table-border
:
#ddd
;
// table and cell border
$table-border
:
$gray-3
;
// table and cell border
// Scrollbars
$scrollbarBackground
:
$gray-3
;
$scrollbarBackground2
:
$gray-3
;
$scrollbarBorder
:
$gray-2
;
$scrollbarBackground
:
$gray-5
;
$scrollbarBackground2
:
$gray-5
;
$scrollbarBorder
:
$gray-4
;
// Buttons
// -------------------------
$btnBackground
:
$gray-3
;
$btnBackgroundHighlight
:
darken
(
$gray-3
,
15%
);
$btnBorder
:
#bbb
;
$btn-primary-bg
:
$brand-primary
;
$btn-primary-bg-hl
:
lighten
(
$brand-primary
,
10%
);
$btn-primary-bg
:
$brand-primary
;
$btn-primary-bg-hl
:
lighten
(
$brand-primary
,
8%
);
$btn
InfoBackground
:
lighten
(
$purple
,
3%
);
$btn
InfoBackgroundHighlight
:
darken
(
$purple
,
3%
);
$btn
-info-bg
:
lighten
(
$purple
,
3%
);
$btn
-info-bg-hl
:
darken
(
$purple
,
3%
);
$btn
SuccessBackground
:
lighten
(
$green
,
3%
);
$btn
SuccessBackgroundHighlight
:
darken
(
$green
,
3%
);
$btn
-success-bg
:
lighten
(
$green
,
3%
);
$btn
-success-bg-hl
:
darken
(
$green
,
3%
);
$btn
WarningBackground
:
lighten
(
$orange
,
3%
);
$btn
WarningBackgroundHighlight
:
darken
(
$orange
,
3%
);
$btn
-warning-bg
:
lighten
(
$orange
,
3%
);
$btn
-warning-bg-hl
:
darken
(
$orange
,
3%
);
$btn
DangerBackground
:
lighten
(
$red
,
3%
);
$btn
DangerBackgroundHighlight
:
darken
(
$red
,
3%
);
$btn
-danger-bg
:
lighten
(
$red
,
3%
);
$btn
-danger-bg-hl
:
darken
(
$red
,
3%
);
$btn
InverseBackground
:
$gray-5
;
$btn
InverseBackgroundHighlight
:
darken
(
$gray-5
,
5%
);
$btn
InverseText
:
$dark-4
;
$btn
-inverse-bg
:
$gray-5
;
$btn
-inverse-bg-hl
:
darken
(
$gray-5
,
5%
);
$btn
-inverse-text-color
:
$dark-4
;
$btn
Text
:
$gray-3
;
$btn
-link-color
:
$gray-1
;
$iconContainerBackground
:
$white
;
...
...
public/sass/_variables.scss
View file @
4a062b6d
...
...
@@ -91,10 +91,10 @@ $form-sizes: (
// Typography
// -------------------------
$font-family-sans-serif
:
"Helvetica Neue"
,
Helvetica
,
Arial
,
sans-serif
;
$font-family-serif
:
Georgia
,
"Times New Roman"
,
Times
,
serif
;
$font-family-monospace
:
Menlo
,
Monaco
,
Consolas
,
"Courier New"
,
monospace
;
$font-family-base
:
$font-family-sans-serif
!
default
;
$font-family-sans-serif
:
"Helvetica Neue"
,
Helvetica
,
Arial
,
sans-serif
;
$font-family-serif
:
Georgia
,
"Times New Roman"
,
Times
,
serif
;
$font-family-monospace
:
Menlo
,
Monaco
,
Consolas
,
"Courier New"
,
monospace
;
$font-family-base
:
$font-family-sans-serif
!
default
;
$font-size-root
:
14px
!
default
;
...
...
public/sass/components/_buttons.scss
View file @
4a062b6d
...
...
@@ -64,6 +64,10 @@
@include
button-size
(
$btn-padding-y-sm
,
$btn-padding-x-sm
,
$font-size-xs
,
$btn-border-radius
);
}
.btn-link
{
color
:
$btn-link-color
;
}
// Set the backgrounds
// -------------------------
.btn-primary
{
...
...
@@ -71,23 +75,23 @@
}
// Warning appears are orange
.btn-warning
{
@include
buttonBackground
(
$btn
WarningBackground
,
$btnWarningBackgroundHighlight
);
@include
buttonBackground
(
$btn
-warning-bg
,
$btn-warning-bg-hl
);
}
// Danger and error appear as red
.btn-danger
{
@include
buttonBackground
(
$btn
DangerBackground
,
$btnDangerBackgroundHighlight
);
@include
buttonBackground
(
$btn
-danger-bg
,
$btn-danger-bg-hl
);
}
// Success appears as green
.btn-success
{
@include
buttonBackground
(
$btn
SuccessBackground
,
$btnSuccessBackgroundHighlight
);
@include
buttonBackground
(
$btn
-success-bg
,
$btn-success-bg-hl
);
}
// Info appears as a neutral blue
.btn-info
{
@include
buttonBackground
(
$btn
InfoBackground
,
$btnInfoBackgroundHighlight
);
@include
buttonBackground
(
$btn
-info-bg
,
$btn-info-bg-hl
);
}
// Inverse appears as dark gray
.btn-inverse
{
@include
buttonBackground
(
$btn
InverseBackground
,
$btnInverseBackgroundHighlight
,
$btnInverseText
);
@include
buttonBackground
(
$btn
-inverse-bg
,
$btn-inverse-bg-hl
,
$btn-inverse-text-color
);
box-shadow
:
none
;
border
:
1px
solid
$tight-form-func-highlight-bg
;
}
...
...
@@ -96,23 +100,19 @@
@include
button-outline-variant
(
$btn-primary-bg
);
}
.btn-outline-secondary
{
@include
button-outline-variant
(
$btn
InverseBackground
);
@include
button-outline-variant
(
$btn
-inverse-bg
);
}
.btn-outline-info
{
@include
button-outline-variant
(
$btn
InfoBackground
);
@include
button-outline-variant
(
$btn
-info-bg
);
}
.btn-outline-success
{
@include
button-outline-variant
(
$btn
SuccessBackground
);
@include
button-outline-variant
(
$btn
-success-bg
);
}
.btn-outline-warning
{
@include
button-outline-variant
(
$btn
WarningBackground
);
@include
button-outline-variant
(
$btn
-warning-bg
);
}
.btn-outline-danger
{
@include
button-outline-variant
(
$btn
DangerBackground
);
@include
button-outline-variant
(
$btn
-danger-bg
);
}
.btn-text
{
color
:
$btnText
;
margin
:
0
;
vertical-align
:
middle
;
}
public/sass/components/_dashboard.scss
View file @
4a062b6d
...
...
@@ -22,7 +22,7 @@
text-align
:
center
;
display
:
inline-block
;
line-height
:
30px
;
background
:
$btn
SuccessBackground
;
background
:
$btn
-success-bg
;
color
:
rgba
(
255
,
255
,
255
,.
90
);
}
...
...
public/sass/components/_navbar.scss
View file @
4a062b6d
...
...
@@ -142,8 +142,8 @@
}
.dashboard-title
{
padding
:
0
px
6px
5px
5px
;
font-size
:
17px
;
padding
:
0
0
.4rem
0
0
.5rem
;
font-size
:
$font-size-lg
;
}
.top-nav-icon
{
...
...
public/sass/components/_timepicker.scss
View file @
4a062b6d
...
...
@@ -70,7 +70,7 @@
padding
:
1px
;
}
button
.btn-sm
{
@include
buttonBackground
(
$btn
InverseBackground
,
$btnInverseBackgroundHighlight
);
@include
buttonBackground
(
$btn
-inverse-bg
,
$btn-inverse-bg-hl
);
background-image
:
none
;
border
:
none
;
padding
:
6px
10px
;
...
...
public/sass/pages/_login.scss
View file @
4a062b6d
...
...
@@ -78,7 +78,7 @@
font-weight
:
bold
;
min-width
:
150px
;
display
:
inline-block
;
border
:
1px
solid
lighten
(
$btn
InverseBackground
,
10%
);
border
:
1px
solid
lighten
(
$btn
-inverse-bg
,
10%
);
}
}
...
...
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