Merge pull request #1045 from pat270/clay-1044

Update: (Fixes #1044) Atlas set Checkbox labels to be normal and semi…
liferay · Jun 28, 2018 · 12c4611 · 12c4611
2 parents fc47d66 + 2973bc3
commit 12c4611
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/packages/clay-css/src/scss/atlas/variables/_dropdowns.scss b/packages/clay-css/src/scss/atlas/variables/_dropdowns.scss
@@ -19,6 +19,7 @@ $dropdown-subheader-font-size: 0.75rem !default; // 12px
 $dropdown-subheader-margin-top: 0.625rem !default; // 10px
 
 $dropdown-link-color: $secondary !default;
+$dropdown-link-font-weight: $font-weight-normal !default;
 $dropdown-link-hover-color: $body-color !default;
 $dropdown-link-hover-bg: lighten($component-active-bg, 44.90) !default;
 $dropdown-link-active-color: $dropdown-link-hover-color !default;

diff --git a/packages/clay-css/src/scss/components/_dropdowns.scss b/packages/clay-css/src/scss/components/_dropdowns.scss
@@ -62,9 +62,17 @@
 	&.active {
 		font-weight: $dropdown-link-active-font-weight;
 
-		label,
+		label {
+			color: $dropdown-link-active-color;
+		}
+
 		.form-check-label {
 			color: $dropdown-link-active-color;
+			font-weight: $dropdown-link-active-font-weight;
+		}
+
+		.custom-control-label {
+			font-weight: $dropdown-link-active-font-weight;
 		}
 	}
 
@@ -93,7 +101,7 @@
 	}
 
 	&.btn-unstyled {
-		font-weight: $font-weight-normal;
+		font-weight: $dropdown-link-font-weight;
 		padding: $dropdown-item-padding-y $dropdown-item-padding-x;
 		transition: none;
 	}
@@ -102,11 +110,19 @@
 		margin-bottom: 0;
 	}
 
+	.form-check-label {
+		font-weight: $dropdown-link-font-weight;
+	}
+
 	.custom-control {
 		margin-bottom: 0;
 		margin-right: 0;
 		min-height: $custom-control-indicator-size;
 	}
+
+	.custom-control-label {
+		font-weight: $dropdown-link-font-weight;
+	}
 }
 
 .dropdown-section {

diff --git a/packages/clay-css/src/scss/variables/_dropdowns.scss b/packages/clay-css/src/scss/variables/_dropdowns.scss
@@ -28,6 +28,7 @@ $dropdown-caption-color: $dropdown-header-color !default;
 $dropdown-caption-font-size: 0.875rem !default; // 14px
 $dropdown-caption-font-weight: null !default;
 
+$dropdown-link-font-weight: null !default;
 $dropdown-link-active-font-weight: null !default;
 
 $dropdown-max-height: 500px !default;