From ab307ec7f32c6d2f84ba048f5868ef2b2c946acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 13 Mar 2015 10:20:39 +0100 Subject: [PATCH] Fixed css issue with title headers --- docs/mkdocs.yml | 2 +- docs/sources/datasources/graphite.md | 2 +- docs/sources/installation/migrating_to2.md | 2 +- docs/sources/reference/dashlist.md | 9 +++++++++ docs/sources/reference/singlestat.md | 9 +++++++++ src/app/partials/dashboard_topnav.html | 2 +- src/css/less/navbar.less | 15 +++++++++++---- 7 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 docs/sources/reference/dashlist.md create mode 100644 docs/sources/reference/singlestat.md diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index bc90150c8ef..1e963b1b540 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -48,7 +48,7 @@ pages: - ['reference/playlist.md', 'Reference', 'Playlist'] - ['reference/export_import.md', 'Reference', 'Import & Export'] - ['reference/admin.md', 'Reference', 'Grafana Admin'] -- ['reference/admin.md', 'Reference', 'HTTP API'] +- ['reference/http_api.md', 'Reference', 'HTTP API'] - ['datasources/graphite.md', 'Data Sources', 'Graphite'] - ['datasources/influxdb.md', 'Data Sources', 'InfluxDB'] diff --git a/docs/sources/datasources/graphite.md b/docs/sources/datasources/graphite.md index e7dd17300af..2c091c16331 100644 --- a/docs/sources/datasources/graphite.md +++ b/docs/sources/datasources/graphite.md @@ -12,7 +12,7 @@ To switch to a regular text box click the pen icon to the right. ## Installing Graphite -## Add a Graphite data source to grafana +## Adding the data source to Grafana ## Metric editor diff --git a/docs/sources/installation/migrating_to2.md b/docs/sources/installation/migrating_to2.md index d70584b720c..f2ac8f8bc64 100644 --- a/docs/sources/installation/migrating_to2.md +++ b/docs/sources/installation/migrating_to2.md @@ -12,7 +12,7 @@ database to store dashboards and users in. ## Adding Data sources Data sources in Grafana v2.0 are no longer configured via the `config.js` file. That config file is no more. -You add data sources via UI or via the [HTTP API](../reference/http_api). Go the `Data Sources` view via the side menu. +You add data sources via UI or via the [HTTP API](../reference/http_api.md). Go the `Data Sources` view via the side menu. The side menu can be toggled via the Grafana icon in the top header (to the right). ## Importing dashboards diff --git a/docs/sources/reference/dashlist.md b/docs/sources/reference/dashlist.md new file mode 100644 index 00000000000..6f591169f2c --- /dev/null +++ b/docs/sources/reference/dashlist.md @@ -0,0 +1,9 @@ +---- +page_title: Dashlist Panel +page_description: Dashlist Panel Reference +page_keywords: grafana, dashlist, panel, documentation +--- + +# Dashlist Panel + + diff --git a/docs/sources/reference/singlestat.md b/docs/sources/reference/singlestat.md new file mode 100644 index 00000000000..54085c907bb --- /dev/null +++ b/docs/sources/reference/singlestat.md @@ -0,0 +1,9 @@ +---- +page_title: Singlestat Panel +page_description: Singlestat Panel Reference +page_keywords: grafana, singlestat, panel, documentation +--- + +# Singlestat Panel + + diff --git a/src/app/partials/dashboard_topnav.html b/src/app/partials/dashboard_topnav.html index 7c4327004db..bf3ba635a97 100644 --- a/src/app/partials/dashboard_topnav.html +++ b/src/app/partials/dashboard_topnav.html @@ -11,7 +11,7 @@
- {{dashboard.title}} + {{dashboard.title}}
diff --git a/src/css/less/navbar.less b/src/css/less/navbar.less index ff58f3c73fc..ebbc9c054de 100644 --- a/src/css/less/navbar.less +++ b/src/css/less/navbar.less @@ -13,7 +13,7 @@ } .fa.top-nav-breadcrumb-icon { - margin: 17px 0 6px 5px; + margin: 18px 0 6px 5px; float: left; font-size: 120%; color: @textColor; @@ -90,6 +90,12 @@ position: relative; top: 4px; } + + .dashboard-title { + padding: 0px 6px 5px 5px; + color: @linkColorHover; + font-size: 17px; + } } .top-nav-icon { @@ -109,9 +115,10 @@ } .top-nav-title { - padding: 0px 6px 5px 5px; - color: #FFFFFF; + display: block; + float: left; font-size: 17px; + padding: 18px 10px 10px 13px; + color: @linkColor; } -