diff --git a/pkg/api/index.go b/pkg/api/index.go index 84a18e694e0..812f07c2aef 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -102,11 +102,11 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { } dashboardChildNavs := []*dtos.NavLink{ - {Text: "Home", Url: setting.AppSubUrl + "/", Icon: "fa fa-fw fa-home", HideFromTabs: true}, + {Text: "Home", Url: setting.AppSubUrl + "/", Icon: "gicon gicon-home", HideFromTabs: true}, {Divider: true, HideFromTabs: true}, - {Text: "Manage", Id: "manage-dashboards", Url: setting.AppSubUrl + "/dashboards", Icon: "fa fa-fw fa-sitemap"}, - {Text: "Playlists", Id: "playlists", Url: setting.AppSubUrl + "/playlists", Icon: "fa fa-fw fa-film"}, - {Text: "Snapshots", Id: "snapshots", Url: setting.AppSubUrl + "/dashboard/snapshots", Icon: "icon-gf icon-gf-fw icon-gf-snapshot"}, + {Text: "Manage", Id: "manage-dashboards", Url: setting.AppSubUrl + "/dashboards", Icon: "gicon gicon-manage"}, + {Text: "Playlists", Id: "playlists", Url: setting.AppSubUrl + "/playlists", Icon: "gicon gicon-playlists"}, + {Text: "Snapshots", Id: "snapshots", Url: setting.AppSubUrl + "/dashboard/snapshots", Icon: "gicon gicon-snapshots"}, } data.NavTree = append(data.NavTree, &dtos.NavLink{ @@ -127,7 +127,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { Url: setting.AppSubUrl + "/profile", HideFromMenu: true, Children: []*dtos.NavLink{ - {Text: "Preferences", Id: "profile-settings", Url: setting.AppSubUrl + "/profile", Icon: "fa fa-fw fa-sliders"}, + {Text: "Preferences", Id: "profile-settings", Url: setting.AppSubUrl + "/profile", Icon: "gicon gicon-preferences"}, {Text: "Change Password", Id: "change-password", Url: setting.AppSubUrl + "/profile/password", Icon: "fa fa-fw fa-lock", HideFromMenu: true}, }, } @@ -144,7 +144,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { if setting.AlertingEnabled && (c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR) { alertChildNavs := []*dtos.NavLink{ - {Text: "Alert Rules", Id: "alert-list", Url: setting.AppSubUrl + "/alerting/list", Icon: "fa fa-fw fa-list-ul"}, + {Text: "Alert Rules", Id: "alert-list", Url: setting.AppSubUrl + "/alerting/list", Icon: "gicon gicon-alert-rules"}, {Text: "Notification channels", Id: "channels", Url: setting.AppSubUrl + "/alerting/notifications", Icon: "gicon gicon-alert-notification-channel"}, } @@ -196,7 +196,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { if len(appLink.Children) > 0 && c.OrgRole == m.ROLE_ADMIN { appLink.Children = append(appLink.Children, &dtos.NavLink{Divider: true}) - appLink.Children = append(appLink.Children, &dtos.NavLink{Text: "Plugin Config", Icon: "fa fa-fw fa-cog", Url: setting.AppSubUrl + "/plugins/" + plugin.Id + "/edit"}) + appLink.Children = append(appLink.Children, &dtos.NavLink{Text: "Plugin Config", Icon: "gicon gicon-cog", Url: setting.AppSubUrl + "/plugins/" + plugin.Id + "/edit"}) } if len(appLink.Children) > 0 { @@ -210,7 +210,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { Id: "cfg", Text: "Configuration", SubTitle: "Organization: " + c.OrgName, - Icon: "fa fa-fw fa-cog", + Icon: "gicon gicon-cog", Url: setting.AppSubUrl + "/datasources", Children: []*dtos.NavLink{ { @@ -224,7 +224,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { Text: "Users", Id: "users", Description: "Manage org members", - Icon: "icon-gf icon-gf-fw icon-gf-users", + Icon: "gicon gicon-user", Url: setting.AppSubUrl + "/org/users", }, { @@ -238,14 +238,14 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { Text: "Plugins", Id: "plugins", Description: "View and configure plugins", - Icon: "icon-gf icon-gf-fw icon-gf-apps", + Icon: "gicon gicon-plugins", Url: setting.AppSubUrl + "/plugins", }, { Text: "Preferences", Id: "org-settings", Description: "Organization preferences", - Icon: "fa fa-fw fa-sliders", + Icon: "gicon gicon-preferences", Url: setting.AppSubUrl + "/org", }, @@ -253,7 +253,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { Text: "API Keys", Id: "apikeys", Description: "Create & manage API keys", - Icon: "fa fa-fw fa-key", + Icon: "gicon gicon-apikeys", Url: setting.AppSubUrl + "/org/apikeys", }, }, @@ -268,12 +268,12 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { HideFromTabs: true, SubTitle: "Manage all users & orgs", Id: "admin", - Icon: "fa fa-fw fa-shield", + Icon: "gicon gicon-shield", Url: setting.AppSubUrl + "/admin/users", Children: []*dtos.NavLink{ - {Text: "Users", Id: "global-users", Url: setting.AppSubUrl + "/admin/users", Icon: "icon-gf icon-gf-fw icon-gf-users"}, + {Text: "Users", Id: "global-users", Url: setting.AppSubUrl + "/admin/users", Icon: "gicon gicon-user"}, {Text: "Orgs", Id: "global-orgs", Url: setting.AppSubUrl + "/admin/orgs", Icon: "gicon gicon-org"}, - {Text: "Settings", Id: "server-settings", Url: setting.AppSubUrl + "/admin/settings", Icon: "fa fa-fw fa-sliders"}, + {Text: "Settings", Id: "server-settings", Url: setting.AppSubUrl + "/admin/settings", Icon: "gicon gicon-preferences"}, {Text: "Stats", Id: "server-stats", Url: setting.AppSubUrl + "/admin/stats", Icon: "fa fa-fw fa-bar-chart"}, {Text: "Style Guide", Id: "styleguide", Url: setting.AppSubUrl + "/styleguide", Icon: "fa fa-fw fa-eyedropper"}, }, @@ -287,7 +287,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { Text: "Help", Id: "help", Url: "#", - Icon: "fa fa-fw fa-question", + Icon: "gicon gicon-question", HideFromMenu: true, Children: []*dtos.NavLink{ {Text: "Keyboard shortcuts", Url: "/shortcuts", Icon: "fa fa-fw fa-keyboard-o", Target: "_self"}, diff --git a/public/app/core/components/search/search_results.html b/public/app/core/components/search/search_results.html index 8cf5505186b..a776dabe0dc 100644 --- a/public/app/core/components/search/search_results.html +++ b/public/app/core/components/search/search_results.html @@ -30,7 +30,7 @@ - +
{{::item.title}}
diff --git a/public/app/features/annotations/partials/editor.html b/public/app/features/annotations/partials/editor.html index 62175e5278f..289f368ad0e 100644 --- a/public/app/features/annotations/partials/editor.html +++ b/public/app/features/annotations/partials/editor.html @@ -27,7 +27,7 @@ {{annotation.name}} -   +   {{annotation.name}} (Built-in) @@ -49,7 +49,7 @@
There are no custom annotation queries added yet
- + Add Annotation Query
diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts index 93bb470d1df..9acd98c934b 100644 --- a/public/app/features/dashboard/settings/settings.ts +++ b/public/app/features/dashboard/settings/settings.ts @@ -36,10 +36,10 @@ export class SettingsCtrl { buildSectionList() { this.sections = []; if (this.dashboard.meta.canEdit) { - this.sections.push({ title: 'General', id: 'settings', icon: 'fa fa-fw fa-sliders' }); - this.sections.push({ title: 'Annotations', id: 'annotations', icon: 'fa fa-fw fa-comment-o' }); - this.sections.push({ title: 'Variables', id: 'templating', icon: 'fa fa-fw fa-dollar' }); - this.sections.push({ title: 'Links', id: 'links', icon: 'fa fa-fw fa-external-link' }); + this.sections.push({ title: 'General', id: 'settings', icon: 'gicon gicon-preferences' }); + this.sections.push({ title: 'Annotations', id: 'annotations', icon: 'gicon gicon-annotation' }); + this.sections.push({ title: 'Variables', id: 'templating', icon: 'gicon gicon-variable' }); + this.sections.push({ title: 'Links', id: 'links', icon: 'gicon gicon-link' }); if (this.dashboard.id) { this.sections.push({ title: 'Versions', id: 'versions', icon: 'fa fa-fw fa-history' }); @@ -51,7 +51,7 @@ export class SettingsCtrl { this.viewId = 'make_editable'; } - this.sections.push({ title: 'View JSON', id: 'view_json', icon: 'fa fa-fw fa-code' }); + this.sections.push({ title: 'View JSON', id: 'view_json', icon: 'gicon gicon-json' }); const params = this.$location.search(); const url = this.$location.path(); diff --git a/public/app/features/dashlinks/editor.html b/public/app/features/dashlinks/editor.html index 14d43b5bd4f..f6c6552e6bb 100644 --- a/public/app/features/dashlinks/editor.html +++ b/public/app/features/dashlinks/editor.html @@ -11,7 +11,7 @@ There are no dashboard links added yet
- + Add Dashboard Link
diff --git a/public/app/features/plugins/plugin_edit_ctrl.ts b/public/app/features/plugins/plugin_edit_ctrl.ts index 0169dc7772e..a2441dd5e8d 100644 --- a/public/app/features/plugins/plugin_edit_ctrl.ts +++ b/public/app/features/plugins/plugin_edit_ctrl.ts @@ -60,7 +60,7 @@ export class PluginEditCtrl { if (model.type === 'app') { this.navModel.main.children.push({ - icon: 'fa fa-fw fa-th-large', + icon: 'gicon gicon-cog', id: 'config', text: 'Config', url: `plugins/${this.model.id}/edit?tab=config` diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html index c199c421a96..2fb80a6ac50 100644 --- a/public/app/features/templating/partials/editor.html +++ b/public/app/features/templating/partials/editor.html @@ -12,7 +12,7 @@
There are no variables added yet
- + Add variable
diff --git a/public/img/icons_dark_theme/icon_add_annotation.svg b/public/img/icons_dark_theme/icon_add_annotation.svg new file mode 100644 index 00000000000..330dfad85ad --- /dev/null +++ b/public/img/icons_dark_theme/icon_add_annotation.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_dark_theme/icon_add_annotation_alt.svg b/public/img/icons_dark_theme/icon_add_annotation_alt.svg new file mode 100644 index 00000000000..f24a46ee75c --- /dev/null +++ b/public/img/icons_dark_theme/icon_add_annotation_alt.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_dark_theme/icon_add_data_sources.svg b/public/img/icons_dark_theme/icon_add_data_sources.svg new file mode 100644 index 00000000000..6ea76c00735 --- /dev/null +++ b/public/img/icons_dark_theme/icon_add_data_sources.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_dark_theme/icon_add_link.svg b/public/img/icons_dark_theme/icon_add_link.svg new file mode 100644 index 00000000000..fe8e95f1eda --- /dev/null +++ b/public/img/icons_dark_theme/icon_add_link.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_dark_theme/icon_add_team.svg b/public/img/icons_dark_theme/icon_add_team.svg new file mode 100644 index 00000000000..35fd526e053 --- /dev/null +++ b/public/img/icons_dark_theme/icon_add_team.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_dark_theme/icon_add_user.svg b/public/img/icons_dark_theme/icon_add_user.svg new file mode 100644 index 00000000000..6a09f96ef1e --- /dev/null +++ b/public/img/icons_dark_theme/icon_add_user.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_dark_theme/icon_add_variable.svg b/public/img/icons_dark_theme/icon_add_variable.svg new file mode 100644 index 00000000000..9b10092e78f --- /dev/null +++ b/public/img/icons_dark_theme/icon_add_variable.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_dark_theme/icon_alert_rules.svg b/public/img/icons_dark_theme/icon_alert_rules.svg new file mode 100644 index 00000000000..71915eb6d1c --- /dev/null +++ b/public/img/icons_dark_theme/icon_alert_rules.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/public/img/icons_dark_theme/icon_annotation.svg b/public/img/icons_dark_theme/icon_annotation.svg new file mode 100644 index 00000000000..514b52fba40 --- /dev/null +++ b/public/img/icons_dark_theme/icon_annotation.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + diff --git a/public/img/icons_dark_theme/icon_annotation_alt.svg b/public/img/icons_dark_theme/icon_annotation_alt.svg new file mode 100644 index 00000000000..e798f91805c --- /dev/null +++ b/public/img/icons_dark_theme/icon_annotation_alt.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_dark_theme/icon_apikeys.svg b/public/img/icons_dark_theme/icon_apikeys.svg new file mode 100644 index 00000000000..8cc30794456 --- /dev/null +++ b/public/img/icons_dark_theme/icon_apikeys.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/public/img/icons_dark_theme/icon_cog.svg b/public/img/icons_dark_theme/icon_cog.svg new file mode 100644 index 00000000000..126b529e0df --- /dev/null +++ b/public/img/icons_dark_theme/icon_cog.svg @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/public/img/icons_dark_theme/icon_dashboard_list.svg b/public/img/icons_dark_theme/icon_dashboard_list.svg new file mode 100644 index 00000000000..1979400de7b --- /dev/null +++ b/public/img/icons_dark_theme/icon_dashboard_list.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_dark_theme/icon_home.svg b/public/img/icons_dark_theme/icon_home.svg new file mode 100644 index 00000000000..a4f2608d576 --- /dev/null +++ b/public/img/icons_dark_theme/icon_home.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/public/img/icons_dark_theme/icon_json.svg b/public/img/icons_dark_theme/icon_json.svg new file mode 100644 index 00000000000..30b0d9d0972 --- /dev/null +++ b/public/img/icons_dark_theme/icon_json.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_dark_theme/icon_link.svg b/public/img/icons_dark_theme/icon_link.svg new file mode 100644 index 00000000000..ac4bba7fe46 --- /dev/null +++ b/public/img/icons_dark_theme/icon_link.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + diff --git a/public/img/icons_dark_theme/icon_playlist.svg b/public/img/icons_dark_theme/icon_playlist.svg new file mode 100644 index 00000000000..bf8fc2f80a3 --- /dev/null +++ b/public/img/icons_dark_theme/icon_playlist.svg @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/public/img/icons_dark_theme/icon_plugins.svg b/public/img/icons_dark_theme/icon_plugins.svg new file mode 100644 index 00000000000..f00eefea975 --- /dev/null +++ b/public/img/icons_dark_theme/icon_plugins.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/public/img/icons_dark_theme/icon_preferences.svg b/public/img/icons_dark_theme/icon_preferences.svg new file mode 100644 index 00000000000..ed985c39f68 --- /dev/null +++ b/public/img/icons_dark_theme/icon_preferences.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + diff --git a/public/img/icons_dark_theme/icon_question.svg b/public/img/icons_dark_theme/icon_question.svg new file mode 100644 index 00000000000..aa33cf29467 --- /dev/null +++ b/public/img/icons_dark_theme/icon_question.svg @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/public/img/icons_dark_theme/icon_shield.svg b/public/img/icons_dark_theme/icon_shield.svg new file mode 100644 index 00000000000..7709351a56e --- /dev/null +++ b/public/img/icons_dark_theme/icon_shield.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_dark_theme/icon_sitemap.svg b/public/img/icons_dark_theme/icon_sitemap.svg new file mode 100644 index 00000000000..499273a399e --- /dev/null +++ b/public/img/icons_dark_theme/icon_sitemap.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/public/img/icons_dark_theme/icon_snapshots.svg b/public/img/icons_dark_theme/icon_snapshots.svg new file mode 100644 index 00000000000..5f3543623c7 --- /dev/null +++ b/public/img/icons_dark_theme/icon_snapshots.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + diff --git a/public/img/icons_dark_theme/icon_team.svg b/public/img/icons_dark_theme/icon_team.svg index 15dade3d289..1248f5d5e39 100644 --- a/public/img/icons_dark_theme/icon_team.svg +++ b/public/img/icons_dark_theme/icon_team.svg @@ -6,20 +6,15 @@ .st0{fill:#E3E3E3;} - - - + + diff --git a/public/img/icons_dark_theme/icon_user.svg b/public/img/icons_dark_theme/icon_user.svg index e488d9ffcf4..9479e9452ce 100644 --- a/public/img/icons_dark_theme/icon_user.svg +++ b/public/img/icons_dark_theme/icon_user.svg @@ -6,10 +6,10 @@ .st0{fill:#E3E3E3;} - + diff --git a/public/img/icons_dark_theme/icon_variable.svg b/public/img/icons_dark_theme/icon_variable.svg new file mode 100644 index 00000000000..4fffa63329a --- /dev/null +++ b/public/img/icons_dark_theme/icon_variable.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/public/img/icons_light_theme/icon_add_annotation.svg b/public/img/icons_light_theme/icon_add_annotation.svg new file mode 100644 index 00000000000..cb306bdd18b --- /dev/null +++ b/public/img/icons_light_theme/icon_add_annotation.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_light_theme/icon_add_annotation_alt.svg b/public/img/icons_light_theme/icon_add_annotation_alt.svg new file mode 100644 index 00000000000..2565f188d57 --- /dev/null +++ b/public/img/icons_light_theme/icon_add_annotation_alt.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_light_theme/icon_add_data_sources.svg b/public/img/icons_light_theme/icon_add_data_sources.svg new file mode 100644 index 00000000000..554af86bfc8 --- /dev/null +++ b/public/img/icons_light_theme/icon_add_data_sources.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_light_theme/icon_add_link.svg b/public/img/icons_light_theme/icon_add_link.svg new file mode 100644 index 00000000000..df31a3e99a3 --- /dev/null +++ b/public/img/icons_light_theme/icon_add_link.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_light_theme/icon_add_team.svg b/public/img/icons_light_theme/icon_add_team.svg new file mode 100644 index 00000000000..dd1580f3a3d --- /dev/null +++ b/public/img/icons_light_theme/icon_add_team.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_light_theme/icon_add_user.svg b/public/img/icons_light_theme/icon_add_user.svg new file mode 100644 index 00000000000..ef0d1d785f0 --- /dev/null +++ b/public/img/icons_light_theme/icon_add_user.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_light_theme/icon_add_variable.svg b/public/img/icons_light_theme/icon_add_variable.svg new file mode 100644 index 00000000000..da50f124e2b --- /dev/null +++ b/public/img/icons_light_theme/icon_add_variable.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_light_theme/icon_alert_rules.svg b/public/img/icons_light_theme/icon_alert_rules.svg new file mode 100644 index 00000000000..0c429a93e48 --- /dev/null +++ b/public/img/icons_light_theme/icon_alert_rules.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/public/img/icons_light_theme/icon_annotation.svg b/public/img/icons_light_theme/icon_annotation.svg new file mode 100644 index 00000000000..ce8aa4e3372 --- /dev/null +++ b/public/img/icons_light_theme/icon_annotation.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/public/img/icons_light_theme/icon_annotation_alt.svg b/public/img/icons_light_theme/icon_annotation_alt.svg new file mode 100644 index 00000000000..5379a6185c4 --- /dev/null +++ b/public/img/icons_light_theme/icon_annotation_alt.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_light_theme/icon_apikeys.svg b/public/img/icons_light_theme/icon_apikeys.svg new file mode 100644 index 00000000000..c54aabe4e30 --- /dev/null +++ b/public/img/icons_light_theme/icon_apikeys.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/public/img/icons_light_theme/icon_cog.svg b/public/img/icons_light_theme/icon_cog.svg new file mode 100644 index 00000000000..c8ccfaa38f3 --- /dev/null +++ b/public/img/icons_light_theme/icon_cog.svg @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/public/img/icons_light_theme/icon_dashboard_list.svg b/public/img/icons_light_theme/icon_dashboard_list.svg new file mode 100644 index 00000000000..c6d8ddd6c5e --- /dev/null +++ b/public/img/icons_light_theme/icon_dashboard_list.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_light_theme/icon_home.svg b/public/img/icons_light_theme/icon_home.svg new file mode 100644 index 00000000000..a7f0fde536a --- /dev/null +++ b/public/img/icons_light_theme/icon_home.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/public/img/icons_light_theme/icon_json.svg b/public/img/icons_light_theme/icon_json.svg new file mode 100644 index 00000000000..42ea7083403 --- /dev/null +++ b/public/img/icons_light_theme/icon_json.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_light_theme/icon_link.svg b/public/img/icons_light_theme/icon_link.svg new file mode 100644 index 00000000000..7201eb6aa3a --- /dev/null +++ b/public/img/icons_light_theme/icon_link.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/public/img/icons_light_theme/icon_playlist.svg b/public/img/icons_light_theme/icon_playlist.svg new file mode 100644 index 00000000000..772ad4f7a6f --- /dev/null +++ b/public/img/icons_light_theme/icon_playlist.svg @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/public/img/icons_light_theme/icon_plugins.svg b/public/img/icons_light_theme/icon_plugins.svg new file mode 100644 index 00000000000..7f5dd78e1da --- /dev/null +++ b/public/img/icons_light_theme/icon_plugins.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/public/img/icons_light_theme/icon_preferences.svg b/public/img/icons_light_theme/icon_preferences.svg new file mode 100644 index 00000000000..ea2f7d70def --- /dev/null +++ b/public/img/icons_light_theme/icon_preferences.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + diff --git a/public/img/icons_light_theme/icon_question.svg b/public/img/icons_light_theme/icon_question.svg new file mode 100644 index 00000000000..90e284508ff --- /dev/null +++ b/public/img/icons_light_theme/icon_question.svg @@ -0,0 +1,16 @@ + + + + + + + + + diff --git a/public/img/icons_light_theme/icon_shield.svg b/public/img/icons_light_theme/icon_shield.svg new file mode 100644 index 00000000000..675cad7c2ad --- /dev/null +++ b/public/img/icons_light_theme/icon_shield.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/img/icons_light_theme/icon_sitemap.svg b/public/img/icons_light_theme/icon_sitemap.svg new file mode 100644 index 00000000000..c19c62cb4b0 --- /dev/null +++ b/public/img/icons_light_theme/icon_sitemap.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/public/img/icons_light_theme/icon_snapshots.svg b/public/img/icons_light_theme/icon_snapshots.svg new file mode 100644 index 00000000000..7c29338a52f --- /dev/null +++ b/public/img/icons_light_theme/icon_snapshots.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff --git a/public/img/icons_light_theme/icon_team.svg b/public/img/icons_light_theme/icon_team.svg index 2ec7caf796e..21efa62218e 100644 --- a/public/img/icons_light_theme/icon_team.svg +++ b/public/img/icons_light_theme/icon_team.svg @@ -6,20 +6,15 @@ .st0{fill:#555555;} - - - + + diff --git a/public/img/icons_light_theme/icon_user.svg b/public/img/icons_light_theme/icon_user.svg index 2a68115129d..205a345755a 100644 --- a/public/img/icons_light_theme/icon_user.svg +++ b/public/img/icons_light_theme/icon_user.svg @@ -6,10 +6,10 @@ .st0{fill:#555555;} - + diff --git a/public/img/icons_light_theme/icon_variable.svg b/public/img/icons_light_theme/icon_variable.svg new file mode 100644 index 00000000000..8624f74bc63 --- /dev/null +++ b/public/img/icons_light_theme/icon_variable.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + diff --git a/public/sass/base/_icons.scss b/public/sass/base/_icons.scss index 7ef691bca16..7b5f4d0e1ca 100644 --- a/public/sass/base/_icons.scss +++ b/public/sass/base/_icons.scss @@ -11,6 +11,43 @@ vertical-align: middle; } +.mini { + width: 0.8em; + height: 0.8em; +} + +.gicon-add-annotation { + background-image: url('../img/icons_#{$theme-name}_theme/icon_add_annotation.svg'); +} + +.gicon-add-annotation-alt { + background-image: url('../img/icons_#{$theme-name}_theme/icon_add_annotation_alt.svg'); +} + +.gicon-add-datasources { + background-image: url('../img/icons_#{$theme-name}_theme/icon_add_data_sources.svg'); +} + +.gicon-add-user { + background-image: url('../img/icons_#{$theme-name}_theme/icon_add_user.svg'); +} + +.gicon-add-team { + background-image: url('../img/icons_#{$theme-name}_theme/icon_add_team.svg'); +} + +.gicon-add-panel { + background-image: url('../img/icons_#{$theme-name}_theme/icon_add_panel.svg'); +} + +.gicon-add-link { + background-image: url('../img/icons_#{$theme-name}_theme/icon_add_link.svg'); +} + +.gicon-add-variable { + background-image: url('../img/icons_#{$theme-name}_theme/icon_add_variable.svg'); +} + .gicon-alert { background-image: url('../img/icons_#{$theme-name}_theme/icon_alert.svg'); } @@ -19,8 +56,32 @@ background-image: url('../img/icons_#{$theme-name}_theme/icon_alert_alt.svg'); } -.gicon-datasources { - background-image: url('../img/icons_#{$theme-name}_theme/icon_data_sources.svg'); +.gicon-alert-rules { + background-image: url('../img/icons_#{$theme-name}_theme/icon_alert_rules.svg'); +} + +.gicon-alert-notification-channel { + background-image: url('../img/icons_#{$theme-name}_theme/icon_notification_channels.svg'); +} + +.gicon-annotation { + background-image: url('../img/icons_#{$theme-name}_theme/icon_annotation.svg'); +} + +.gicon-annotation-alt { + background-image: url('../img/icons_#{$theme-name}_theme/icon_annotation_alt.svg'); +} + +.gicon-apikeys { + background-image: url('../img/icons_#{$theme-name}_theme/icon_apikeys.svg'); +} + +.gicon-branding { + background-image: url('../img/grafana_icon.svg'); +} + +.gicon-cog { + background-image: url('../img/icons_#{$theme-name}_theme/icon_cog.svg'); } .gicon-dashboard { @@ -31,41 +92,86 @@ background-image: url('../img/icons_#{$theme-name}_theme/icon_dashboard_fav.svg'); } -.gicon-dashboard-new { - background-image: url('../img/icons_#{$theme-name}_theme/icon_new_dashboard.svg'); +.gicon-dashboard-list { + background-image: url('../img/icons_#{$theme-name}_theme/icon_dashboard_list.svg'); } -.gicon-folder-new { - background-image: url('../img/icons_#{$theme-name}_theme/icon_add_folder.svg'); +.gicon-dashboard-new { + background-image: url('../img/icons_#{$theme-name}_theme/icon_new_dashboard.svg'); } .gicon-dashboard-import { 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'); +.gicon-datasources { + background-image: url('../img/icons_#{$theme-name}_theme/icon_data_sources.svg'); } -.gicon-alert-notification-channel { - background-image: url('../img/icons_#{$theme-name}_theme/icon_notification_channels.svg'); +.gicon-folder-new { + background-image: url('../img/icons_#{$theme-name}_theme/icon_add_folder.svg'); } -.gicon-team { - background-image: url('../img/icons_#{$theme-name}_theme/icon_team.svg'); +.gicon-home { + background-image: url('../img/icons_#{$theme-name}_theme/icon_home.svg'); +} + +.gicon-json { + background-image: url('../img/icons_#{$theme-name}_theme/icon_json.svg'); +} + +.gicon-link { + background-image: url('../img/icons_#{$theme-name}_theme/icon_link.svg'); +} + +.gicon-manage { + background-image: url('../img/icons_#{$theme-name}_theme/icon_sitemap.svg'); } .gicon-org { background-image: url('../img/icons_#{$theme-name}_theme/icon_org.svg'); } +.gicon-playlists { + background-image: url('../img/icons_#{$theme-name}_theme/icon_playlist.svg'); +} + +.gicon-plugins { + background-image: url('../img/icons_#{$theme-name}_theme/icon_plugins.svg'); +} + +.gicon-preferences { + background-image: url('../img/icons_#{$theme-name}_theme/icon_preferences.svg'); +} + +.gicon-question { + background-image: url('../img/icons_#{$theme-name}_theme/icon_question.svg'); +} + +.gicon-shield { + background-image: url('../img/icons_#{$theme-name}_theme/icon_shield.svg'); +} + +.gicon-snapshots { + background-image: url('../img/icons_#{$theme-name}_theme/icon_snapshots.svg'); +} + +.gicon-team { + background-image: url('../img/icons_#{$theme-name}_theme/icon_team.svg'); +} + +.gicon-user { + background-image: url('../img/icons_#{$theme-name}_theme/icon_user.svg'); +} + +.gicon-variable { + background-image: url('../img/icons_#{$theme-name}_theme/icon_variable.svg'); +} + .gicon-zoom-out { background-image: url('../img/icons_#{$theme-name}_theme/icon_zoom_out.svg'); } -.gicon-branding { - background-image: url('../img/grafana_icon.svg'); -} .sidemenu { .gicon-dashboard {