From 23bd820842ac9353e6062964c0975c707edce9b1 Mon Sep 17 00:00:00 2001
From: ilhan <ilhan.myumyun@sap.com>
Date: Fri, 19 Jul 2019 11:08:43 +0300
Subject: [PATCH 1/4] refactor(ui5-link): clean up styles

---
 packages/main/src/Link.js                     |   7 +-
 packages/main/src/themes/Link.css             | 124 ++++++++++++------
 .../sap/ui/webcomponents/main/pages/Link.html |   2 +
 3 files changed, 88 insertions(+), 45 deletions(-)

diff --git a/packages/main/src/Link.js b/packages/main/src/Link.js
index 2f3b6ea051b1..3cb9eda55083 100644
--- a/packages/main/src/Link.js
+++ b/packages/main/src/Link.js
@@ -207,12 +207,7 @@ class Link extends UI5Element {
 	get classes() {
 		return {
 			main: {
-				sapMLnk: true,
-				sapMLnkSubtle: this.design === LinkDesign.Subtle,
-				sapMLnkEmphasized: this.design === LinkDesign.Emphasized,
-				sapMLnkWrapping: this.wrap,
-				sapMLnkDsbl: this.disabled,
-				sapMLnkMaxWidth: true,
+				"ui5-link-root": true,
 			},
 		};
 	}
diff --git a/packages/main/src/themes/Link.css b/packages/main/src/themes/Link.css
index e639c641c20f..6a2f0c735373 100644
--- a/packages/main/src/themes/Link.css
+++ b/packages/main/src/themes/Link.css
@@ -1,49 +1,26 @@
-:host(ui5-link:not([hidden])) {
+:host(:not([hidden])) {
 	display: inline-flex;
-	max-width: 100%;
-}
-
-:host([disabled]) {
-	pointer-events: none;
 }
 
-ui5-link[disabled] {
-	pointer-events: none;
-}
-
-ui5-link {
-	display: inline-block;
+:host {
 	max-width: 100%;
-}
-
-.sapMLnk {
 	color: var(--sapUiLink);
-	text-decoration: none;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	word-wrap: normal;
 	font-family: var(--sapUiFontFamily);
 	font-size: var(--sapMFontMediumSize);
 	cursor: pointer;
-	display: inline-block;
-	justify-content: center;
-	align-items: center;
-	position: relative;
-	outline: none;
 }
 
-.sapMLnk:not(.sapMLnkDsbl):hover,
-.sapMLnk.sapMLnkSubtle:not(.sapMLnkDsbl):hover {
-	text-decoration: underline;
-	color: var(--sapUiLinkHover);
+:host([disabled]) {
+	pointer-events: none;
 }
 
-.sapMLnk:visited {
-	color: var(--sapUiLinkVisited);
+:host([design="Subtle"]):not([disabled]) .ui5-link-root:hover,
+:host([design="Subtle"]):not([disabled]) .ui5-link-root:hover {
+	text-decoration: underline;
+	color: var(--sapUiLinkHover);
 }
 
-.sapMLnk.sapMLnkDsbl {
+:host([disabled]) .ui5-link-root {
 	text-shadow: none;
 	outline: none;
 	cursor: default;
@@ -51,29 +28,46 @@ ui5-link {
 	opacity: var(--_ui5_link_opacity);
 }
 
-.sapMLnk.sapMLnkEmphasized {
+:host([design="Emphasized"]) .ui5-link-root {
 	font-weight: bold;
 }
 
-.sapMLnk.sapMLnkSubtle,
-.sapMLnk.sapMLnkSubtle:visited {
+:host([design="Subtle"]) .ui5-link-root,
+:host([design="Subtle"]) .ui5-link-root:visited {
 	color: var(--_ui5_link_subtle_color);
 }
 
-.sapMLnk.sapMLnkSubtle:focus {
+:host([design="Subtle"]) .ui5-link-root:focus {
 	color: var(--sapUiLink);
 }
 
-.sapMLnk.sapMLnkWrapping {
+:host([wrap]) .ui5-link-root {
 	white-space: normal;
 	word-wrap: break-word;
 }
 
-.sapMLnk:focus {
+.ui5-link-root {
+	display: inline-block;
+	position: relative;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	word-wrap: normal;
+	text-decoration: none;
+	outline: none;
+}
+
+.ui5-link-root,
+.ui5-link-root:visited,
+.ui5-link-root:active {
+	color: currentColor;
+}
+
+.ui5-link-root:focus {
 	text-decoration: underline;
 }
 
-.sapMLnk:focus::after {
+.ui5-link-root:focus::after {
 	content: "";
 	width: var(--_ui5_link_outline_element_size);
 	height: var(--_ui5_link_outline_element_size);
@@ -83,3 +77,55 @@ ui5-link {
 	top: 0;
 	outline: none;
 }
+
+/* 
+ * IE pair of styles,
+ * to be removed later on
+ */
+ui5-link:not([hidden]) {
+	display: inline-flex;
+}
+
+ui5-link {
+	max-width: 100%;
+	color: var(--sapUiLink);
+	font-family: var(--sapUiFontFamily);
+	font-size: var(--sapMFontMediumSize);
+	cursor: pointer;
+}
+
+ui5-link[disabled] {
+	pointer-events: none;
+}
+
+ui5-link[design="Subtle"]:not([disabled]) .ui5-link-root:hover,
+ui5-link[design="Subtle"]:not([disabled]) .ui5-link-root:hover {
+	text-decoration: underline;
+	color: var(--sapUiLinkHover);
+}
+
+ui5-link[disabled] .ui5-link-root {
+	text-shadow: none;
+	outline: none;
+	cursor: default;
+	pointer-events: none;
+	opacity: var(--_ui5_link_opacity);
+}
+
+ui5-link[design="Emphasized"] .ui5-link-root {
+	font-weight: bold;
+}
+
+ui5-link[design="Subtle"] .ui5-link-root,
+ui5-link[design="Subtle"] .ui5-link-root:visited {
+	color: var(--_ui5_link_subtle_color);
+}
+
+ui5-link[design="Subtle"] .ui5-link-root:focus {
+	color: var(--sapUiLink);
+}
+
+ui5-link[wrap] .ui5-link-root {
+	white-space: normal;
+	word-wrap: break-word;
+}
\ No newline at end of file
diff --git a/packages/main/test/sap/ui/webcomponents/main/pages/Link.html b/packages/main/test/sap/ui/webcomponents/main/pages/Link.html
index be878360b4e0..000def9561e2 100644
--- a/packages/main/test/sap/ui/webcomponents/main/pages/Link.html
+++ b/packages/main/test/sap/ui/webcomponents/main/pages/Link.html
@@ -10,6 +10,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta charset="utf-8">
 
+	<script>delete Document.prototype.adoptedStyleSheets;</script>
+	
 	<script data-ui5-config type="application/json">
 		{
 			"language": "EN"

From 2e32e5452e3babb1af39052c77be3c47249cbf39 Mon Sep 17 00:00:00 2001
From: ilhan <ilhan.myumyun@sap.com>
Date: Fri, 19 Jul 2019 11:12:46 +0300
Subject: [PATCH 2/4] firther clean up

---
 packages/main/src/Link.hbs | 2 +-
 packages/main/src/Link.js  | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/main/src/Link.hbs b/packages/main/src/Link.hbs
index df8928f1bf19..3e580320964e 100644
--- a/packages/main/src/Link.hbs
+++ b/packages/main/src/Link.hbs
@@ -1,5 +1,5 @@
 <a
-	class="{{classes.main}}"
+	class="ui5-link-root"
 	role="link"
 	href="{{parsedRef}}"
 	target="{{target}}"
diff --git a/packages/main/src/Link.js b/packages/main/src/Link.js
index 3cb9eda55083..4e086c493cd6 100644
--- a/packages/main/src/Link.js
+++ b/packages/main/src/Link.js
@@ -204,14 +204,6 @@ class Link extends UI5Element {
 		return this.disabled ? "true" : undefined;
 	}
 
-	get classes() {
-		return {
-			main: {
-				"ui5-link-root": true,
-			},
-		};
-	}
-
 	get parsedRef() {
 		return this.href.length > 0 ? this.href : undefined;
 	}

From 484063858d9fa81c2e1c406305094120597e5dbf Mon Sep 17 00:00:00 2001
From: ilhan <ilhan.myumyun@sap.com>
Date: Fri, 19 Jul 2019 11:52:37 +0300
Subject: [PATCH 3/4] fix qunit tests

---
 .../ui/webcomponents/main/qunit/Link.qunit.js | 38 ++-----------------
 1 file changed, 3 insertions(+), 35 deletions(-)

diff --git a/packages/main/test/sap/ui/webcomponents/main/qunit/Link.qunit.js b/packages/main/test/sap/ui/webcomponents/main/qunit/Link.qunit.js
index 86beef0de12b..8ae5f4307a1a 100644
--- a/packages/main/test/sap/ui/webcomponents/main/qunit/Link.qunit.js
+++ b/packages/main/test/sap/ui/webcomponents/main/qunit/Link.qunit.js
@@ -7,7 +7,7 @@ TestHelper.ready(function() {
 	QUnit.module("Rendering", function (hooks) {
 		hooks.before(function() {
 			this.getLinkRoot = function() {
-				return this.link.shadowRoot.querySelector(".sapMLnk");
+				return this.link.shadowRoot.querySelector(".ui5-link-root");
 			};
 		});
 		hooks.beforeEach(function () {
@@ -32,12 +32,7 @@ TestHelper.ready(function() {
 		QUnit.test("Default settings", function (assert) {
 			assert.expect(6);
 
-			var link = this.getLinkRoot(),
-				classes = ["sapMLnkEmphasized", "sapMLnkSubtle", "sapMLnkWrapping", "sapMLnkDsbl"];
-
-			classes.forEach(function(className) {
-				assert.notOk(link.classList.contains(className), "root element does not contain " + className);
-			});
+			var link = this.getLinkRoot();
 
 			assert.notOk(link.getAttribute('href'), "Rendered without 'href' by default");
 			assert.notOk(link.getAttribute('target'), "Rendered without 'target' by default");
@@ -51,7 +46,7 @@ TestHelper.ready(function() {
 			};
 
 			this.getLinkRoot = function() {
-				return this.link.shadowRoot.querySelector(".sapMLnk");
+				return this.link.shadowRoot.querySelector(".ui5-link-root");
 			};
 
 			this.getLinkInternalControl = function() {
@@ -71,29 +66,6 @@ TestHelper.ready(function() {
 			this.link = null;
 		});
 
-		QUnit.test("set boolean props", function (assert) {
-			assert.expect(2);
-
-			var done = assert.async(),
-				link = this.getLink(),
-				linkRoot = this.getLinkRoot(),
-				expectedClassеs = ["sapMLnkWrapping", "sapMLnkDsbl"],
-				props = ["wrap", "disabled"];
-
-			// act
-			props.forEach(function(prop) {
-				link[prop] = true;
-			});
-
-			RenderScheduler.whenFinished().then(function () {
-				expectedClassеs.forEach(function(className) {
-					// assert
-					assert.ok(linkRoot.classList.contains(className), "root element contain " + className);
-				});
-
-				done();
-			});
-		});
 
 		QUnit.test("set string props", function (assert) {
 			assert.expect(3);
@@ -111,9 +83,6 @@ TestHelper.ready(function() {
 				}, {
 					prop: 'target',
 					value: expectedTarget
-				}, {
-					prop: 'design',
-					value: type1
 				}];
 
 			props.forEach(function(propInfo) {
@@ -125,7 +94,6 @@ TestHelper.ready(function() {
 				// assert
 				assert.equal(linkRoot.getAttribute("href"), expectedHref, "'href' has been set");
 				assert.equal(linkRoot.getAttribute("target"), expectedTarget, "'target' has been set");
-				assert.ok(linkRoot.classList.contains("sapMLnkEmphasized"), "root element contain sapMLnkSubtle");
 				done();
 			});
 		});

From 05802dcafc0cb3f51029cef41a8ed76213b609e9 Mon Sep 17 00:00:00 2001
From: ilhan <ilhan.myumyun@sap.com>
Date: Fri, 19 Jul 2019 13:54:02 +0300
Subject: [PATCH 4/4] fix qunit tests 2

---
 .../sap/ui/webcomponents/main/qunit/Link.qunit.js    | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/packages/main/test/sap/ui/webcomponents/main/qunit/Link.qunit.js b/packages/main/test/sap/ui/webcomponents/main/qunit/Link.qunit.js
index 8ae5f4307a1a..cf9b7376be1c 100644
--- a/packages/main/test/sap/ui/webcomponents/main/qunit/Link.qunit.js
+++ b/packages/main/test/sap/ui/webcomponents/main/qunit/Link.qunit.js
@@ -30,7 +30,7 @@ TestHelper.ready(function() {
 		});
 
 		QUnit.test("Default settings", function (assert) {
-			assert.expect(6);
+			assert.expect(2);
 
 			var link = this.getLinkRoot();
 
@@ -48,10 +48,6 @@ TestHelper.ready(function() {
 			this.getLinkRoot = function() {
 				return this.link.shadowRoot.querySelector(".ui5-link-root");
 			};
-
-			this.getLinkInternalControl = function() {
-				return this.link.internalControl;
-			};
 		});
 		hooks.beforeEach(function () {
 			var html = '<ui5-link id="myLink"></ui5-link>';
@@ -66,16 +62,14 @@ TestHelper.ready(function() {
 			this.link = null;
 		});
 
-
 		QUnit.test("set string props", function (assert) {
-			assert.expect(3);
+			assert.expect(2);
 
 			var done = assert.async(),
 				link = this.getLink(),
 				linkRoot = this.getLinkRoot(),
 				expectedHref = "https://sap.com",
-				expectedTarget = '_blank',
-				type1 = "Emphasized";
+				expectedTarget = '_blank';
 
 			var props = [{
 					prop: 'href',