From a83aa8a1166333abd42ef5af76337b6d34b2bbb0 Mon Sep 17 00:00:00 2001
From: Maximilian Franzke <Maximilian.Franzke@deutschebahn.com>
Date: Wed, 6 Dec 2023 11:01:54 +0100
Subject: [PATCH 1/6] refactor: provide possibility to overwrite standard icon
 for this component

---
 .../overflow-menu/overflow-menu.hbs           |  2 +-
 .../overflow-menu/overflow-menu.scss          | 31 ++++++++++++++-----
 .../overflow-menu~individual-icon.json        |  5 +++
 .../overflow-menu~individual-icon.md          |  9 ++++++
 4 files changed, 39 insertions(+), 8 deletions(-)
 create mode 100644 source/_patterns/02-components/overflow-menu/overflow-menu~individual-icon.json
 create mode 100644 source/_patterns/02-components/overflow-menu/overflow-menu~individual-icon.md

diff --git a/source/_patterns/02-components/overflow-menu/overflow-menu.hbs b/source/_patterns/02-components/overflow-menu/overflow-menu.hbs
index 43de0cc80d..d71ddedcc0 100644
--- a/source/_patterns/02-components/overflow-menu/overflow-menu.hbs
+++ b/source/_patterns/02-components/overflow-menu/overflow-menu.hbs
@@ -1,5 +1,5 @@
 {{#if linkEntries }}<!-- [html-validate-disable-next prefer-native-element -- TODO: Evaluate again on this HTML] -->{{/if }}
-<details class="{{#if patternName }}{{ patternName }}{{else}}cmp-overflow-menu{{/if }}{{ styleModifier }}"{{#if linkEntries }} role="navigation"{{/if }}{{#if oppositePosition}} data-horizontal-position="opposite"{{/if }}>
+<details{{#if icon}} data-icon="{{icon}}"{{/if }} class="{{#if patternName }}{{ patternName }}{{else}}cmp-overflow-menu{{/if }}{{ styleModifier }}"{{#if linkEntries }} role="navigation"{{/if }}{{#if oppositePosition}} data-horizontal-position="opposite"{{/if }}>
 	<summary>{{ summary }}</summary>
 	{{#if linkEntries }}<ul role="group">{{else}}<menu type="toolbar">{{/if }}
 		{{#if linkEntries }}
diff --git a/source/_patterns/02-components/overflow-menu/overflow-menu.scss b/source/_patterns/02-components/overflow-menu/overflow-menu.scss
index 4ad5cf4665..0e5cccd5f8 100644
--- a/source/_patterns/02-components/overflow-menu/overflow-menu.scss
+++ b/source/_patterns/02-components/overflow-menu/overflow-menu.scss
@@ -12,14 +12,13 @@
 		}
 	}
 
-	summary {
-		@include icon(
-			$cmp-overflow-menu-icon,
-			20,
-			"outline",
-			$partial: $partial
-		);
+	&[data-icon] {
+		&::before {
+			content: initial;
+		}
+	}
 
+	summary {
 		display: inline-block;
 
 		&::before {
@@ -44,6 +43,24 @@
 		}
 	}
 
+	// Possibility to define an individual icon
+	&[data-icon] {
+		summary {
+			@include icon("", 20, "outline", $partial: $partial);
+		}
+	}
+
+	&:not([data-icon]) {
+		summary {
+			@include icon(
+				$cmp-overflow-menu-icon,
+				20,
+				"outline",
+				$partial: $partial
+			);
+		}
+	}
+
 	// Menu list
 	menu,
 	ul {
diff --git a/source/_patterns/02-components/overflow-menu/overflow-menu~individual-icon.json b/source/_patterns/02-components/overflow-menu/overflow-menu~individual-icon.json
new file mode 100644
index 0000000000..c0721cd9dc
--- /dev/null
+++ b/source/_patterns/02-components/overflow-menu/overflow-menu~individual-icon.json
@@ -0,0 +1,5 @@
+{
+	"linkEntries": true,
+	"id": "menu05",
+	"icon": "add"
+}
diff --git a/source/_patterns/02-components/overflow-menu/overflow-menu~individual-icon.md b/source/_patterns/02-components/overflow-menu/overflow-menu~individual-icon.md
new file mode 100644
index 0000000000..7e7e24f199
--- /dev/null
+++ b/source/_patterns/02-components/overflow-menu/overflow-menu~individual-icon.md
@@ -0,0 +1,9 @@
+---
+title: Overflow menu - Individual icon
+state: inreview
+order: 5
+---
+
+## Individual icon
+
+By defining an `[data-icon]` on the surrounding `details` HTML tag, you could overwrite the included standard icon for the button to open the overflow menu.

From 1ce0e5bc4a3bba82c3ef4979064c33c9f05904ed Mon Sep 17 00:00:00 2001
From: Maximilian Franzke <Maximilian.Franzke@deutschebahn.com>
Date: Wed, 6 Dec 2023 11:04:06 +0100
Subject: [PATCH 2/6] chore: simplification

---
 .../overflow-menu/overflow-menu.hbs           |  4 +-
 .../overflow-menu/overflow-menu.scss          | 38 +++++++------------
 .../overflow-menu~individual-icon.md          |  2 +-
 3 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/source/_patterns/02-components/overflow-menu/overflow-menu.hbs b/source/_patterns/02-components/overflow-menu/overflow-menu.hbs
index d71ddedcc0..44e36bedd1 100644
--- a/source/_patterns/02-components/overflow-menu/overflow-menu.hbs
+++ b/source/_patterns/02-components/overflow-menu/overflow-menu.hbs
@@ -1,6 +1,6 @@
 {{#if linkEntries }}<!-- [html-validate-disable-next prefer-native-element -- TODO: Evaluate again on this HTML] -->{{/if }}
-<details{{#if icon}} data-icon="{{icon}}"{{/if }} class="{{#if patternName }}{{ patternName }}{{else}}cmp-overflow-menu{{/if }}{{ styleModifier }}"{{#if linkEntries }} role="navigation"{{/if }}{{#if oppositePosition}} data-horizontal-position="opposite"{{/if }}>
-	<summary>{{ summary }}</summary>
+<details class="{{#if patternName }}{{ patternName }}{{else}}cmp-overflow-menu{{/if }}{{ styleModifier }}"{{#if linkEntries }} role="navigation"{{/if }}{{#if oppositePosition}} data-horizontal-position="opposite"{{/if }}>
+	<summary{{#if icon}} data-icon="{{icon}}"{{/if }}>{{ summary }}</summary>
 	{{#if linkEntries }}<ul role="group">{{else}}<menu type="toolbar">{{/if }}
 		{{#if linkEntries }}
 		<li>{{> elements-link href="#" value=entry01 }}</li>
diff --git a/source/_patterns/02-components/overflow-menu/overflow-menu.scss b/source/_patterns/02-components/overflow-menu/overflow-menu.scss
index 0e5cccd5f8..fb261d1ab5 100644
--- a/source/_patterns/02-components/overflow-menu/overflow-menu.scss
+++ b/source/_patterns/02-components/overflow-menu/overflow-menu.scss
@@ -12,14 +12,22 @@
 		}
 	}
 
-	&[data-icon] {
-		&::before {
-			content: initial;
-		}
-	}
-
 	summary {
+
 		display: inline-block;
+		// Possibility to define an individual icon
+		&[data-icon] {
+			@include icon("", 20, "outline", $partial: $partial);
+		}
+
+		&:not([data-icon]) {
+			@include icon(
+				$cmp-overflow-menu-icon,
+				20,
+				"outline",
+				$partial: $partial
+			);
+		}
 
 		&::before {
 			display: inline-block;
@@ -43,24 +51,6 @@
 		}
 	}
 
-	// Possibility to define an individual icon
-	&[data-icon] {
-		summary {
-			@include icon("", 20, "outline", $partial: $partial);
-		}
-	}
-
-	&:not([data-icon]) {
-		summary {
-			@include icon(
-				$cmp-overflow-menu-icon,
-				20,
-				"outline",
-				$partial: $partial
-			);
-		}
-	}
-
 	// Menu list
 	menu,
 	ul {
diff --git a/source/_patterns/02-components/overflow-menu/overflow-menu~individual-icon.md b/source/_patterns/02-components/overflow-menu/overflow-menu~individual-icon.md
index 7e7e24f199..a7616dbcee 100644
--- a/source/_patterns/02-components/overflow-menu/overflow-menu~individual-icon.md
+++ b/source/_patterns/02-components/overflow-menu/overflow-menu~individual-icon.md
@@ -6,4 +6,4 @@ order: 5
 
 ## Individual icon
 
-By defining an `[data-icon]` on the surrounding `details` HTML tag, you could overwrite the included standard icon for the button to open the overflow menu.
+By defining an `[data-icon]` on the included `summary` HTML tag, you could overwrite the included standard icon for the button to open the overflow menu.

From a3efe7ac99d6216adb5256917905be455d605c6c Mon Sep 17 00:00:00 2001
From: Maximilian Franzke <Maximilian.Franzke@deutschebahn.com>
Date: Wed, 6 Dec 2023 11:07:05 +0100
Subject: [PATCH 3/6] chore: restructuring

---
 .../02-components/overflow-menu/overflow-menu.scss        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/_patterns/02-components/overflow-menu/overflow-menu.scss b/source/_patterns/02-components/overflow-menu/overflow-menu.scss
index fb261d1ab5..11b9bf0f67 100644
--- a/source/_patterns/02-components/overflow-menu/overflow-menu.scss
+++ b/source/_patterns/02-components/overflow-menu/overflow-menu.scss
@@ -15,10 +15,6 @@
 	summary {
 
 		display: inline-block;
-		// Possibility to define an individual icon
-		&[data-icon] {
-			@include icon("", 20, "outline", $partial: $partial);
-		}
 
 		&:not([data-icon]) {
 			@include icon(
@@ -28,6 +24,10 @@
 				$partial: $partial
 			);
 		}
+		// Possibility to define an individual icon
+		&[data-icon] {
+			@include icon("", 20, "outline", $partial: $partial);
+		}
 
 		&::before {
 			display: inline-block;

From cc030b7cd0db788d224b713ecd9335570d3030bb Mon Sep 17 00:00:00 2001
From: Maximilian Franzke <Maximilian.Franzke@deutschebahn.com>
Date: Wed, 6 Dec 2023 11:11:50 +0100
Subject: [PATCH 4/6] chore: formatting

---
 source/_patterns/02-components/overflow-menu/overflow-menu.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source/_patterns/02-components/overflow-menu/overflow-menu.scss b/source/_patterns/02-components/overflow-menu/overflow-menu.scss
index 11b9bf0f67..03146c352b 100644
--- a/source/_patterns/02-components/overflow-menu/overflow-menu.scss
+++ b/source/_patterns/02-components/overflow-menu/overflow-menu.scss
@@ -13,7 +13,6 @@
 	}
 
 	summary {
-
 		display: inline-block;
 
 		&:not([data-icon]) {

From 05574cf2feee33c37896333ca348dc5a53f229e3 Mon Sep 17 00:00:00 2001
From: Maximilian Franzke <Maximilian.Franzke@deutschebahn.com>
Date: Wed, 6 Dec 2023 11:27:31 +0100
Subject: [PATCH 5/6] refactor: provide possibility to overwrite standard icon
 for this component

---
 source/_patterns/02-components/dropdown/dropdown.hbs     | 2 +-
 .../02-components/dropdown/dropdown~individual-icon.json | 3 +++
 .../02-components/dropdown/dropdown~individual-icon.md   | 9 +++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 source/_patterns/02-components/dropdown/dropdown~individual-icon.json
 create mode 100644 source/_patterns/02-components/dropdown/dropdown~individual-icon.md

diff --git a/source/_patterns/02-components/dropdown/dropdown.hbs b/source/_patterns/02-components/dropdown/dropdown.hbs
index df02cbdd3a..fd64b68ab6 100644
--- a/source/_patterns/02-components/dropdown/dropdown.hbs
+++ b/source/_patterns/02-components/dropdown/dropdown.hbs
@@ -1 +1 @@
-{{> components-overflow-menu patternName="cmp-dropdown" entry01="Profileinstellungen" entry02="Logout" }}
+{{> components-overflow-menu patternName="cmp-dropdown" entry01="Profileinstellungen" entry02="Logout" icon=icon }}
diff --git a/source/_patterns/02-components/dropdown/dropdown~individual-icon.json b/source/_patterns/02-components/dropdown/dropdown~individual-icon.json
new file mode 100644
index 0000000000..f33e6596c7
--- /dev/null
+++ b/source/_patterns/02-components/dropdown/dropdown~individual-icon.json
@@ -0,0 +1,3 @@
+{
+	"icon": "add"
+}
diff --git a/source/_patterns/02-components/dropdown/dropdown~individual-icon.md b/source/_patterns/02-components/dropdown/dropdown~individual-icon.md
new file mode 100644
index 0000000000..90e8b4f71e
--- /dev/null
+++ b/source/_patterns/02-components/dropdown/dropdown~individual-icon.md
@@ -0,0 +1,9 @@
+---
+title: Dropddown - Individual icon
+state: inreview
+order: 3
+---
+
+## Individual icon
+
+By defining an `[data-icon]` on the surrounding `details` HTML tag, you could overwrite the included standard icon for the button to open the overflow menu.

From a38e1888df596f6f81c13b48a3e9a2c9d207131e Mon Sep 17 00:00:00 2001
From: Maximilian Franzke <787658+mfranzke@users.noreply.github.com>
Date: Wed, 6 Dec 2023 11:40:59 +0100
Subject: [PATCH 6/6] Update dropdown~individual-icon.md

---
 .../02-components/dropdown/dropdown~individual-icon.md          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/_patterns/02-components/dropdown/dropdown~individual-icon.md b/source/_patterns/02-components/dropdown/dropdown~individual-icon.md
index 90e8b4f71e..954cdbe9ea 100644
--- a/source/_patterns/02-components/dropdown/dropdown~individual-icon.md
+++ b/source/_patterns/02-components/dropdown/dropdown~individual-icon.md
@@ -6,4 +6,4 @@ order: 3
 
 ## Individual icon
 
-By defining an `[data-icon]` on the surrounding `details` HTML tag, you could overwrite the included standard icon for the button to open the overflow menu.
+By defining an `[data-icon]` on the included `summary` HTML tag, you could overwrite the included standard icon for the button to open the overflow menu.