From 6c5748203d246b34776d1248edefb277d7e75549 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Tue, 28 Nov 2017 14:16:29 +0100 Subject: [PATCH] Restore Page Footer after migration to new scrollbar #9652 --- .../admin/partials/configuration_home.html | 63 ++--- .../dashboard/partials/dashboardList.html | 266 ++++++++---------- .../features/plugins/partials/ds_edit.html | 144 +++++----- .../features/plugins/partials/ds_list.html | 90 +++--- .../plugins/partials/plugin_list.html | 116 ++++---- public/sass/_variables.dark.scss | 2 +- public/views/index.template.html | 76 ++--- 7 files changed, 362 insertions(+), 395 deletions(-) diff --git a/public/app/features/admin/partials/configuration_home.html b/public/app/features/admin/partials/configuration_home.html index 19f6cae770f..dd39c80269d 100644 --- a/public/app/features/admin/partials/configuration_home.html +++ b/public/app/features/admin/partials/configuration_home.html @@ -1,33 +1,32 @@ -
- -
-
- -
- -
-
    -
  1. - -
    -
    -
    -
    -
    -
    - -
    -
    -
    - {{navItem.text}} -
    -
    - {{navItem.description}} -
    -
    -
    -     -
    2. -
-
+ +
+
+
+ +
+
    +
  1. + +
    +
    +
    +
    +
    +
    + +
    +
    +
    + {{navItem.text}} +
    +
    + {{navItem.description}} +
    +
    +
    +     +
    2. +
+
+
\ No newline at end of file diff --git a/public/app/features/dashboard/partials/dashboardList.html b/public/app/features/dashboard/partials/dashboardList.html index 449544aedc4..405332128cd 100644 --- a/public/app/features/dashboard/partials/dashboardList.html +++ b/public/app/features/dashboard/partials/dashboardList.html @@ -1,163 +1,135 @@ -
- -
-
-

Dashboards

+ +
+
+

Dashboards

- - - Dashboard - - - - Folder - -
-
-
- - - -
-
- -
- Filters: - - - - {{tagName}} - + + + Dashboard + + + + Folder + +
+
+
+ +
+
-
-
- -
+
+ Filters: + + + + {{tagName}} + + +
+ +
+
+ +
+
+ +
+
+ +
+
-
-
- - +
+
+ +
+
+
+
-
-
+
+ + + + + {{::section.title}} + + + +
+ +
- - - No Dashboards or Folders found. - +
+ + No Dashboards or Folders found. + diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html index 4d6a091ca95..d083fe1b332 100644 --- a/public/app/features/plugins/partials/ds_edit.html +++ b/public/app/features/plugins/partials/ds_edit.html @@ -1,91 +1,89 @@ -
- -
-
- + +
+
+ -
Disclaimer. This datasource was added by config and cannot be modified using the UI. Please contact your server admin to update this datasource.
+
Disclaimer. This datasource was added by config and cannot be modified using the UI. Please contact your server admin to update this datasource.
-
- -
+
+
+
-
+
-
-
-
-
- Name - - - The name is used when you select the data source in panels. - The Default data source is preselected in new - panels. - -
- + +
+
+
+ Name + + + The name is used when you select the data source in panels. + The Default data source is preselected in new + panels. +
+ +
-
- Type -
- -
+
+ Type +
+
+
-
- This plugin is marked as being in alpha state, which means it is in early development phase and - updates will include breaking changes. -
+
+ This plugin is marked as being in alpha state, which means it is in early development phase and + updates will include breaking changes. +
- - - - + + + + -
-
Testing....
-
-
- - -
-
-
{{ctrl.testing.message}}
-
+
+
Testing....
+
+
+ + +
+
+
{{ctrl.testing.message}}
+
-
- - - Cancel -
+
+ + + Cancel +
-
-
-
+
+
+
- -
-
- -
-
+ +
+
+ +
diff --git a/public/app/features/plugins/partials/ds_list.html b/public/app/features/plugins/partials/ds_list.html index 8eae6d34cd7..1e9fe24fcee 100644 --- a/public/app/features/plugins/partials/ds_list.html +++ b/public/app/features/plugins/partials/ds_list.html @@ -1,48 +1,46 @@ -
- -
-
- + +
+
+ - - Add data source - -
- -
- - -
    -
  1. - -
    -
    - {{ds.type}} -
    -
    -
    -
    - -
    -
    -
    - {{ds.name}} - - default - -
    -
    - {{ds.url}} -
    -
    -
    -     -
    2. -
-
- -
- No data sources defined -
+ + Add data source +
-
+ +
+ + +
    +
  1. + +
    +
    + {{ds.type}} +
    +
    +
    +
    + +
    +
    +
    + {{ds.name}} + + default + +
    +
    + {{ds.url}} +
    +
    +
    +     +
    2. +
+
+ +
+ No data sources defined +
+
\ No newline at end of file diff --git a/public/app/features/plugins/partials/plugin_list.html b/public/app/features/plugins/partials/plugin_list.html index 6d75fe9cc30..fd7631c68bb 100644 --- a/public/app/features/plugins/partials/plugin_list.html +++ b/public/app/features/plugins/partials/plugin_list.html @@ -1,65 +1,63 @@ -
- + -
-
-

- - Plugins (currently installed) -

+
+
+

+ + Plugins (currently installed) +

-
- - - - Find more plugins on Grafana.com - -
-
- -
- - -
    -
  1. - -
    -
    - - {{plugin.type}} -
    -
    - Update available! -
    -
    -
    -
    - -
    -
    -
    {{plugin.name}}
    -
    By {{plugin.info.author.name}}
    -
    -
    +
    +
-
+
  • + + Data sources + +
    • +
  • + + Apps + +
    • + + + + Find more plugins on Grafana.com + +
    + +
    + + +
      +
    1. + +
      +
      + + {{plugin.type}} +
      +
      + Update available! +
      +
      +
      +
      + +
      +
      +
      {{plugin.name}}
      +
      By {{plugin.info.author.name}}
      +
      +
      +       +
      2. +
    +
    diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss index 6172fc77515..5eef1264aca 100644 --- a/public/sass/_variables.dark.scss +++ b/public/sass/_variables.dark.scss @@ -299,7 +299,7 @@ $checkboxImageUrl: '../img/checkbox.png'; $info-box-background: linear-gradient(100deg, #1a4552, #00374a); // footer -$footer-link-color: $gray-1; +$footer-link-color: $gray-2; $footer-link-hover: $gray-4; // collapse box diff --git a/public/views/index.template.html b/public/views/index.template.html index da72f16161d..e022cc4873b 100644 --- a/public/views/index.template.html +++ b/public/views/index.template.html @@ -35,44 +35,46 @@
    -
    -
    +
    +
    +
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +