Skip to content

N
nexpie-grafana-theme
Commit 97cc454d by Torkel Ödegaard
Options

ux: minor changes

parent 84b10df8
Showing with 74 additions and 15 deletions
pkg/api/index.go
...@@ -219,12 +219,6 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { ...@@ -219,12 +219,6 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
}, },
}, },
{ {
Text: "Dashboard List",
Description: "Manage Dashboards And Folders",
Id: "dashboards",
Url: setting.AppSubUrl + "/dashboards",
},
{
Text: "Preferences", Text: "Preferences",
Id: "org", Id: "org",
Description: "Organization preferences", Description: "Organization preferences",
......
public/app/core/components/sidemenu/sidemenu.html
<a class="sidemenu__logo" ng-click="ctrl.toggleSideMenu()"> <a class="sidemenu__logo" ng-click="ctrl.toggleSideMenu()">
<span class="navbar-brand-btn-background">
<img src="public/img/grafana_icon.svg"></img> <img src="public/img/grafana_icon.svg"></img>
</span>
</a> </a>
<div class="sidemenu__top"> <div class="sidemenu__top">
......
public/app/features/dashboard/dashnav/dashnav.html
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<ul class="nav dashnav-action-icons"> <ul class="nav dashnav-action-icons">
<li ng-show="::ctrl.dashboard.meta.canStar"> <li ng-show="::ctrl.dashboard.meta.canStar">
<a class="pointer" ng-click="ctrl.starDashboard()"> <a class="pointer" ng-click="ctrl.starDashboard()">
<i class="fa" ng-class="{'fa-star-o': !ctrl.dashboard.meta.isStarred, 'fa-star': ctrl.dashboard.meta.isStarred}"></i> <i class="fa" ng-class="{'fa-star-o': !ctrl.dashboard.meta.isStarred, 'fa-star': ctrl.dashboard.meta.isStarred}" style="color: orange;"></i>
</a> </a>
</li> </li>
<li ng-show="::ctrl.dashboard.meta.canShare" class="dropdown"> <li ng-show="::ctrl.dashboard.meta.canShare" class="dropdown">
......
public/img/icons_dark_theme/icon_add_panel.svg 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="117.8px" height="64px" viewBox="0 0 117.8 64" style="enable-background:new 0 0 117.8 64;" xml:space="preserve">
<style type="text/css">
.st0{fill:#E3E2E2;}
.st1{fill:url(#SVGID_1_);}
</style>
<g>
<path class="st0" d="M15.2,22.7H1.9c-1.1,0-1.9,0.9-1.9,1.9v37.5C0,63.2,0.9,64,1.9,64h13.3c1.1,0,1.9-0.9,1.9-1.9V24.6
C17.1,23.5,16.3,22.7,15.2,22.7z"/>
<path class="st0" d="M36.3,10.2H23c-1.1,0-1.9,0.9-1.9,1.9v50c0,1.1,0.9,1.9,1.9,1.9h13.3c1.1,0,1.9-0.9,1.9-1.9v-50
C38.2,11.1,37.3,10.2,36.3,10.2z"/>
<path class="st0" d="M57.3,32H44c-1.1,0-1.9,0.9-1.9,1.9v28.1c0,1.1,0.9,1.9,1.9,1.9h13.3c1.1,0,1.9-0.9,1.9-1.9V34
C59.2,32.9,58.4,32,57.3,32z"/>
<path class="st0" d="M70.1,38V26.1c0-3.4,2.7-6.1,6.1-6.1h4.1V2c0-1.1-0.9-1.9-1.9-1.9H65.1C64,0,63.1,0.9,63.1,2v60.1
c0,1.1,0.9,1.9,1.9,1.9h13.3c1.1,0,1.9-0.9,1.9-1.9V44.1h-4.1C72.9,44.1,70.1,41.3,70.1,38z"/>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="96.4427" y1="83.7013" x2="96.4427" y2="-9.4831">
<stop offset="0" style="stop-color:#FFF23A"/>
<stop offset="4.010540e-02" style="stop-color:#FEE62D"/>
<stop offset="0.1171" style="stop-color:#FED41A"/>
<stop offset="0.1964" style="stop-color:#FDC90F"/>
<stop offset="0.2809" style="stop-color:#FDC60B"/>
<stop offset="0.6685" style="stop-color:#F28F3F"/>
<stop offset="0.8876" style="stop-color:#ED693C"/>
<stop offset="1" style="stop-color:#E83E39"/>
</linearGradient>
<path class="st1" d="M116.7,24.9h-7.2h-0.5h-5.4V11.8c0-0.6-0.5-1.1-1.1-1.1H90.5c-0.6,0-1.1,0.5-1.1,1.1v13.1h-9.1h-4.1
c-0.6,0-1.1,0.5-1.1,1.1V38c0,0.6,0.5,1.1,1.1,1.1h4.1h9.1v4.6v1.9v6.7c0,0.6,0.5,1.1,1.1,1.1h11.9c0.6,0,1.1-0.5,1.1-1.1V39.1
h13.1c0.6,0,1.1-0.5,1.1-1.1V26.1C117.8,25.5,117.3,24.9,116.7,24.9z"/>
</g>
</svg>
public/img/icons_light_theme/icon_add_panel.svg 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="117.8px" height="64px" viewBox="0 0 117.8 64" style="enable-background:new 0 0 117.8 64;" xml:space="preserve">
<style type="text/css">
.st0{fill:#555555;}
.st1{fill:url(#SVGID_1_);}
</style>
<g>
<path class="st0" d="M15.2,22.7H1.9c-1.1,0-1.9,0.9-1.9,1.9v37.5C0,63.2,0.9,64,1.9,64h13.3c1.1,0,1.9-0.9,1.9-1.9V24.6
C17.1,23.5,16.3,22.7,15.2,22.7z"/>
<path class="st0" d="M36.3,10.2H23c-1.1,0-1.9,0.9-1.9,1.9v50c0,1.1,0.9,1.9,1.9,1.9h13.3c1.1,0,1.9-0.9,1.9-1.9v-50
C38.2,11.1,37.3,10.2,36.3,10.2z"/>
<path class="st0" d="M57.3,32H44c-1.1,0-1.9,0.9-1.9,1.9v28.1c0,1.1,0.9,1.9,1.9,1.9h13.3c1.1,0,1.9-0.9,1.9-1.9V34
C59.2,32.9,58.4,32,57.3,32z"/>
<path class="st0" d="M70.1,38V26.1c0-3.4,2.7-6.1,6.1-6.1h4.1V2c0-1.1-0.9-1.9-1.9-1.9H65.1C64,0,63.1,0.9,63.1,2v60.1
c0,1.1,0.9,1.9,1.9,1.9h13.3c1.1,0,1.9-0.9,1.9-1.9V44.1h-4.1C72.9,44.1,70.1,41.3,70.1,38z"/>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="96.4427" y1="83.7013" x2="96.4427" y2="-9.4831">
<stop offset="0" style="stop-color:#FFF23A"/>
<stop offset="4.010540e-02" style="stop-color:#FEE62D"/>
<stop offset="0.1171" style="stop-color:#FED41A"/>
<stop offset="0.1964" style="stop-color:#FDC90F"/>
<stop offset="0.2809" style="stop-color:#FDC60B"/>
<stop offset="0.6685" style="stop-color:#F28F3F"/>
<stop offset="0.8876" style="stop-color:#ED693C"/>
<stop offset="1" style="stop-color:#E83E39"/>
</linearGradient>
<path class="st1" d="M116.7,24.9h-7.2h-0.5h-5.4V11.8c0-0.6-0.5-1.1-1.1-1.1H90.5c-0.6,0-1.1,0.5-1.1,1.1v13.1h-9.1h-4.1
c-0.6,0-1.1,0.5-1.1,1.1V38c0,0.6,0.5,1.1,1.1,1.1h4.1h9.1v4.6v1.9v6.7c0,0.6,0.5,1.1,1.1,1.1h11.9c0.6,0,1.1-0.5,1.1-1.1V39.1
h13.1c0.6,0,1.1-0.5,1.1-1.1V26.1C117.8,25.5,117.3,24.9,116.7,24.9z"/>
</g>
</svg>
public/sass/base/_icons.scss
...@@ -39,4 +39,9 @@ ...@@ -39,4 +39,9 @@
background-image: url('../img/icons_#{$theme-name}_theme/icon_import_dashboard.svg'); background-image: url('../img/icons_#{$theme-name}_theme/icon_import_dashboard.svg');
} }
.gicon-add-panel {
background-image: url('../img/icons_#{$theme-name}_theme/icon_add_panel.svg');
}
public/sass/components/_cards.scss
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
img { img {
width: 6rem; width: 6rem;
} }
.fa, .icon-gf { .fa, .icon-gf, .gicon {
font-size: 3.5rem; font-size: 3.5rem;
} }
} }
......
public/sass/components/_sidemenu.scss
...@@ -157,13 +157,10 @@ li.sidemenu-org-switcher { ...@@ -157,13 +157,10 @@ li.sidemenu-org-switcher {
display: block; display: block;
padding: 0.4rem 1.0rem 0.4rem 0.65rem; padding: 0.4rem 1.0rem 0.4rem 0.65rem;
min-height: $navbarHeight; min-height: $navbarHeight;
position: relative;
&:hover { &:hover {
background: $navbarButtonBackgroundHighlight; background: $navbarButtonBackgroundHighlight;
.sidemenu__logo-expand {
display: block;
}
} }
img { img {
......
scripts/webpack/webpack.dev.js
...@@ -21,7 +21,7 @@ module.exports = merge(common, { ...@@ -21,7 +21,7 @@ module.exports = merge(common, {
module: { module: {
rules: [ rules: [
require('./sass.rule.js')({ require('./sass.rule.js')({
sourceMap: true, minimize: false sourceMap: false, minimize: false
}) })
] ]
}, },
...@@ -29,6 +29,7 @@ module.exports = merge(common, { ...@@ -29,6 +29,7 @@ module.exports = merge(common, {
plugins: [ plugins: [
new ExtractTextPlugin({ // define where to save the file new ExtractTextPlugin({ // define where to save the file
filename: 'grafana.[name].css', filename: 'grafana.[name].css',
allChunks: true,
}), }),
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
filename: path.resolve(__dirname, '../../public/views/index.html'), filename: path.resolve(__dirname, '../../public/views/index.html'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment