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
f74f7b01
Commit
f74f7b01
authored
Nov 10, 2018
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor progress on edit mode
parent
c54ae5d1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
20 deletions
+15
-20
public/app/features/dashboard/dashgrid/DashboardGrid.tsx
+7
-1
public/app/features/dashboard/submenu/submenu.html
+0
-2
public/sass/components/_navbar.scss
+1
-10
public/sass/components/_viz_editor.scss
+7
-7
No files found.
public/app/features/dashboard/dashgrid/DashboardGrid.tsx
View file @
f74f7b01
...
@@ -8,6 +8,7 @@ import classNames from 'classnames';
...
@@ -8,6 +8,7 @@ import classNames from 'classnames';
import
sizeMe
from
'react-sizeme'
;
import
sizeMe
from
'react-sizeme'
;
let
lastGridWidth
=
1200
;
let
lastGridWidth
=
1200
;
let
ignoreNextWidthChange
=
false
;
function
GridWrapper
({
function
GridWrapper
({
size
,
size
,
...
@@ -24,8 +25,12 @@ function GridWrapper({
...
@@ -24,8 +25,12 @@ function GridWrapper({
isFullscreen
,
isFullscreen
,
})
{
})
{
const
width
=
size
.
width
>
0
?
size
.
width
:
lastGridWidth
;
const
width
=
size
.
width
>
0
?
size
.
width
:
lastGridWidth
;
// logic to ignore width changes (optimization)
if
(
width
!==
lastGridWidth
)
{
if
(
width
!==
lastGridWidth
)
{
if
(
!
isFullscreen
&&
Math
.
abs
(
width
-
lastGridWidth
)
>
8
)
{
if
(
ignoreNextWidthChange
)
{
ignoreNextWidthChange
=
false
;
}
else
if
(
!
isFullscreen
&&
Math
.
abs
(
width
-
lastGridWidth
)
>
8
)
{
onWidthChange
();
onWidthChange
();
lastGridWidth
=
width
;
lastGridWidth
=
width
;
}
}
...
@@ -138,6 +143,7 @@ export class DashboardGrid extends React.Component<DashboardGridProps, any> {
...
@@ -138,6 +143,7 @@ export class DashboardGrid extends React.Component<DashboardGridProps, any> {
}
}
onViewModeChanged
(
payload
)
{
onViewModeChanged
(
payload
)
{
ignoreNextWidthChange
=
true
;
this
.
setState
({
animated
:
!
payload
.
fullscreen
});
this
.
setState
({
animated
:
!
payload
.
fullscreen
});
}
}
...
...
public/app/features/dashboard/submenu/submenu.html
View file @
f74f7b01
...
@@ -23,7 +23,5 @@
...
@@ -23,7 +23,5 @@
<dash-links-container
links=
"ctrl.dashboard.links"
class=
"gf-form-inline"
></dash-links-container>
<dash-links-container
links=
"ctrl.dashboard.links"
class=
"gf-form-inline"
></dash-links-container>
</div>
</div>
<gf-time-picker
class=
"gf-timepicker-nav"
dashboard=
"ctrl.dashboard"
ng-if=
"ctrl.dashboard.meta.fullscreen"
></gf-time-picker>
<div
class=
"clearfix"
></div>
<div
class=
"clearfix"
></div>
</div>
</div>
public/sass/components/_navbar.scss
View file @
f74f7b01
...
@@ -40,21 +40,12 @@
...
@@ -40,21 +40,12 @@
}
}
.panel-in-fullscreen
{
.panel-in-fullscreen
{
.navbar
{
// @include navbar-alt-look();
display
:
none
;
}
.navbar-button--add-panel
,
.navbar-button--add-panel
,
.navbar-button--star
,
.navbar-button--star
,
.navbar-button--tv
,
.navbar-button--tv
,
.navbar-page-btn
.fa-caret-down
{
.navbar-page-btn
.fa-caret-down
{
display
:
none
;
display
:
none
;
}
}
.navbar-buttons--close
{
display
:
flex
;
}
}
}
.navbar-page-btn
{
.navbar-page-btn
{
...
@@ -103,7 +94,7 @@
...
@@ -103,7 +94,7 @@
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
justify-content
:
flex-end
;
justify-content
:
flex-end
;
//
margin-right: $spacer;
margin-right
:
$spacer
;
&
--close
{
&
--close
{
display
:
none
;
display
:
none
;
...
...
public/sass/components/_viz_editor.scss
View file @
f74f7b01
...
@@ -28,24 +28,24 @@
...
@@ -28,24 +28,24 @@
}
}
.panel-in-fullscreen
{
.panel-in-fullscreen
{
.scroll-canvas--dashboard
{
//
.scroll-canvas--dashboard {
height
:
100%
;
//
height: 100%;
}
//
}
.sidemenu
{
.sidemenu
{
display
:
none
;
display
:
none
;
}
}
.main-view
{
//
.main-view {
background
:
unset
;
//
background: unset;
}
//
}
.dashboard-container
{
.dashboard-container
{
padding
:
0
;
padding
:
0
;
}
}
.submenu-controls
{
.submenu-controls
{
padding
:
$dashboard-padding
$dashboard-padding
$panel-margin
$dashboard-padding
;
padding
:
0
$dashboard-padding
$panel-margin
$dashboard-padding
;
}
}
.panel-editor-container__panel
{
.panel-editor-container__panel
{
...
...
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