Update: (Fixes #1088) List Group variables $list-group-text-link an…

…d `$list-group-subtext-link` should follow same pattern as `$list-group-title-link`
liferay · Aug 15, 2018 · 3958ebd · 3958ebd
1 parent 2cf6bad
commit 3958ebd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 38 deletions.
diff --git a/packages/clay-css/src/scss/atlas/variables/_list-group.scss b/packages/clay-css/src/scss/atlas/variables/_list-group.scss
@@ -44,28 +44,28 @@ $list-group-subtitle-link: map-merge((
 
 // List Group Text
 
-$list-group-text: () !default;
-$list-group-text: map-merge((
-	line-height: 1.45
-), $list-group-text);
-
 $list-group-text-link: () !default;
 $list-group-text-link: map-merge((
 	hover-color: $body-color
 ), $list-group-text-link);
 
-// List Group Subtext
-
-$list-group-subtext: () !default;
-$list-group-subtext: map-merge((
+$list-group-text: () !default;
+$list-group-text: map-merge((
 	line-height: 1.45
-), $list-group-subtext);
+), $list-group-text);
+
+// List Group Subtext
 
 $list-group-subtext-link: () !default;
 $list-group-subtext-link: map-merge((
 	hover-color: $body-color
 ), $list-group-subtext-link);
 
+$list-group-subtext: () !default;
+$list-group-subtext: map-merge((
+	line-height: 1.45
+), $list-group-subtext);
+
 // List Group Link
 
 $list-group-link-color: $body-color !default;

diff --git a/packages/clay-css/src/scss/components/_list-group.scss b/packages/clay-css/src/scss/components/_list-group.scss
@@ -70,40 +70,24 @@
 	@include clay-text-typography($list-group-title);
 }
 
-// .list-group-title a {
-// 	@include clay-link($list-group-title-link);
-// }
-
 // List Group Subtitle
 
 .list-group-subtitle {
 	@include clay-text-typography($list-group-subtitle);
 }
 
-// .list-group-subtitle a {
-// 	@include clay-link($list-group-subtitle-link);
-// }
-
 // List Group Text
 
 .list-group-text {
 	@include clay-text-typography($list-group-text);
 }
 
-.list-group-text-link {
-	@include clay-link($list-group-text-link);
-}
-
 // List Group Subtext
 
 .list-group-subtext {
 	@include clay-text-typography($list-group-subtext);
 }
 
-.list-group-subtext-link {
-	@include clay-link($list-group-subtext-link);
-}
-
 // List Group Details
 
 .list-group-detail {

diff --git a/packages/clay-css/src/scss/variables/_list-group.scss b/packages/clay-css/src/scss/variables/_list-group.scss
@@ -62,34 +62,36 @@ $list-group-subtitle: map-merge((
 
 // List Group Text
 
-$list-group-text: () !default;
-$list-group-text: map-merge((
-	color: $body-color,
-	margin-bottom: 0
-), $list-group-text);
-
 $list-group-text-link: () !default;
 $list-group-text-link: map-merge((
 	color: $body-color,
 	hover-color: darken($body-color, 15%)
 ), $list-group-text-link);
 
+$list-group-text: () !default;
+$list-group-text: map-merge((
+	color: $body-color,
+	margin-bottom: 0,
+	clay-link: $list-group-text-link
+), $list-group-text);
+
 $list-group-text-active-color: $list-group-active-color !default;
 
 // List Group Subtext
 
-$list-group-subtext: () !default;
-$list-group-subtext: map-merge((
-	color: $secondary,
-	margin-bottom: 0
-), $list-group-subtext);
-
 $list-group-subtext-link: () !default;
 $list-group-subtext-link: map-merge((
 	color: $secondary,
 	hover-color: darken($secondary, 15%)
 ), $list-group-subtext-link);
 
+$list-group-subtext: () !default;
+$list-group-subtext: map-merge((
+	color: $secondary,
+	margin-bottom: 0,
+	clay-link: $list-group-subtext-link
+), $list-group-subtext);
+
 $list-group-subtext-active-color: $list-group-active-color !default;
 
 // List Group Detail