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
6f71af44
Commit
6f71af44
authored
Oct 18, 2017
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ux: new fixes
parent
148a4c6c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
44 additions
and
24 deletions
+44
-24
pkg/api/index.go
+1
-0
public/app/features/dashboard/partials/shareModal.html
+1
-1
public/sass/components/_dashboard_grid.scss
+1
-1
public/sass/layout/_page.scss
+41
-22
No files found.
pkg/api/index.go
View file @
6f71af44
...
@@ -84,6 +84,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
...
@@ -84,6 +84,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
themeUrlParam
:=
c
.
Query
(
"theme"
)
themeUrlParam
:=
c
.
Query
(
"theme"
)
if
themeUrlParam
==
"light"
{
if
themeUrlParam
==
"light"
{
data
.
User
.
LightTheme
=
true
data
.
User
.
LightTheme
=
true
data
.
Theme
=
"light"
}
}
if
c
.
OrgRole
==
m
.
ROLE_ADMIN
||
c
.
OrgRole
==
m
.
ROLE_EDITOR
{
if
c
.
OrgRole
==
m
.
ROLE_ADMIN
||
c
.
OrgRole
==
m
.
ROLE_EDITOR
{
...
...
public/app/features/dashboard/partials/shareModal.html
View file @
6f71af44
...
@@ -62,7 +62,7 @@
...
@@ -62,7 +62,7 @@
<
/gf-form-switch
>
<
/gf-form-switch
>
<
div
class
=
"gf-form"
>
<
div
class
=
"gf-form"
>
<
span
class
=
"gf-form-label width-12"
>
Theme
<
/span
>
<
span
class
=
"gf-form-label width-12"
>
Theme
<
/span
>
<
div
class
=
"gf-form-select-wrapper width-
6
"
>
<
div
class
=
"gf-form-select-wrapper width-
10
"
>
<
select
class
=
"gf-form-input"
ng
-
model
=
"options.theme"
ng
-
options
=
"f as f for f in ['current', 'dark', 'light']"
ng
-
change
=
"buildUrl()"
><
/select
>
<
select
class
=
"gf-form-input"
ng
-
model
=
"options.theme"
ng
-
options
=
"f as f for f in ['current', 'dark', 'light']"
ng
-
change
=
"buildUrl()"
><
/select
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
...
...
public/sass/components/_dashboard_grid.scss
View file @
6f71af44
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
}
}
.react-grid-item
{
.react-grid-item
{
// overflow: auto
;
overflow
:
hidden
;
}
}
.theme-dark
{
.theme-dark
{
...
...
public/sass/layout/_page.scss
View file @
6f71af44
...
@@ -125,31 +125,61 @@
...
@@ -125,31 +125,61 @@
display
:
flex
;
display
:
flex
;
padding
:
0
$spacer
;
padding
:
0
$spacer
;
line-height
:
0
.5
;
line-height
:
0
.5
;
margin-left
:
2em
;
}
}
$page-breadcrumb__angle-1
:
39px
;
$page-breadcrumb__angle-ul
:
31px
;
$page-breadcrumb__angle-a
:
30px
;
.page-breadcrumb__item
{
.page-breadcrumb__item
{
background
:
$page-nav-bg
;
background
:
$page-nav-bg
;
margin-right
:
.2rem
;
box-shadow
:
$page-nav-shadow
;
transform
:
skewX
(
-35deg
);
>
a
{
>
a
{
color
:
$page-nav-breadcrumb-color
;
color
:
$page-nav-breadcrumb-color
;
font-size
:
$font-size-sm
;
font-size
:
$font-size-sm
;
display
:
block
;
display
:
block
;
padding
:
0
.6rem
1rem
0
.6rem
1
rem
;;
padding
:
0
.6rem
1rem
0
.6rem
3
rem
;;
position
:
relative
;
position
:
relative
;
transform
:
skewX
(
35deg
);
}
&
:last-child
{
&
:
:
after
{
background
:
$breadcrumb-hover-hl
;;
content
:
''
;
position
:
absolute
;
top
:
-53px
;
left
:
100%
;
content
:
''
;
height
:
0
;
width
:
0
;
border
:
$page-breadcrumb__angle-1
solid
transparent
;
border-right-width
:
0
;
border-left-width
:
$page-breadcrumb__angle-a
;
z-index
:
2
;
border-left-color
:
$page-nav-bg
;
}
}
}
&
:first-child
{
a
{
padding-left
:
1rem
;
}
}
&
:
:
after
{
content
:
''
;
position
:
absolute
;
top
:
-53px
;
left
:
100%
;
content
:
''
;
height
:
0
;
width
:
0
;
border
:
$page-breadcrumb__angle-1
solid
transparent
;
border-right-width
:
0
;
border-left-width
:
$page-breadcrumb__angle-ul
;
z-index
:
1
;
transform
:
translateX
(
4px
);
border-left-color
:
#282020
;
margin
:
0
;
}
&
:hover
{
&
:hover
{
background
:
$breadcrumb-hover-hl
;
background
:
$breadcrumb-hover-hl
;
...
@@ -169,14 +199,3 @@
...
@@ -169,14 +199,3 @@
}
}
}
}
.page-breadcrumb__caret
{
opacity
:
0
;
position
:
absolute
;
display
:
block
;
width
:
16px
;
height
:
16px
;
right
:
-9px
;
top
:
5px
;
z-index
:
3
;
}
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