diff --git a/dist/css/components/toolbar.css b/dist/css/components/toolbar.css
index 2841718c30b850a0f00202f94dac2f1c3606204a..d66d6056d5f42c9103e525c4bb799e6c0846b2e7 100644
--- a/dist/css/components/toolbar.css
+++ b/dist/css/components/toolbar.css
@@ -199,62 +199,11 @@ body.gin--classic-toolbar {
--icon: url("../../media/sprite.svg#tool-view");
}
-.toolbar .toolbar-bar .toolbar-icon-system-themes-page::before,
-.toolbar .toolbar-bar .toolbar-link--system-themes-page::before,
-.toolbar .toolbar-bar .toolbar-button--icon--system-themes-page::before {
- --icon: url("../../media/sprite.svg#appearance-view");
-}
-
-.toolbar .toolbar-bar .toolbar-link--blocks::before,
-.toolbar .toolbar-bar .toolbar-button--icon--navigation-blocks::before {
- --icon: url("../../media/sprite.svg#blocks-view");
-}
-
.toolbar .toolbar-bar .toolbar-link--bookmarks::before,
.toolbar .toolbar-bar .toolbar-button--icon--bookmarks::before {
--icon: url("../../media/sprite.svg#bookmarks-view");
}
-.toolbar .toolbar-bar .toolbar-icon-shortcut::before,
-.toolbar .toolbar-bar .toolbar-button--icon--shortcuts::before {
- --icon: url("../../media/sprite.svg#shortcut-view");
-}
-
-.toolbar .toolbar-bar .toolbar-icon-system-admin-config::before,
-.toolbar .toolbar-bar .toolbar-link--system-admin-config::before,
-.toolbar .toolbar-bar .toolbar-button--icon--system-admin-config::before {
- --icon: url("../../media/sprite.svg#config-view");
-}
-
-.toolbar .toolbar-bar .toolbar-icon-system-admin-content::before,
-.toolbar .toolbar-bar .toolbar-link--content::before,
-.toolbar .toolbar-bar .toolbar-button--icon--navigation-content::before {
- --icon: url("../../media/sprite.svg#content-view");
-}
-
-.toolbar .toolbar-bar .toolbar-link--create::before,
-.toolbar .toolbar-bar .toolbar-button--icon--navigation-create::before {
- --icon: url("../../media/sprite.svg#create-view");
-}
-
-.toolbar .toolbar-bar .toolbar-icon-system-modules-list::before,
-.toolbar .toolbar-bar .toolbar-link--system-modules-list::before,
-.toolbar .toolbar-bar .toolbar-button--icon--system-modules-list::before {
- --icon: url("../../media/sprite.svg#extend-new-view");
-}
-
-.toolbar .toolbar-bar .toolbar-link--files::before,
-.toolbar .toolbar-bar .toolbar-button--icon--navigation-files::before {
- --icon: url("../../media/sprite.svg#files-view");
-}
-
-.toolbar .toolbar-bar .toolbar-icon-help-main::before,
-.toolbar .toolbar-bar .toolbar-icon-help::before,
-.toolbar .toolbar-bar .toolbar-link--help::before,
-.toolbar .toolbar-bar .toolbar-button--icon--help::before {
- --icon: url("../../media/sprite.svg#help-view");
-}
-
.toolbar .toolbar-bar .toolbar-icon-commerce-admin-commerce::before,
.toolbar .toolbar-bar .toolbar-link--commerce-admin-commerce::before,
.toolbar .toolbar-bar .toolbar-button--icon--commerce-admin-commerce::before,
@@ -264,29 +213,6 @@ body.gin--classic-toolbar {
--icon: url("../../media/sprite.svg#commerce-view");
}
-.toolbar .toolbar-bar .toolbar-link--media::before,
-.toolbar .toolbar-bar .toolbar-button--icon--navigation-media::before {
- --icon: url("../../media/sprite.svg#media-view");
-}
-
-.toolbar .toolbar-bar .toolbar-icon-entity-user-collection::before,
-.toolbar .toolbar-bar .toolbar-link--entity-user-collection::before,
-.toolbar .toolbar-bar .toolbar-button--icon--entity-user-collection::before {
- --icon: url("../../media/sprite.svg#people-new-view");
-}
-
-.toolbar .toolbar-bar .toolbar-icon-system-admin-reports::before,
-.toolbar .toolbar-bar .toolbar-link--system-admin-reports::before,
-.toolbar .toolbar-bar .toolbar-button--icon--system-admin-reports::before {
- --icon: url("../../media/sprite.svg#reports-view");
-}
-
-.toolbar .toolbar-bar .toolbar-icon-system-admin-structure::before,
-.toolbar .toolbar-bar .toolbar-link--system-admin-structure::before,
-.toolbar .toolbar-bar .toolbar-button--icon--system-admin-structure::before {
- --icon: url("../../media/sprite.svg#structure-view");
-}
-
.toolbar .toolbar-bar .toolbar-icon-entity-webform-collection::before,
.toolbar .toolbar-bar .toolbar-link--entity-webform-collection::before,
.toolbar .toolbar-bar .toolbar-button--icon--entity-webform-collection::before {
@@ -300,19 +226,6 @@ body.gin--classic-toolbar {
--icon: url("../../media/sprite.svg#chevron-down-view");
}
-.toolbar .toolbar-bar .toolbar-icon-user::before,
-.toolbar .toolbar-bar .toolbar-link--user::before,
-.toolbar .toolbar-bar .toolbar-button--icon--user::before {
- --icon: url("../../media/sprite.svg#user-view");
-}
-
-.toolbar .toolbar-bar .toolbar-icon-announcements-feed-announcement::before,
-.toolbar .toolbar-bar .toolbar-icon-announce::before,
-.toolbar .toolbar-bar .toolbar-link--announcements-feed-announcement::before,
-.toolbar .toolbar-bar .toolbar-button--icon--announcements-feed-announcement::before {
- --icon: url("../../media/sprite.svg#announcement-view");
-}
-
.toolbar .toolbar-bar .toolbar-icon-system-admin-group::before,
.toolbar .toolbar-bar .toolbar-link--system-admin-group::before,
.toolbar .toolbar-bar .toolbar-button--icon--system-admin-group::before {
diff --git a/dist/css/layout/core_navigation.css b/dist/css/layout/core_navigation.css
index 4e2e204e65c08824bcc7b0fa85df2477d5a4624f..07aad2575d6c2adc53b97b3f852ee199d5d116ff 100644
--- a/dist/css/layout/core_navigation.css
+++ b/dist/css/layout/core_navigation.css
@@ -241,62 +241,11 @@ body.gin--core-navigation {
--icon: url("../../media/sprite.svg#tool-view");
}
-.toolbar-icon-system-themes-page::before,
-.toolbar-link--system-themes-page::before,
-.toolbar-button--icon--system-themes-page::before {
- --icon: url("../../media/sprite.svg#appearance-view");
-}
-
-.toolbar-link--blocks::before,
-.toolbar-button--icon--navigation-blocks::before {
- --icon: url("../../media/sprite.svg#blocks-view");
-}
-
.toolbar-link--bookmarks::before,
.toolbar-button--icon--bookmarks::before {
--icon: url("../../media/sprite.svg#bookmarks-view");
}
-.toolbar-icon-shortcut::before,
-.toolbar-button--icon--shortcuts::before {
- --icon: url("../../media/sprite.svg#shortcut-view");
-}
-
-.toolbar-icon-system-admin-config::before,
-.toolbar-link--system-admin-config::before,
-.toolbar-button--icon--system-admin-config::before {
- --icon: url("../../media/sprite.svg#config-view");
-}
-
-.toolbar-icon-system-admin-content::before,
-.toolbar-link--content::before,
-.toolbar-button--icon--navigation-content::before {
- --icon: url("../../media/sprite.svg#content-view");
-}
-
-.toolbar-link--create::before,
-.toolbar-button--icon--navigation-create::before {
- --icon: url("../../media/sprite.svg#create-view");
-}
-
-.toolbar-icon-system-modules-list::before,
-.toolbar-link--system-modules-list::before,
-.toolbar-button--icon--system-modules-list::before {
- --icon: url("../../media/sprite.svg#extend-new-view");
-}
-
-.toolbar-link--files::before,
-.toolbar-button--icon--navigation-files::before {
- --icon: url("../../media/sprite.svg#files-view");
-}
-
-.toolbar-icon-help-main::before,
-.toolbar-icon-help::before,
-.toolbar-link--help::before,
-.toolbar-button--icon--help::before {
- --icon: url("../../media/sprite.svg#help-view");
-}
-
.toolbar-icon-commerce-admin-commerce::before,
.toolbar-link--commerce-admin-commerce::before,
.toolbar-button--icon--commerce-admin-commerce::before,
@@ -306,29 +255,6 @@ body.gin--core-navigation {
--icon: url("../../media/sprite.svg#commerce-view");
}
-.toolbar-link--media::before,
-.toolbar-button--icon--navigation-media::before {
- --icon: url("../../media/sprite.svg#media-view");
-}
-
-.toolbar-icon-entity-user-collection::before,
-.toolbar-link--entity-user-collection::before,
-.toolbar-button--icon--entity-user-collection::before {
- --icon: url("../../media/sprite.svg#people-new-view");
-}
-
-.toolbar-icon-system-admin-reports::before,
-.toolbar-link--system-admin-reports::before,
-.toolbar-button--icon--system-admin-reports::before {
- --icon: url("../../media/sprite.svg#reports-view");
-}
-
-.toolbar-icon-system-admin-structure::before,
-.toolbar-link--system-admin-structure::before,
-.toolbar-button--icon--system-admin-structure::before {
- --icon: url("../../media/sprite.svg#structure-view");
-}
-
.toolbar-icon-entity-webform-collection::before,
.toolbar-link--entity-webform-collection::before,
.toolbar-button--icon--entity-webform-collection::before {
@@ -342,19 +268,6 @@ body.gin--core-navigation {
--icon: url("../../media/sprite.svg#chevron-down-view");
}
-.toolbar-icon-user::before,
-.toolbar-link--user::before,
-.toolbar-button--icon--user::before {
- --icon: url("../../media/sprite.svg#user-view");
-}
-
-.toolbar-icon-announcements-feed-announcement::before,
-.toolbar-icon-announce::before,
-.toolbar-link--announcements-feed-announcement::before,
-.toolbar-button--icon--announcements-feed-announcement::before {
- --icon: url("../../media/sprite.svg#announcement-view");
-}
-
.toolbar-icon-system-admin-group::before,
.toolbar-link--system-admin-group::before,
.toolbar-button--icon--system-admin-group::before {
diff --git a/dist/css/layout/navigation.css b/dist/css/layout/navigation.css
index 476a766b5158186563375399cac5b0f14e1f9179..79da438f36dea11e5972bec92fc54e2c09189e73 100644
--- a/dist/css/layout/navigation.css
+++ b/dist/css/layout/navigation.css
@@ -1152,62 +1152,11 @@ button.toolbar-link--sidebar-toggle[aria-expanded=true]::before {
--icon: url("../../media/sprite.svg#tool-view");
}
-.toolbar-icon-system-themes-page::before,
-.toolbar-link--system-themes-page::before,
-.toolbar-button--icon--system-themes-page::before {
- --icon: url("../../media/sprite.svg#appearance-view");
-}
-
-.toolbar-link--blocks::before,
-.toolbar-button--icon--navigation-blocks::before {
- --icon: url("../../media/sprite.svg#blocks-view");
-}
-
.toolbar-link--bookmarks::before,
.toolbar-button--icon--bookmarks::before {
--icon: url("../../media/sprite.svg#bookmarks-view");
}
-.toolbar-icon-shortcut::before,
-.toolbar-button--icon--shortcuts::before {
- --icon: url("../../media/sprite.svg#shortcut-view");
-}
-
-.toolbar-icon-system-admin-config::before,
-.toolbar-link--system-admin-config::before,
-.toolbar-button--icon--system-admin-config::before {
- --icon: url("../../media/sprite.svg#config-view");
-}
-
-.toolbar-icon-system-admin-content::before,
-.toolbar-link--content::before,
-.toolbar-button--icon--navigation-content::before {
- --icon: url("../../media/sprite.svg#content-view");
-}
-
-.toolbar-link--create::before,
-.toolbar-button--icon--navigation-create::before {
- --icon: url("../../media/sprite.svg#create-view");
-}
-
-.toolbar-icon-system-modules-list::before,
-.toolbar-link--system-modules-list::before,
-.toolbar-button--icon--system-modules-list::before {
- --icon: url("../../media/sprite.svg#extend-new-view");
-}
-
-.toolbar-link--files::before,
-.toolbar-button--icon--navigation-files::before {
- --icon: url("../../media/sprite.svg#files-view");
-}
-
-.toolbar-icon-help-main::before,
-.toolbar-icon-help::before,
-.toolbar-link--help::before,
-.toolbar-button--icon--help::before {
- --icon: url("../../media/sprite.svg#help-view");
-}
-
.toolbar-icon-commerce-admin-commerce::before,
.toolbar-link--commerce-admin-commerce::before,
.toolbar-button--icon--commerce-admin-commerce::before,
@@ -1217,29 +1166,6 @@ button.toolbar-link--sidebar-toggle[aria-expanded=true]::before {
--icon: url("../../media/sprite.svg#commerce-view");
}
-.toolbar-link--media::before,
-.toolbar-button--icon--navigation-media::before {
- --icon: url("../../media/sprite.svg#media-view");
-}
-
-.toolbar-icon-entity-user-collection::before,
-.toolbar-link--entity-user-collection::before,
-.toolbar-button--icon--entity-user-collection::before {
- --icon: url("../../media/sprite.svg#people-new-view");
-}
-
-.toolbar-icon-system-admin-reports::before,
-.toolbar-link--system-admin-reports::before,
-.toolbar-button--icon--system-admin-reports::before {
- --icon: url("../../media/sprite.svg#reports-view");
-}
-
-.toolbar-icon-system-admin-structure::before,
-.toolbar-link--system-admin-structure::before,
-.toolbar-button--icon--system-admin-structure::before {
- --icon: url("../../media/sprite.svg#structure-view");
-}
-
.toolbar-icon-entity-webform-collection::before,
.toolbar-link--entity-webform-collection::before,
.toolbar-button--icon--entity-webform-collection::before {
@@ -1253,19 +1179,6 @@ button.toolbar-link--sidebar-toggle[aria-expanded=true]::before {
--icon: url("../../media/sprite.svg#chevron-down-view");
}
-.toolbar-icon-user::before,
-.toolbar-link--user::before,
-.toolbar-button--icon--user::before {
- --icon: url("../../media/sprite.svg#user-view");
-}
-
-.toolbar-icon-announcements-feed-announcement::before,
-.toolbar-icon-announce::before,
-.toolbar-link--announcements-feed-announcement::before,
-.toolbar-button--icon--announcements-feed-announcement::before {
- --icon: url("../../media/sprite.svg#announcement-view");
-}
-
.toolbar-icon-system-admin-group::before,
.toolbar-link--system-admin-group::before,
.toolbar-button--icon--system-admin-group::before {
diff --git a/dist/media/sprite.svg b/dist/media/sprite.svg
index f02c203381188516222d7545e443bb50ab37633a..60db95846b65a07f5fc94b3e3a7ba365a9ebe70b 100644
Binary files a/dist/media/sprite.svg and b/dist/media/sprite.svg differ
diff --git a/gin.icons.yml b/gin.icons.yml
new file mode 100644
index 0000000000000000000000000000000000000000..bef337f36fad2ffa2113aaa5dfe2d737948183e6
--- /dev/null
+++ b/gin.icons.yml
@@ -0,0 +1,36 @@
+navigation:
+ enabled: true
+ label: "Drupal Navigation Gin Overrides"
+ description: "Gin overrides for Core Navigation module icon pack."
+ version: 11.x
+ license:
+ name: GPL2-or-later
+ url: https://api.drupal.org/api/drupal/core%21LICENSE.txt/11.x
+ gpl-compatible: true
+ extractor: svg
+ config:
+ sources:
+ - media/icons/navigation/*.svg
+ settings:
+ size:
+ title: "Size"
+ description: "Set a size for this icon."
+ type: "integer"
+ default: 24
+ class:
+ title: "Class"
+ description: "Set a class for this icon."
+ type: "string"
+ default: ""
+ template: >
+ <svg
+ {{ attributes
+ .setAttribute('viewBox', attributes.viewBox|default('0 0 24 24'))
+ .setAttribute('class', class)
+ .setAttribute('width', size|default('20'))
+ .setAttribute('height', size|default('20'))
+ .setAttribute('aria-hidden', 'true')
+ }}
+ >
+ {{ content }}
+ </svg>
diff --git a/media/icons/navigation/announcement.svg b/media/icons/navigation/announcements-feed-announcement.svg
similarity index 100%
rename from media/icons/navigation/announcement.svg
rename to media/icons/navigation/announcements-feed-announcement.svg
diff --git a/media/icons/navigation/burger.svg b/media/icons/navigation/burger.svg
new file mode 100644
index 0000000000000000000000000000000000000000..1b447e7f203d9ceac00561da373617aad2b37864
Binary files /dev/null and b/media/icons/navigation/burger.svg differ
diff --git a/media/icons/navigation/chevron.svg b/media/icons/navigation/chevron.svg
new file mode 100644
index 0000000000000000000000000000000000000000..7b4bf7433e13ae02c6b815440292c2f5e8ee635f
Binary files /dev/null and b/media/icons/navigation/chevron.svg differ
diff --git a/media/icons/navigation/cross.svg b/media/icons/navigation/cross.svg
new file mode 100644
index 0000000000000000000000000000000000000000..c27abcbdcbca7f6de78d005c5e21bd10847477c9
Binary files /dev/null and b/media/icons/navigation/cross.svg differ
diff --git a/media/icons/status-report/database.svg b/media/icons/navigation/database.svg
similarity index 100%
rename from media/icons/status-report/database.svg
rename to media/icons/navigation/database.svg
diff --git a/media/icons/navigation/dots.svg b/media/icons/navigation/dots.svg
new file mode 100644
index 0000000000000000000000000000000000000000..82778cff3dc0296c9b7e6875f076936d0828a0f4
Binary files /dev/null and b/media/icons/navigation/dots.svg differ
diff --git a/media/icons/navigation/people-new.svg b/media/icons/navigation/entity-user-collection.svg
similarity index 100%
rename from media/icons/navigation/people-new.svg
rename to media/icons/navigation/entity-user-collection.svg
diff --git a/media/icons/toolbar/help.svg b/media/icons/navigation/help.svg
similarity index 100%
rename from media/icons/toolbar/help.svg
rename to media/icons/navigation/help.svg
diff --git a/media/icons/navigation/blocks.svg b/media/icons/navigation/navigation-blocks.svg
similarity index 100%
rename from media/icons/navigation/blocks.svg
rename to media/icons/navigation/navigation-blocks.svg
diff --git a/media/icons/navigation/navigation-content.svg b/media/icons/navigation/navigation-content.svg
new file mode 100644
index 0000000000000000000000000000000000000000..2f135f096261e072c092b947c059aff1b2ba275f
Binary files /dev/null and b/media/icons/navigation/navigation-content.svg differ
diff --git a/media/icons/navigation/create.svg b/media/icons/navigation/navigation-create.svg
similarity index 100%
rename from media/icons/navigation/create.svg
rename to media/icons/navigation/navigation-create.svg
diff --git a/media/icons/navigation/files.svg b/media/icons/navigation/navigation-files.svg
similarity index 100%
rename from media/icons/navigation/files.svg
rename to media/icons/navigation/navigation-files.svg
diff --git a/media/icons/navigation/media.svg b/media/icons/navigation/navigation-media.svg
similarity index 100%
rename from media/icons/navigation/media.svg
rename to media/icons/navigation/navigation-media.svg
diff --git a/media/icons/navigation/navigation-user-links-user-wrapper.svg b/media/icons/navigation/navigation-user-links-user-wrapper.svg
new file mode 100644
index 0000000000000000000000000000000000000000..ee1d30bf9ad37210095eecddb7f2c6fab388d8c0
Binary files /dev/null and b/media/icons/navigation/navigation-user-links-user-wrapper.svg differ
diff --git a/media/icons/navigation/shortcuts.svg b/media/icons/navigation/shortcuts.svg
new file mode 100644
index 0000000000000000000000000000000000000000..17a0659bf2e259cd37d4f1c08e17040765f56958
Binary files /dev/null and b/media/icons/navigation/shortcuts.svg differ
diff --git a/media/icons/navigation/system-admin-config.svg b/media/icons/navigation/system-admin-config.svg
new file mode 100644
index 0000000000000000000000000000000000000000..af066324b60860727fb9c9278019b5559fe503d3
Binary files /dev/null and b/media/icons/navigation/system-admin-config.svg differ
diff --git a/media/icons/navigation/system-admin-reports.svg b/media/icons/navigation/system-admin-reports.svg
new file mode 100644
index 0000000000000000000000000000000000000000..8a968dac8cf966665fe43f84b56e7eed745547a7
Binary files /dev/null and b/media/icons/navigation/system-admin-reports.svg differ
diff --git a/media/icons/navigation/system-admin-structure.svg b/media/icons/navigation/system-admin-structure.svg
new file mode 100644
index 0000000000000000000000000000000000000000..052a425272ebdcfcdb9e2492b782c14eb3483928
Binary files /dev/null and b/media/icons/navigation/system-admin-structure.svg differ
diff --git a/media/icons/navigation/extend-new.svg b/media/icons/navigation/system-modules-list.svg
similarity index 100%
rename from media/icons/navigation/extend-new.svg
rename to media/icons/navigation/system-modules-list.svg
diff --git a/media/icons/navigation/system-themes-page.svg b/media/icons/navigation/system-themes-page.svg
new file mode 100644
index 0000000000000000000000000000000000000000..51ebed9b1e170dc5d592a59a8ce19f28dbc4e904
Binary files /dev/null and b/media/icons/navigation/system-themes-page.svg differ
diff --git a/media/icons/messages/warning.svg b/media/icons/navigation/warning.svg
similarity index 100%
rename from media/icons/messages/warning.svg
rename to media/icons/navigation/warning.svg
diff --git a/styles/helpers/_svg-sprite.scss b/styles/helpers/_svg-sprite.scss
index f8b6131cf1c49a6cf451e2ad2f1404cbd4d628f9..52587db008d40addbf9de2290d52b8b2dad8f8ce 100644
--- a/styles/helpers/_svg-sprite.scss
+++ b/styles/helpers/_svg-sprite.scss
@@ -27,23 +27,34 @@ $sprites: (
'info': "../../media/sprite.svg#info-view",
'question': "../../media/sprite.svg#question-view",
'status': "../../media/sprite.svg#status-view",
- 'warning': "../../media/sprite.svg#warning-view",
- 'announcement': "../../media/sprite.svg#announcement-view",
+ 'announcements-feed-announcement': "../../media/sprite.svg#announcements-feed-announcement-view",
'block': "../../media/sprite.svg#block-view",
- 'blocks': "../../media/sprite.svg#blocks-view",
'bookmarks': "../../media/sprite.svg#bookmarks-view",
+ 'burger': "../../media/sprite.svg#burger-view",
'chevron-down': "../../media/sprite.svg#chevron-down-view",
- 'create': "../../media/sprite.svg#create-view",
- 'extend-new': "../../media/sprite.svg#extend-new-view",
- 'files': "../../media/sprite.svg#files-view",
- 'media': "../../media/sprite.svg#media-view",
- 'people-new': "../../media/sprite.svg#people-new-view",
+ 'chevron': "../../media/sprite.svg#chevron-view",
+ 'database': "../../media/sprite.svg#database-view",
+ 'dots': "../../media/sprite.svg#dots-view",
+ 'entity-user-collection': "../../media/sprite.svg#entity-user-collection-view",
+ 'help': "../../media/sprite.svg#help-view",
+ 'navigation-blocks': "../../media/sprite.svg#navigation-blocks-view",
+ 'navigation-content': "../../media/sprite.svg#navigation-content-view",
+ 'navigation-create': "../../media/sprite.svg#navigation-create-view",
+ 'navigation-files': "../../media/sprite.svg#navigation-files-view",
+ 'navigation-media': "../../media/sprite.svg#navigation-media-view",
+ 'navigation-user-links-user-wrapper': "../../media/sprite.svg#navigation-user-links-user-wrapper-view",
+ 'shortcuts': "../../media/sprite.svg#shortcuts-view",
+ 'system-admin-config': "../../media/sprite.svg#system-admin-config-view",
+ 'system-admin-reports': "../../media/sprite.svg#system-admin-reports-view",
+ 'system-admin-structure': "../../media/sprite.svg#system-admin-structure-view",
+ 'system-modules-list': "../../media/sprite.svg#system-modules-list-view",
+ 'system-themes-page': "../../media/sprite.svg#system-themes-page-view",
+ 'warning': "../../media/sprite.svg#warning-view",
'first': "../../media/sprite.svg#first-view",
'last': "../../media/sprite.svg#last-view",
'next': "../../media/sprite.svg#next-view",
'prev': "../../media/sprite.svg#prev-view",
'clock': "../../media/sprite.svg#clock-view",
- 'database': "../../media/sprite.svg#database-view",
'php': "../../media/sprite.svg#php-view",
'server': "../../media/sprite.svg#server-view",
'drag-dots': "../../media/sprite.svg#drag-dots-view",
@@ -71,7 +82,6 @@ $sprites: (
'fallback': "../../media/sprite.svg#fallback-view",
'group': "../../media/sprite.svg#group-view",
'hamburger': "../../media/sprite.svg#hamburger-view",
- 'help': "../../media/sprite.svg#help-view",
'local-tasks': "../../media/sprite.svg#local-tasks-view",
'nav-toggle-toleft': "../../media/sprite.svg#nav-toggle-toleft-view",
'nav-toggle-totop': "../../media/sprite.svg#nav-toggle-totop-view",
@@ -196,47 +206,95 @@ $sizes: (
'width': 24px,
'height': 24px
),
- 'warning': (
+ 'announcements-feed-announcement': (
'width': 24px,
'height': 24px
),
- 'announcement': (
+ 'block': (
'width': 24px,
'height': 24px
),
- 'block': (
+ 'bookmarks': (
'width': 24px,
'height': 24px
),
- 'blocks': (
+ 'burger': (
+ 'width': 18px,
+ 'height': 14px
+ ),
+ 'chevron-down': (
'width': 24px,
'height': 24px
),
- 'bookmarks': (
+ 'chevron': (
+ 'width': 256px,
+ 'height': 256px
+ ),
+ 'database': (
'width': 24px,
'height': 24px
),
- 'chevron-down': (
+ 'dots': (
+ 'width': 256px,
+ 'height': 256px
+ ),
+ 'entity-user-collection': (
+ 'width': 24px,
+ 'height': 24px
+ ),
+ 'help': (
+ 'width': 24px,
+ 'height': 24px
+ ),
+ 'navigation-blocks': (
+ 'width': 24px,
+ 'height': 24px
+ ),
+ 'navigation-content': (
'width': 24px,
'height': 24px
),
- 'create': (
+ 'navigation-create': (
'width': 24px,
'height': 24px
),
- 'extend-new': (
+ 'navigation-files': (
'width': 24px,
'height': 24px
),
- 'files': (
+ 'navigation-media': (
'width': 24px,
'height': 24px
),
- 'media': (
+ 'navigation-user-links-user-wrapper': (
'width': 24px,
'height': 24px
),
- 'people-new': (
+ 'shortcuts': (
+ 'width': 24px,
+ 'height': 24px
+ ),
+ 'system-admin-config': (
+ 'width': 24px,
+ 'height': 24px
+ ),
+ 'system-admin-reports': (
+ 'width': 24px,
+ 'height': 24px
+ ),
+ 'system-admin-structure': (
+ 'width': 24px,
+ 'height': 24px
+ ),
+ 'system-modules-list': (
+ 'width': 24px,
+ 'height': 24px
+ ),
+ 'system-themes-page': (
+ 'width': 24px,
+ 'height': 24px
+ ),
+ 'warning': (
'width': 24px,
'height': 24px
),
@@ -260,10 +318,6 @@ $sizes: (
'width': 24px,
'height': 24px
),
- 'database': (
- 'width': 24px,
- 'height': 24px
- ),
'php': (
'width': 24px,
'height': 24px
@@ -372,10 +426,6 @@ $sizes: (
'width': 24px,
'height': 24px
),
- 'help': (
- 'width': 24px,
- 'height': 24px
- ),
'local-tasks': (
'width': 24px,
'height': 24px
diff --git a/styles/helpers/_toolbar-icons.scss b/styles/helpers/_toolbar-icons.scss
index 248afafa00319dda46c8e43d0dd6f32704145c63..e42918d8080212030091370a5e617524e6b9852e 100644
--- a/styles/helpers/_toolbar-icons.scss
+++ b/styles/helpers/_toolbar-icons.scss
@@ -5,62 +5,11 @@
--icon: #{icon('tool')};
}
-.toolbar-icon-system-themes-page::before,
-.toolbar-link--system-themes-page::before,
-.toolbar-button--icon--system-themes-page::before {
- --icon: #{icon('appearance')};
-}
-
-.toolbar-link--blocks::before,
-.toolbar-button--icon--navigation-blocks::before {
- --icon: #{icon('blocks')};
-}
-
.toolbar-link--bookmarks::before,
.toolbar-button--icon--bookmarks::before {
--icon: #{icon('bookmarks')};
}
-.toolbar-icon-shortcut::before,
-.toolbar-button--icon--shortcuts::before {
- --icon: #{icon('shortcut')};
-}
-
-.toolbar-icon-system-admin-config::before,
-.toolbar-link--system-admin-config::before,
-.toolbar-button--icon--system-admin-config::before {
- --icon: #{icon('config')};
-}
-
-.toolbar-icon-system-admin-content::before,
-.toolbar-link--content::before,
-.toolbar-button--icon--navigation-content::before {
- --icon: #{icon('content')};
-}
-
-.toolbar-link--create::before,
-.toolbar-button--icon--navigation-create::before {
- --icon: #{icon('create')};
-}
-
-.toolbar-icon-system-modules-list::before,
-.toolbar-link--system-modules-list::before,
-.toolbar-button--icon--system-modules-list::before {
- --icon: #{icon('extend-new')};
-}
-
-.toolbar-link--files::before,
-.toolbar-button--icon--navigation-files::before {
- --icon: #{icon('files')};
-}
-
-.toolbar-icon-help-main::before,
-.toolbar-icon-help::before,
-.toolbar-link--help::before,
-.toolbar-button--icon--help::before {
- --icon: #{icon('help')};
-}
-
.toolbar-icon-commerce-admin-commerce::before,
.toolbar-link--commerce-admin-commerce::before,
.toolbar-button--icon--commerce-admin-commerce::before,
@@ -70,29 +19,6 @@
--icon: #{icon('commerce')};
}
-.toolbar-link--media::before,
-.toolbar-button--icon--navigation-media::before {
- --icon: #{icon('media')};
-}
-
-.toolbar-icon-entity-user-collection::before,
-.toolbar-link--entity-user-collection::before,
-.toolbar-button--icon--entity-user-collection::before {
- --icon: #{icon('people-new')};
-}
-
-.toolbar-icon-system-admin-reports::before,
-.toolbar-link--system-admin-reports::before,
-.toolbar-button--icon--system-admin-reports::before {
- --icon: #{icon('reports')};
-}
-
-.toolbar-icon-system-admin-structure::before,
-.toolbar-link--system-admin-structure::before,
-.toolbar-button--icon--system-admin-structure::before {
- --icon: #{icon('structure')};
-}
-
.toolbar-icon-entity-webform-collection::before,
.toolbar-link--entity-webform-collection::before,
.toolbar-button--icon--entity-webform-collection::before {
@@ -106,19 +32,6 @@
--icon: #{icon('chevron-down')};
}
-.toolbar-icon-user::before,
-.toolbar-link--user::before,
-.toolbar-button--icon--user::before {
- --icon: #{icon('user')};
-}
-
-.toolbar-icon-announcements-feed-announcement::before,
-.toolbar-icon-announce::before,
-.toolbar-link--announcements-feed-announcement::before,
-.toolbar-button--icon--announcements-feed-announcement::before {
- --icon: #{icon('announcement')};
-}
-
.toolbar-icon-system-admin-group::before,
.toolbar-link--system-admin-group::before,
.toolbar-button--icon--system-admin-group::before {
diff --git a/styles/navigation/toolbar-link.scss b/styles/navigation/toolbar-link.scss
index 8b83b78d38f8ebb4066294a0479586932020edef..115237c06162341412264916c0a6be122144e273 100644
--- a/styles/navigation/toolbar-link.scss
+++ b/styles/navigation/toolbar-link.scss
@@ -3,7 +3,7 @@
* Toolbar linke styles.
*/
- .toolbar-link {
+.toolbar-link {
position: relative;
padding-block: 10px;
padding-inline: 0;
@@ -170,10 +170,6 @@ html:not(.admin-toolbar-expanded) {
// --icon: url(../../assets/icons/appearance.svg);
// }
-// .toolbar-link--blocks::before {
-// --icon: url(../../assets/icons/blocks.svg);
-// }
-
// .toolbar-link--bookmarks::before {
// --icon: url(../../assets/icons/bookmarks.svg);
// }