Add latest changes from gitlab-org/gitlab@master

3 files changed, 2 insertions, 20 deletions

diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index 875de57cfcc..ed5c133950d 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -42,16 +42,6 @@ html [type="button"],
 }
 
 h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  color: $gl-text-color;
-  font-weight: 600;
-}
-
-h1,
 .h1,
 h2,
 .h2,
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index b2bbc09664c..69aed2fc20a 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -567,16 +567,6 @@ body {
   font-weight: $gl-font-weight-bold;
 }
 
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  color: $gl-text-color;
-  font-weight: $gl-font-weight-bold;
-}
-
 .light-header {
   font-weight: $gl-font-weight-bold;
 }
diff --git a/app/assets/stylesheets/framework/variables_overrides.scss b/app/assets/stylesheets/framework/variables_overrides.scss
index 7538459c97b..ef75dabbda4 100644
--- a/app/assets/stylesheets/framework/variables_overrides.scss
+++ b/app/assets/stylesheets/framework/variables_overrides.scss
@@ -35,6 +35,8 @@ $h3-font-size: 14px * 1.75;
 $h4-font-size: 14px * 1.5;
 $h5-font-size: 14px * 1.25;
 $h6-font-size: 14px;
+$headings-color: $gl-text-color;
+$headings-font-weight: $gl-font-weight-bold;
 $spacer: $grid-size;
 $spacers: (
   0: 0,