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
59ade616
Commit
59ade616
authored
Jan 30, 2015
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard-edit-view -> gf-box and new box design
parent
1ddc2e68
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
73 additions
and
52 deletions
+73
-52
src/app/directives/dashEditLink.js
+1
-1
src/app/panels/timepicker/editor.html
+2
-0
src/app/partials/dasheditor.html
+7
-9
src/css/less/bootswatch.dark.less
+1
-1
src/css/less/gfbox.less
+59
-0
src/css/less/grafana.less
+1
-39
src/css/less/sidemenu.less
+2
-2
No files found.
src/app/directives/dashEditLink.js
View file @
59ade616
...
...
@@ -92,7 +92,7 @@ function (angular, $) {
hideScrollbars
(
true
);
var
src
=
"'"
+
payload
.
src
+
"'"
;
var
view
=
$
(
'<div class="
dashboard-edit-view
" ng-include="'
+
src
+
'"></div>'
);
var
view
=
$
(
'<div class="
gf-box
" ng-include="'
+
src
+
'"></div>'
);
elem
.
append
(
view
);
$compile
(
elem
.
contents
())(
editorScope
);
}
...
...
src/app/panels/timepicker/editor.html
View file @
59ade616
<div
class=
"editor-row"
>
<div
class=
"section"
>
<div>
<div
class=
"tight-form"
>
<ul
class=
"tight-form-list"
>
<li
class=
"tight-form-item"
style=
"width: 148px"
>
...
...
@@ -34,6 +35,7 @@
</ul>
<div
class=
"clearfix"
></div>
</div>
</div>
<p>
<br>
...
...
src/app/partials/dasheditor.html
View file @
59ade616
<div
class=
"dashboard-editor-header"
>
<div
class=
"dashboard-editor-title"
>
<i
class=
"fa fa-cogs"
></i>
Dashboard settings
</div>
<div
class=
"gf-box-header"
>
<div
ng-model=
"editor.index"
bs-tabs
style=
"text-transform:capitalize;"
>
<div
ng-repeat=
"tab in ['General', 'Rows', 'Features', 'Import']"
data-title=
"{{tab}}"
>
...
...
@@ -11,9 +7,13 @@
</div>
</div>
<button
class=
"gf-box-header-close-btn"
ng-click=
"dismiss();"
>
<i
class=
"fa fa-remove"
></i>
</button>
</div>
<div
class=
"
dashboard-editor
-body"
>
<div
class=
"
gf-box
-body"
>
<div
ng-if=
"editor.index == 0"
>
<div
class=
"editor-row"
>
...
...
@@ -93,7 +93,7 @@
<div
class=
"clearfix"
></div>
</div>
<div
class=
"
dashboard-editor
-footer"
>
<div
class=
"
gf-box
-footer"
>
<div
class=
"grafana-version-info"
ng-show=
"editor.index === 0"
>
<span
class=
"editor-option small"
>
Grafana version: {{grafana.version}}
...
...
@@ -101,6 +101,4 @@
<span
grafana-version-check
>
</span>
</div>
<button
type=
"button"
class=
"btn btn-success pull-right"
ng-click=
"editor.index=0;dismiss();reset_panel();dashboard.emit_refresh()"
>
Close
</button>
</div>
src/css/less/bootswatch.dark.less
View file @
59ade616
...
...
@@ -212,7 +212,7 @@ div.subnav {
.nav-tabs {
border-bottom:
1px solid @fullEditBorder
;
border-bottom:
none
;
& > li > a {
.border-radius(0);
...
...
src/css/less/gfbox.less
0 → 100644
View file @
59ade616
.gf-box {
margin: 30px;
background-color: @grafanaPanelBackground;
position: relative;
border: 1px solid @grafanaTargetFuncBackground;
border-top: none;
}
.gf-box-header-close-btn {
float: right;
padding: 0;
margin: 0;
background-color: transparent;
border: none;
padding: 8px;
font-size: 120%;
color: @textColor;
&:hover {
color: @white;
}
}
.gf-box-body {
padding: 20px;
min-height: 150px;
}
.gf-box-footer {
overflow: hidden;
}
.gf-box-header {
overflow: hidden;
background-color: @grafanaTargetBackground;
border-top: 1px solid @grafanaTargetFuncBackground;
border-bottom: 1px solid @grafanaTargetFuncBackground;
.tabs {
float: left;
}
.nav {
margin: 0;
}
}
.gf-box-title {
border-bottom: 1px solid @fullEditBorder;
padding-right: 20px;
float: left;
color: @linkColor;
font-size: 18px;
font-weight: normal;
line-height: 38px;
margin: 0;
.fa {
padding: 0 8px 0 5px;
color: @textColor;
}
}
src/css/less/grafana.less
View file @
59ade616
...
...
@@ -10,6 +10,7 @@
@import "singlestat.less";
@import "tightform.less";
@import "sidemenu.less";
@import "gfbox.less";
.row-control-inner {
padding:0px;
...
...
@@ -294,45 +295,6 @@
max-width: 400px;
}
.dashboard-edit-view {
padding: 20px;
background-color: @grafanaPanelBackground;
position: relative;
}
.dashboard-editor-body {
padding: 20px 10px;
min-height: 100px;
}
.dashboard-editor-footer {
overflow: hidden;
}
.dashboard-editor-header {
overflow: hidden;
.tabs {
float: left;
}
.nav {
margin: 0;
}
}
.dashboard-editor-title {
border-bottom: 1px solid @fullEditBorder;
padding-right: 20px;
float: left;
color: @linkColor;
font-size: 20px;
font-weight: normal;
line-height: 38px;
margin: 0;
.fa {
padding: 0 8px 0 5px;
color: @textColor;
}
}
.grafana-version-info {
position: absolute;
...
...
src/css/less/sidemenu.less
View file @
59ade616
...
...
@@ -96,11 +96,11 @@
.sidemenu-logo-container {
background: @grafanaPanelBackground;
text-align: center;
border-bottom:
2
px solid black;
border-bottom:
1
px solid black;
img {
display: inline-block;
width: 102px;
padding: 6px 0px
7
px 11px;
padding: 6px 0px
6
px 11px;
}
}
...
...
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