From d617d029d2c0077f6b489df4709e79bf8d79609c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 30 Jan 2016 12:55:30 -0500 Subject: [PATCH] fix(css): fixed issues introduced in recent sidemenu enhancements, fixes #3893, fixes #3894 --- .../features/admin/partials/edit_user.html | 6 +- .../features/dashboard/partials/settings.html | 2 +- public/app/partials/dashboard.html | 4 +- public/dashboards/home.json | 84 ++++++++++++++----- public/less/bootstrap-tagsinput.less | 1 + public/less/bootswatch.dark.less | 1 - public/less/gfbox.less | 2 +- public/less/grafana.less | 11 +++ public/less/navbar.less | 4 +- public/less/sidemenu.less | 1 + public/less/submenu.less | 2 +- 11 files changed, 83 insertions(+), 35 deletions(-) diff --git a/public/app/features/admin/partials/edit_user.html b/public/app/features/admin/partials/edit_user.html index 674f1cf4b0d..8bf705a6067 100644 --- a/public/app/features/admin/partials/edit_user.html +++ b/public/app/features/admin/partials/edit_user.html @@ -1,10 +1,8 @@ - + - +
diff --git a/public/app/features/dashboard/partials/settings.html b/public/app/features/dashboard/partials/settings.html index 730d2cadeb8..f582252cd3c 100644 --- a/public/app/features/dashboard/partials/settings.html +++ b/public/app/features/dashboard/partials/settings.html @@ -25,7 +25,7 @@ Title
  • - +
  • Tags diff --git a/public/app/partials/dashboard.html b/public/app/partials/dashboard.html index 9d20da3d7b4..dd57c2f8e9b 100644 --- a/public/app/partials/dashboard.html +++ b/public/app/partials/dashboard.html @@ -1,7 +1,8 @@
    - +
    +
    @@ -10,7 +11,6 @@
    -
    diff --git a/public/dashboards/home.json b/public/dashboards/home.json index a405bb484be..735586c0f40 100644 --- a/public/dashboards/home.json +++ b/public/dashboards/home.json @@ -1,62 +1,100 @@ { + "id": null, "title": "Home", + "originalTitle": "Home", "tags": [], "style": "dark", "timezone": "browser", "editable": true, "hideControls": true, + "sharedCrosshair": false, "rows": [ { - "title": "New row", - "height": "100px", "collapse": false, "editable": true, + "height": "100px", "panels": [ { - "id": 1, - "span": 12, + "content": "
    \nHome Dashboard\n
    ", "editable": true, - "transparent": true, - "type": "text", + "id": 1, "mode": "html", - "content": "
    \n \n
    ", + "span": 12, "style": {}, - "title": "" + "title": "", + "transparent": true, + "type": "text" } - ] + ], + "title": "New row" }, { + "collapse": false, + "editable": true, "height": "510px", "panels": [ { "id": 2, - "span": 6, - "type": "dashlist", + "limit": 10, "mode": "starred", - "title": "Starred dashboards" + "query": "", + "span": 6, + "tags": [], + "title": "Starred dashboards", + "type": "dashlist" }, { "id": 3, - "span": 6, - "type": "dashlist", + "limit": 10, "mode": "search", - "title": "Dashboards" + "query": "", + "span": 6, + "tags": [], + "title": "Dashboards", + "type": "dashlist" } - ] - } - ], - "nav": [ - { - "type": "timepicker", - "enable": false + ], + "title": "Row" } ], "time": { "from": "now-6h", "to": "now" }, + "timepicker": { + "enable": false, + "refresh_intervals": [ + "5s", + "10s", + "30s", + "1m", + "5m", + "15m", + "30m", + "1h", + "2h", + "1d" + ], + "time_options": [ + "5m", + "15m", + "1h", + "6h", + "12h", + "24h", + "2d", + "7d", + "30d" + ], + "type": "timepicker" + }, "templating": { "list": [] }, - "version": 5 + "annotations": { + "list": [] + }, + "schemaVersion": 9, + "version": 5, + "links": [] } diff --git a/public/less/bootstrap-tagsinput.less b/public/less/bootstrap-tagsinput.less index aeedb317997..44fa35ffbe8 100644 --- a/public/less/bootstrap-tagsinput.less +++ b/public/less/bootstrap-tagsinput.less @@ -13,6 +13,7 @@ border-radius: 0; padding: 8px 6px; height: 100%; + width: 5rem; box-sizing: border-box; } diff --git a/public/less/bootswatch.dark.less b/public/less/bootswatch.dark.less index ff15f4884ec..5f871b4f837 100644 --- a/public/less/bootswatch.dark.less +++ b/public/less/bootswatch.dark.less @@ -70,7 +70,6 @@ hr { .nav > li > a:hover, .nav > .active > a, .nav > .active > a:hover { - border-bottom: 1px solid @blue; } .nav > .active > a, diff --git a/public/less/gfbox.less b/public/less/gfbox.less index 5a250484a14..16651705a0e 100644 --- a/public/less/gfbox.less +++ b/public/less/gfbox.less @@ -1,5 +1,5 @@ .gf-box { - margin: 15px; + margin: 10px 5px; background-color: @grafanaPanelBackground; position: relative; border: 1px solid @grafanaTargetFuncBackground; diff --git a/public/less/grafana.less b/public/less/grafana.less index 689b5c947e7..041636d5448 100644 --- a/public/less/grafana.less +++ b/public/less/grafana.less @@ -389,3 +389,14 @@ .typeahead strong { color: @yellow; } + +.dashboard-header { + margin-top: 1rem; + font-family: "grafana-icons"; + font-size: 22px; + padding-bottom: 1rem; + border: none; + border-bottom: 2px solid transparent; + border-image: linear-gradient(to right, rgba(255,213,0,1) 0%, rgba(255,68,0,1) 99%, rgba(255,68,0,1) 100%); + border-image-slice: 1; +} diff --git a/public/less/navbar.less b/public/less/navbar.less index df0bca627ac..a1f8914bb50 100644 --- a/public/less/navbar.less +++ b/public/less/navbar.less @@ -44,7 +44,7 @@ &:hover { background: @navbarButtonBackgroundHighlight; color: @linkColor; - border-bottom: 1px solid @blue; + // border-bottom: 1px solid @blue; } } } @@ -69,7 +69,7 @@ .icon-gf-grafana_wordmark { font-size: 21px; position: relative; - top: 3px; + top: 4px; padding-left: 5px; display: none; } diff --git a/public/less/sidemenu.less b/public/less/sidemenu.less index b09101b5d80..d3151788174 100644 --- a/public/less/sidemenu.less +++ b/public/less/sidemenu.less @@ -39,6 +39,7 @@ } .top-nav-menu-btn { a { + background-color: @sideMenuBackground; padding-right: 47px; padding-left: 24px; } diff --git a/public/less/submenu.less b/public/less/submenu.less index 2cabde0dbc5..1b5eb887adc 100644 --- a/public/less/submenu.less +++ b/public/less/submenu.less @@ -1,5 +1,5 @@ .submenu-controls { - margin: 15px 10px 8px 14px; + margin: 10px 5px; font-size: 16px; }