Update: Base set Card Link colors

liferay · Aug 8, 2017 · af90a9d · af90a9d
1 parent 8743b51
commit af90a9d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/scss/lexicon-base/_cards.scss b/src/scss/lexicon-base/_cards.scss
@@ -24,6 +24,7 @@
 
 		@include component-btn-link;
 
+		line-height: normal;
 		text-decoration: $card-link-text-decoration;
 
 		@include hover-focus {
@@ -50,6 +51,10 @@
 		color: $card-link-hover-color;
 		text-decoration: $card-link-hover-text-decoration;
 	}
+
+	+ .card-link {
+		margin-left: 0;
+	}
 }
 
 .show > button.card-link {
@@ -60,6 +65,8 @@ button.card-link {
 	background-color: transparent;
 
 	@include component-btn-link;
+
+	line-height: normal;
 }
 
 .card-row {

diff --git a/src/scss/lexicon-base/variables/_cards.scss b/src/scss/lexicon-base/variables/_cards.scss
@@ -15,10 +15,10 @@ $checkbox-position: 15px !default;
 $card-border-style: solid !default;
 $card-box-shadow: null !default;
 
-$card-link-color: null !default;
+$card-link-color: $link-color !default;
 $card-link-text-decoration: null !default;
-$card-link-hover-color: null !default;
-$card-link-hover-text-decoration: null !default;
+$card-link-hover-color: $link-hover-color !default;
+$card-link-hover-text-decoration: none !default;
 
 $card-rounded-inner-border-radius: if($card-border-width > 0, calc(#{$rounded-border-radius} - #{$card-border-width}), $rounded-border-radius) !default;
 $card-rounded-0-inner-border-radius: if($rounded-0-border-radius > $card-border-width, calc(#{$rounded-0-border-radius} - #{$card-border-width}), 0) !default;