Merge branch 'font-weight-adjusted' into 'master'

Changed all font-weight values to 400 and 600 Closes #34138 See merge request !12896

Merge branch 'font-weight-adjusted' into 'master'
Changed all font-weight values to 400 and 600 Closes #34138 See merge request !12896
88892e43 · Annabel Dunstone Gray · c1f12ff5 · 82c002eb · 88892e43 · 88892e43
Commit 88892e43 authored Aug 24, 2017 by Annabel Dunstone Gray
74 changed files
--- a/app/assets/stylesheets/framework/avatar.scss
+++ b/app/assets/stylesheets/framework/avatar.scss
@@ -78,7 +78,7 @@
  &.s60 { font-size: 32px; line-height: 58px; }
  &.s70 { font-size: 34px; line-height: 70px; }
  &.s90 { font-size: 36px; line-height: 88px; }
-  &.s110 { font-size: 40px; line-height: 108px; font-weight: 300; }
+  &.s110 { font-size: 40px; line-height: 108px; font-weight: $gl-font-weight-normal; }
  &.s140 { font-size: 72px; line-height: 138px; }
  &.s160 { font-size: 96px; line-height: 158px; }
 }

--- a/app/assets/stylesheets/framework/badges.scss
+++ b/app/assets/stylesheets/framework/badges.scss
 .badge {
-  font-weight: normal;
+  font-weight: $gl-font-weight-normal;
  background-color: $badge-bg;
  color: $badge-color;
  vertical-align: baseline;

--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -8,7 +8,7 @@
  text-align: center;
  padding: 20px;
  color: $gl-text-color;
-  font-weight: normal;
+  font-weight: $gl-font-weight-normal;
  font-size: 14px;
  line-height: 36px;

@@ -213,7 +213,7 @@

    h1 {
      display: inline;
-      font-weight: normal;
+      font-weight: $gl-font-weight-normal;
      font-size: 24px;
      color: $gl-text-color;
    }

--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
 @mixin btn-default {
  border-radius: 3px;
  font-size: $gl-font-size;
-  font-weight: 400;
+  font-weight: $gl-font-weight-normal;
  padding: $gl-vert-padding $gl-btn-padding;

  &:focus,

--- a/app/assets/stylesheets/framework/calendar.scss
+++ b/app/assets/stylesheets/framework/calendar.scss
@@ -52,13 +52,13 @@
  .pika-label {
    color: $gl-text-color-secondary;
    font-size: 14px;
-    font-weight: normal;
+    font-weight: $gl-font-weight-normal;
  }

  th {
    padding: 2px 0;
    color: $note-disabled-comment-color;
-    font-weight: normal;
+    font-weight: $gl-font-weight-normal;
    text-transform: lowercase;
    border-top: 1px solid $calendar-border-color;
  }
@@ -88,7 +88,7 @@
  .is-today {
    .pika-day {
      color: inherit;
-      font-weight: normal;
+      font-weight: $gl-font-weight-normal;
    }
  }


--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -36,12 +36,12 @@
  color: $common-gray;
  font-size: 14px;
  margin-bottom: 12px;
-  font-weight: normal;
+  font-weight: $gl-font-weight-normal;
  line-height: 24px;
 }

 .bold {
-  font-weight: 600;
+  font-weight: $gl-font-weight-bold;
 }

 .tab-content {
@@ -89,7 +89,7 @@ hr {
  }
 }

-.item-title { font-weight: 600; }
+.item-title { font-weight: $gl-font-weight-bold; }

 /** FLASH message **/
 .author_link,
@@ -118,18 +118,18 @@ table a code {
 span.update-author {
  display: block;
  color: $update-author-color;
-  font-weight: normal;
+  font-weight: $gl-font-weight-normal;
  font-style: italic;

  strong {
-    font-weight: bold;
+    font-weight: $gl-font-weight-bold;
    font-style: normal;
  }
 }

 .user-mention {
  color: $user-mention-color;
-  font-weight: bold;
+  font-weight: $gl-font-weight-bold;
 }

 .field_with_errors {
@@ -222,7 +222,7 @@ li.note {
  text-align: center;
  background: $error-bg;
  color: $white-light;
-  font-weight: bold;
+  font-weight: $gl-font-weight-bold;

  a {
    color: $white-light;
@@ -339,7 +339,7 @@ table {
 .header-with-avatar {
  h3 {
    margin: 0;
-    font-weight: bold;
+    font-weight: $gl-font-weight-bold;
  }

  .username {

--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -195,7 +195,7 @@
  margin-top: 2px;
  margin-bottom: 0;
  font-size: 14px;
-  font-weight: normal;
+  font-weight: $gl-font-weight-normal;
  padding: 8px 0;
  background-color: $white-light;
  border: 1px solid $dropdown-border-color;
@@ -268,7 +268,7 @@
  }

  .dropdown-bold-header {
-    font-weight: 600;
+    font-weight: $gl-font-weight-bold;
    line-height: 22px;
    padding: 0 16px;
  }
@@ -432,7 +432,7 @@

 .dropdown-menu-user-full-name {
  display: block;
-  font-weight: 500;
+  font-weight: $gl-font-weight-normal;
  line-height: 16px;
  text-overflow: ellipsis;
  overflow: hidden;
@@ -468,7 +468,7 @@

    &.is-indeterminate,
    &.is-active {
-      font-weight: 600;
+      font-weight: $gl-font-weight-bold;
      color: $gl-text-color;

      &::before {
@@ -502,7 +502,7 @@
  position: relative;
  padding: 2px 25px 10px;
  margin: 0 10px 10px;
-  font-weight: 600;
+  font-weight: $gl-font-weight-bold;
  line-height: 1;
  text-align: center;
  text-overflow: ellipsis;
@@ -685,7 +685,7 @@
 .dropdown-menu-inner-title {
  display: block;
  color: $gl-text-color;
-  font-weight: 600;
+  font-weight: $gl-font-weight-bold;
 }

 .dropdown-menu-inner-content {

--- a/app/assets/stylesheets/framework/filters.scss
+++ b/app/assets/stylesheets/framework/filters.scss
@@ -371,7 +371,7 @@
  }

  > .value {
-    font-weight: 600;
+    font-weight: $gl-font-weight-bold;
  }
 }

@@ -452,7 +452,7 @@

  .dropdown-light-content {
    font-size: 14px;
-    font-weight: 400;
+    font-weight: $gl-font-weight-normal;
  }

  .dropdown-user {

--- a/app/assets/stylesheets/framework/flash.scss
+++ b/app/assets/stylesheets/framework/flash.scss
@@ -25,7 +25,7 @@
    a.flash-action {
      margin-left: 5px;
      text-decoration: none;
-      font-weight: normal;
+      font-weight: $gl-font-weight-normal;
      border-bottom: 1px solid;

      &:hover {

--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -32,7 +32,7 @@ label {
  }

  &.label-light {
-    font-weight: 600;
+    font-weight: $gl-font-weight-bold;
  }
 }

@@ -73,7 +73,7 @@ label {
  margin-right: 0;

  .control-label {
-    font-weight: bold;
+    font-weight: $gl-font-weight-bold;
    padding-top: 4px;
  }

@@ -157,7 +157,7 @@ label {

 .form-group .control-label,
 .form-group .control-label-full-width {
-  font-weight: normal;
+  font-weight: $gl-font-weight-normal;
 }

 .form-control::-webkit-input-placeholder {

--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -160,7 +160,7 @@ header {

    li {
      &.active a {
-        font-weight: bold;
+        font-weight: $gl-font-weight-bold;
      }
    }
  }
@@ -250,7 +250,7 @@ header {
      font-size: 18px;
      line-height: 22px;
      display: inline-block;
-      font-weight: normal;
+      font-weight: $gl-font-weight-normal;
      color: $gl-text-color;
      vertical-align: top;
      white-space: nowrap;
@@ -326,7 +326,7 @@ header {
    .badge {
      position: inherit;
      top: -8px;
-      font-weight: normal;
+      font-weight: $gl-font-weight-normal;
      margin-left: -11px;
      font-size: 11px;
      color: $white-light;

--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -113,7 +113,7 @@ ul.content-list {
    }

    .title {
-      font-weight: 600;
+      font-weight: $gl-font-weight-bold;
    }

    a {
@@ -212,7 +212,7 @@ ul.content-list {
  }

  .row-title {
-    font-weight: 600;
+    font-weight: $gl-font-weight-bold;
  }

  .row-second-line {

--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -43,7 +43,7 @@
      background: $gray-light;

      a {
-        font-weight: 600;
+        font-weight: $gl-font-weight-bold;
      }
    }


--- a/app/assets/stylesheets/framework/modal.scss
+++ b/app/assets/stylesheets/framework/modal.scss
@@ -8,7 +8,7 @@
  }

  .text-danger {
-    font-weight: bold;
+    font-weight: $gl-font-weight-bold;
  }
 }


--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -70,7 +70,7 @@
    &.active a {
      border-bottom: 2px solid $link-underline-blue;
      color: $black;
-      font-weight: 600;
+      font-weight: $gl-font-weight-bold;

      .badge {
        color: $black;
@@ -352,7 +352,7 @@
      z-index: 300;

      li.active {
-        font-weight: bold;
+        font-weight: $gl-font-weight-bold;
      }
    }
  }

--- a/app/assets/stylesheets/framework/page-header.scss
+++ b/app/assets/stylesheets/framework/page-header.scss
@@ -43,7 +43,7 @@
  .commit-committer-link,
  .commit-author-link {
    color: $gl-text-color;
-    font-weight: bold;
+    font-weight: $gl-font-weight-bold;
  }

  .commit-info {

--- a/app/assets/stylesheets/framework/selects.scss
+++ b/app/assets/stylesheets/framework/selects.scss
@@ -76,7 +76,7 @@
 }

 .select2-results li.select2-result-with-children > .select2-result-label {
-  font-weight: 600;
+  font-weight: $gl-font-weight-bold;
  color: $gl-text-color;
 }

@@ -227,7 +227,7 @@
  }

  .group-name {
-    font-weight: bold;
+    font-weight: $gl-font-weight-bold;
  }

  .group-path {
@@ -252,12 +252,12 @@
 .namespace-result {
  .namespace-kind {
    color: $namespace-kind-color;
-    font-weight: normal;
+    font-weight: $gl-font-weight-normal;
  }

  .namespace-path {
    margin-left: 10px;
-    font-weight: bolder;
+    font-weight: $gl-font-weight-bold;
  }
 }

@@ -283,7 +283,7 @@
      padding: 0 1px;

      .select2-match {
-        font-weight: bold;
+        font-weight: $gl-font-weight-bold;
        text-decoration: none;
      }


--- a/app/assets/stylesheets/framework/snippets.scss
+++ b/app/assets/stylesheets/framework/snippets.scss
@@ -30,7 +30,7 @@

 .snippet-title {
  font-size: 24px;
-  font-weight: 600;
+  font-weight: $gl-font-weight-bold;
 }

 .snippet-edited-ago {

--- a/app/assets/stylesheets/framework/tables.scss
+++ b/app/assets/stylesheets/framework/tables.scss
@@ -32,7 +32,7 @@ table {

      th {
        background-color: $gray-light;
-        font-weight: normal;
+        font-weight: $gl-font-weight-normal;
        border-bottom: none;

        &.wide {

--- a/app/assets/stylesheets/framework/tw_bootstrap.scss
+++ b/app/assets/stylesheets/framework/tw_bootstrap.scss
@@ -103,7 +103,7 @@ summary {
  padding: 4px 5px;
  font-size: 12px;
  font-style: normal;
-  font-weight: normal;
+  font-weight: $gl-font-weight-normal;
  display: inline-block;

  &.label-gray {
@@ -165,7 +165,7 @@ summary {
    .panel-heading {
      padding: 6px 15px;
      font-size: 13px;
-      font-weight: normal;
+      font-weight: $gl-font-weight-normal;

      a {
        color: $panel-heading-link-color;

--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -74,7 +74,7 @@

  h1 {
    font-size: 1.75em;
-    font-weight: 600;
+    font-weight: $gl-font-weight-bold;
    margin: 24px 0 16px;
    padding-bottom: 0.3em;
    border-bottom: 1px solid $white-dark;
@@ -87,7 +87,7 @@

  h2 {
    font-size: 1.5em;
-    font-weight: 600;
+    font-weight: $gl-font-weight-bold;
    margin: 24px 0 16px;
    padding-bottom: 0.3em;
    border-bottom: 1px solid $white-dark;
@@ -280,7 +280,7 @@ body {
  margin-top: $gl-padding;
  line-height: 1.3;
  font-size: 1.25em;
-  font-weight: 600;
+  font-weight: $gl-font-weight-bold;

  &:last-child {
    margin-bottom: 0;
@@ -291,7 +291,7 @@ body {
  margin-top: 0;
  line-height: 1.3;
  font-size: 1.25em;
-  font-weight: 600;
+  font-weight: $gl-font-weight-bold;
  margin: 12px 7px;
 }

@@ -302,11 +302,11 @@ h4,
 h5,
 h6 {
  color: $gl-text-color;
-  font-weight: 600;
+  font-weight: $gl-font-weight-bold;
 }

 .light-header {
-  font-weight: 600;
+  font-weight: $gl-font-weight-bold;
 }

 /** CODE **/

--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -111,6 +111,8 @@ $well-light-text-color: #5b6169;
 * Text
 */
 $gl-font-size: 14px;
+$gl-font-weight-normal: 400;
+$gl-font-weight-bold: 600;
 $gl-text-color: #2e2e2e;
 $gl-text-color-secondary: #707070;
 $gl-text-color-tertiary: #949494;

--- a/app/assets/stylesheets/framework/wells.scss
+++ b/app/assets/stylesheets/framework/wells.scss
@@ -69,7 +69,7 @@

 .well-centered {
  h1 {
-    font-weight: normal;
+    font-weight: $gl-font-weight-normal;
    text-align: center;
    font-size: 48px;
  }

--- a/app/assets/stylesheets/highlight/dark.scss
+++ b/app/assets/stylesheets/highlight/dark.scss
@@ -204,11 +204,11 @@ $dark-il: #de935f;
  .cs { color: $dark-cs; } /* Comment.Special */
  .gd { color: $dark-gd; } /* Generic.Deleted */
  .ge { font-style: italic; } /* Generic.Emph */
-  .gh { color: $dark-gh; font-weight: bold; } /* Generic.Heading */
+  .gh { color: $dark-gh; font-weight: $gl-font-weight-bold; } /* Generic.Heading */
  .gi { color: $dark-gi; } /* Generic.Inserted */
-  .gp { color: $dark-gp; font-weight: bold; } /* Generic.Prompt */
-  .gs { font-weight: bold; } /* Generic.Strong */
-  .gu { color: $dark-gu; font-weight: bold; } /* Generic.Subheading */
+  .gp { color: $dark-gp; font-weight: $gl-font-weight-bold; } /* Generic.Prompt */
+  .gs { font-weight: $gl-font-weight-bold; } /* Generic.Strong */
+  .gu { color: $dark-gu; font-weight: $gl-font-weight-bold; } /* Generic.Subheading */
  .kc { color: $dark-kc; } /* Keyword.Constant */
  .kd { color: $dark-kd; } /* Keyword.Declaration */
  .kn { color: $dark-kn; } /* Keyword.Namespace */

--- a/app/assets/stylesheets/highlight/monokai.scss
+++ b/app/assets/stylesheets/highlight/monokai.scss
@@ -203,7 +203,7 @@ $monokai-gi: #a6e22e;
  .c1 { color: $monokai-c1; } /* Comment.Single */
  .cs { color: $monokai-cs; } /* Comment.Special */
  .ge { font-style: italic; } /* Generic.Emph */
-  .gs { font-weight: bold; } /* Generic.Strong */
+  .gs { font-weight: $gl-font-weight-bold; } /* Generic.Strong */
  .kc { color: $monokai-kc; } /* Keyword.Constant */
  .kd { color: $monokai-kd; } /* Keyword.Declaration */
  .kn { color: $monokai-kn; } /* Keyword.Namespace */

--- a/app/assets/stylesheets/highlight/solarized_dark.scss
+++ b/app/assets/stylesheets/highlight/solarized_dark.scss
@@ -231,7 +231,7 @@ $solarized-dark-il: #2aa198;
  .gi { color: $solarized-dark-gi; } /* Generic.Inserted */
  .go { color: $solarized-dark-go; } /* Generic.Output */
  .gp { color: $solarized-dark-gp; } /* Generic.Prompt */
-  .gs { color: $solarized-dark-gs; font-weight: bold; } /* Generic.Strong */
+  .gs { color: $solarized-dark-gs; font-weight: $gl-font-weight-bold; } /* Generic.Strong */
  .gu { color: $solarized-dark-gu; } /* Generic.Subheading */
  .gt { color: $solarized-dark-gt; } /* Generic.Traceback */
  .kc { color: $solarized-dark-kc; } /* Keyword.Constant */

--- a/app/assets/stylesheets/highlight/solarized_light.scss
+++ b/app/assets/stylesheets/highlight/solarized_light.scss
@@ -239,7 +239,7 @@ $solarized-light-il: #2aa198;
  .gi { color: $solarized-light-gi; } /* Generic.Inserted */
  .go { color: $solarized-light-go; } /* Generic.Output */
  .gp { color: $solarized-light-gp; } /* Generic.Prompt */
-  .gs { color: $solarized-light-gs; font-weight: bold; } /* Generic.Strong */
+  .gs { color: $solarized-light-gs; font-weight: $gl-font-weight-bold; } /* Generic.Strong */
  .gu { color: $solarized-light-gu; } /* Generic.Subheading */
  .gt { color: $solarized-light-gt; } /* Generic.Traceback */
  .kc { color: $solarized-light-kc; } /* Keyword.Constant */

--- a/app/assets/stylesheets/highlight/white.scss
+++ b/app/assets/stylesheets/highlight/white.scss
@@ -211,12 +211,12 @@ $white-gc-bg: #eaf2f5;
  .hll { background-color: $white-hll-bg; }
  .c { color: $white-c; font-style: italic; }
  .err { color: $white-err; background-color: $white-err-bg; }
-  .k { font-weight: bold; }
-  .o { font-weight: bold; }
+  .k { font-weight: $gl-font-weight-bold; }
+  .o { font-weight: $gl-font-weight-bold; }
  .cm { color: $white-cm; font-style: italic; }
-  .cp { color: $white-cp; font-weight: bold; }
+  .cp { color: $white-cp; font-weight: $gl-font-weight-bold; }
  .c1 { color: $white-c1; font-style: italic; }
-  .cs { color: $white-cs; font-weight: bold; font-style: italic; }
+  .cs { color: $white-cs; font-weight: $gl-font-weight-bold; font-style: italic; }
  .gd { color: $white-gd; background-color: $white-gd-bg; }
  .gd .x { color: $white-gd-x; background-color: $white-gd-x-bg; }
  .ge { font-style: italic; }
@@ -226,29 +226,29 @@ $white-gc-bg: #eaf2f5;
  .gi .x { color: $white-gi-x; background-color: $white-gi-x-bg; }
  .go { color: $white-go; }
  .gp { color: $white-gp; }
-  .gs { font-weight: bold; }
-  .gu { color: $white-gu; font-weight: bold; }
+  .gs { font-weight: $gl-font-weight-bold; }
+  .gu { color: $white-gu; font-weight: $gl-font-weight-bold; }
  .gt { color: $white-gt; }
-  .kc { font-weight: bold; }
-  .kd { font-weight: bold; }
-  .kn { font-weight: bold; }
-  .kp { font-weight: bold; }
-  .kr { font-weight: bold; }
-  .kt { color: $white-kt; font-weight: bold; }
+  .kc { font-weight: $gl-font-weight-bold; }
+  .kd { font-weight: $gl-font-weight-bold; }
+  .kn { font-weight: $gl-font-weight-bold; }
+  .kp { font-weight: $gl-font-weight-bold; }
+  .kr { font-weight: $gl-font-weight-bold; }
+  .kt { color: $white-kt; font-weight: $gl-font-weight-bold; }
  .m { color: $white-m; }
  .s { color: $white-s; }
  .n { color: $white-n; }
  .na { color: $white-na; }
  .nb { color: $white-nb; }
-  .nc { color: $white-nc; font-weight: bold; }
+  .nc { color: $white-nc; font-weight: $gl-font-weight-bold; }
  .no { color: $white-no; }
  .ni { color: $white-ni; }
-  .ne { color: $white-ne; font-weight: bold; }
-  .nf { color: $white-nf; font-weight: bold; }
+  .ne { color: $white-ne; font-weight: $gl-font-weight-bold; }
+  .nf { color: $white-nf; font-weight: $gl-font-weight-bold; }
  .nn { color: $white-nn; }
  .nt { color: $white-nt; }
  .nv { color: $white-nv; }
-  .ow { font-weight: bold; }
+  .ow { font-weight: $gl-font-weight-bold; }
  .w { color: $white-w; }
  .mf { color: $white-mf; }
  .mh { color: $white-mh; }

--- a/app/assets/stylesheets/mailers/highlighted_diff_email.scss
+++ b/app/assets/stylesheets/mailers/highlighted_diff_email.scss
@@ -152,12 +152,12 @@ span.highlight_word {
 .hll { background-color: $highlighted-hll-bg; }
 .c { color: $highlighted-c; font-style: italic; }
 .err { color: $highlighted-err; background-color: $highlighted-err-bg; }
-.k { font-weight: bold; }
-.o { font-weight: bold; }
+.k { font-weight: $gl-font-weight-bold; }
+.o { font-weight: $gl-font-weight-bold; }
 .cm { color: $highlighted-cm; font-style: italic; }
-.cp { color: $highlighted-cp; font-weight: bold; }
+.cp { color: $highlighted-cp; font-weight: $gl-font-weight-bold; }
 .c1 { color: $highlighted-c1; font-style: italic; }
-.cs { color: $highlighted-cs; font-weight: bold; font-style: italic; }
+.cs { color: $highlighted-cs; font-weight: $gl-font-weight-bold; font-style: italic; }
 .gd { color: $highlighted-gd; background-color: $highlighted-gd-bg; }
 .gd .x { color: $highlighted-gd; background-color: $highlighted-gd-x-bg; }
 .ge { font-style: italic; }
@@ -167,29 +167,29 @@ span.highlight_word {
 .gi .x { color: $highlighted-gi; background-color: $highlighted-gi-x-bg; }
 .go { color: $highlighted-go; }
 .gp { color: $highlighted-gp; }
-.gs { font-weight: bold; }
-.gu { color: $highlighted-gu; font-weight: bold; }
+.gs { font-weight: $gl-font-weight-bold; }
+.gu { color: $highlighted-gu; font-weight: $gl-font-weight-bold; }
 .gt { color: $highlighted-gt; }
-.kc { font-weight: bold; }
-.kd { font-weight: bold; }
-.kn { font-weight: bold; }
-.kp { font-weight: bold; }
-.kr { font-weight: bold; }
-.kt { color: $highlighted-kt; font-weight: bold; }
+.kc { font-weight: $gl-font-weight-bold; }
+.kd { font-weight: $gl-font-weight-bold; }
+.kn { font-weight: $gl-font-weight-bold; }
+.kp { font-weight: $gl-font-weight-bold; }
+.kr { font-weight: $gl-font-weight-bold; }
+.kt { color: $highlighted-kt; font-weight: $gl-font-weight-bold; }
 .m { color: $highlighted-m; }
 .s { color: $highlighted-s; }
 .n { color: $highlighted-n; }
 .na { color: $highlighted-na; }
 .nb { color: $highlighted-nb; }
-.nc { color: $highlighted-nc; font-weight: bold; }
+.nc { color: $highlighted-nc; font-weight: $gl-font-weight-bold; }
 .no { color: $highlighted-no; }
 .ni { color: $highlighted-ni; }
-.ne { color: $highlighted-ne; font-weight: bold; }
-.nf { color: $highlighted-nf; font-weight: bold; }
+.ne { color: $highlighted-ne; font-weight: $gl-font-weight-bold; }
+.nf { color: $highlighted-nf; font-weight: $gl-font-weight-bold; }
 .nn { color: $highlighted-nn; }
 .nt { color: $highlighted-nt; }
 .nv { color: $highlighted-nv; }
-.ow { font-weight: bold; }
+.ow { font-weight: $gl-font-weight-bold; }
 .w { color: $highlighted-w; }
 .mf { color: $highlighted-mf; }
 .mh { color: $highlighted-mh; }

--- a/app/assets/stylesheets/new_nav.scss
+++ b/app/assets/stylesheets/new_nav.scss
@@ -134,7 +134,7 @@ header.navbar-gitlab-new {
      li {
        .badge {
          box-shadow: none;
-          font-weight: 600;
+          font-weight: $gl-font-weight-bold;
        }
      }
    }
@@ -193,7 +193,7 @@ header.navbar-gitlab-new {
    &.active > a {
      box-shadow: inset 0 -3px 0 $indigo-500;
      color: $white-light;
-      font-weight: 700;
+      font-weight: $gl-font-weight-bold;
    }

    > a {
@@ -371,7 +371,7 @@ header.navbar-gitlab-new {

    > a {
      &:last-of-type:not(:first-child) {
-        font-weight: 600;
+        font-weight: $gl-font-weight-bold;
      }
    }
  }
@@ -411,7 +411,7 @@ header.navbar-gitlab-new {
 .breadcrumbs-sub-title {
  margin: 2px 0;
  font-size: 16px;
-  font-weight: normal;
+  font-weight: $gl-font-weight-normal;
  line-height: 1;

  ul {
@@ -430,7 +430,7 @@ header.navbar-gitlab-new {
    }

    &:last-child a {
-      font-weight: 600;
+      font-weight: $gl-font-weight-bold;
    }
  }


--- a/app/assets/stylesheets/new_sidebar.scss
+++ b/app/assets/stylesheets/new_sidebar.scss
@@ -46,7 +46,7 @@ $new-sidebar-collapsed-width: 50px;

  a {
    border-bottom: 1px solid $border-color;
-    font-weight: 600;
+    font-weight: $gl-font-weight-bold;
    display: flex;
    align-items: center;
    padding: 10px 16px 10px 10px;
@@ -160,7 +160,7 @@ $new-sidebar-collapsed-width: 50px;

    > a {
      color: $active-color;
-      font-weight: 700;
+      font-weight: $gl-font-weight-bold;
    }

    svg {
@@ -308,7 +308,7 @@ $new-sidebar-collapsed-width: 50px;

      .badge {
        color: $active-color;
-        font-weight: 600;
+        font-weight: $gl-font-weight-bold;
      }

      .sidebar-sub-level-items {
@@ -474,6 +474,6 @@ $new-sidebar-collapsed-width: 50px;
  border-bottom-color: $active-border;

  .badge {
-    font-weight: 600;
+    font-weight: $gl-font-weight-bold;
  }
 }
--- a/app/assets/stylesheets/pages/boards.scss
+++ b/app/assets/stylesheets/pages/boards.scss
@@ -471,7 +471,7 @@
    padding-right: 35px;

    > strong {
-      font-weight: 600;
+      font-weight: $gl-font-weight-bold;
    }
  }
 }

--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -277,7 +277,7 @@
  }

  .trigger-build-variable {
-    font-weight: normal;
+    font-weight: $gl-font-weight-normal;
    color: $code-color;
  }

@@ -378,7 +378,7 @@
      }

      &.active {
-        font-weight: bold;
+        font-weight: $gl-font-weight-bold;

        .fa-arrow-right {
          display: block;

--- a/app/assets/stylesheets/pages/ci_projects.scss
+++ b/app/assets/stylesheets/pages/ci_projects.scss
@@ -22,7 +22,7 @@
      vertical-align: middle !important;

      a {
-        font-weight: normal;
+        font-weight: $gl-font-weight-normal;
        text-decoration: none;
      }
    }

--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -213,7 +213,7 @@

  .commit-sha {
    font-size: 14px;
-    font-weight: 600;
+    font-weight: $gl-font-weight-bold;
  }
 }

@@ -306,7 +306,7 @@
 .gpg-popover-status {
  display: flex;
  align-items: center;
-  font-weight: normal;
+  font-weight: $gl-font-weight-normal;
  line-height: 1.5;
 }


--- a/app/assets/stylesheets/pages/convdev_index.scss
+++ b/app/assets/stylesheets/pages/convdev_index.scss
@@ -23,7 +23,7 @@ $space-between-cards: 8px;
    line-height: 1;
    color: $gl-text-color-secondary;
    margin-left: 8px;
-    font-weight: 500;
+    font-weight: $gl-font-weight-normal;

    a {
      font-size: 18px;
@@ -139,7 +139,7 @@ $space-between-cards: 8px;
 .card-score-value {
  font-size: 16px;
  color: $gl-text-color;
-  font-weight: 500;
+  font-weight: $gl-font-weight-normal;
 }

 .card-score-big {
@@ -147,7 +147,7 @@ $space-between-cards: 8px;
  border-bottom: 1px solid $border-color;
  font-size: 22px;
  padding: 10px 0;
-  font-weight: 500;
+  font-weight: $gl-font-weight-normal;
 }

 .card-buttons {

--- a/app/assets/stylesheets/pages/cycle_analytics.scss
+++ b/app/assets/stylesheets/pages/cycle_analytics.scss
@@ -68,7 +68,7 @@
    }

    .stage-name {
-      font-weight: 600;
+      font-weight: $gl-font-weight-bold;
    }
  }

@@ -93,7 +93,7 @@
      .header {
        font-size: 30px;
        line-height: 38px;
-        font-weight: normal;
+        font-weight: $gl-font-weight-normal;
        margin: 0;
      }

@@ -130,7 +130,7 @@
        &.title {
          line-height: 19px;
          font-size: 14px;
-          font-weight: 600;
+          font-weight: $gl-font-weight-bold;
          color: $gl-text-color;
        }

@@ -211,7 +211,7 @@
        box-shadow: inset 2px 0 0 0 $active-item-blue;

        .stage-name {
-          font-weight: 600;
+          font-weight: $gl-font-weight-bold;
        }
      }

@@ -404,7 +404,7 @@
        color: $gl-link-color;
        line-height: 1.3;
        vertical-align: top;
-        font-weight: normal;
+        font-weight: $gl-font-weight-normal;
      }

      .fa {

--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -40,7 +40,7 @@
      // "Changes suppressed. Click to show." link
      .show-suppressed-diff {
        font-size: 110%;
-        font-weight: bold;
+        font-weight: $gl-font-weight-bold;
      }
    }

@@ -104,7 +104,7 @@
      a {
        float: left;
        width: 35px;
-        font-weight: normal;
+        font-weight: $gl-font-weight-normal;

        &[disabled] {
          cursor: default;
@@ -395,7 +395,7 @@
  background-color: transparent;
  border: 0;
  color: $gl-link-color;
-  font-weight: 600;
+  font-weight: $gl-font-weight-bold;

  &:hover,
  &:focus {

--- a/app/assets/stylesheets/pages/environments.scss
+++ b/app/assets/stylesheets/pages/environments.scss
@@ -6,7 +6,7 @@
 }

 .environments-folder-name {
-  font-weight: normal;
+  font-weight: $gl-font-weight-normal;
  padding-top: 20px;
 }

@@ -246,13 +246,13 @@
  }

  .text-metric-bold {
-    font-weight: 600;
+    font-weight: $gl-font-weight-bold;
  }

  .label-axis-text,
  .text-metric-usage {
    fill: $black;
-    font-weight: 500;
+    font-weight: $gl-font-weight-normal;
    font-size: 12px;
  }


--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -57,7 +57,7 @@

  .event-title {
    @include str-truncated(calc(100% - 174px));
-    font-weight: 600;
+    font-weight: $gl-font-weight-bold;
    color: $list-text-color;
  }


--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -271,7 +271,7 @@
    }

    .light {
-      font-weight: normal;
+      font-weight: $gl-font-weight-normal;
    }

    .no-value {
@@ -306,7 +306,7 @@
      display: block;
      margin-top: 4px;
      font-size: 13px;
-      font-weight: normal;
+      font-weight: $gl-font-weight-normal;
    }

    .hide-expanded {
@@ -689,7 +689,7 @@
    .issuable-info,
    .task-status,
    .issuable-updated-at {
-      font-weight: normal;
+      font-weight: $gl-font-weight-normal;
      color: $gl-text-color-secondary;

      a {

--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -75,7 +75,7 @@ ul.related-merge-requests > li {
 .merge-requests-title,
 .related-branches-title {
  font-size: 16px;
-  font-weight: 600;
+  font-weight: $gl-font-weight-bold;
 }

 .merge-request-id {
@@ -244,7 +244,7 @@ ul.related-merge-requests > li {

      strong {
        display: block;
-        font-weight: 600;
+        font-weight: $gl-font-weight-bold;
      }
    }
  }

--- a/app/assets/stylesheets/pages/login.scss
+++ b/app/assets/stylesheets/pages/login.scss
@@ -22,7 +22,7 @@
    }

    h1:first-child {
-      font-weight: normal;
+      font-weight: $gl-font-weight-normal;
      margin-bottom: 0.68em;
      margin-top: 0;
      font-size: 34px;
@@ -38,7 +38,7 @@
    }

    a {
-      font-weight: bold;
+      font-weight: $gl-font-weight-bold;
    }
  }

@@ -54,7 +54,7 @@
    padding: 15px;

    .login-heading h3 {
-      font-weight: 300;
+      font-weight: $gl-font-weight-normal;
      line-height: 1.5;
      margin: 0 0 10px;
    }
@@ -186,7 +186,7 @@
  }

  label {
-    font-weight: normal;
+    font-weight: $gl-font-weight-normal;
  }

  .submit-container {

--- a/app/assets/stylesheets/pages/members.scss
+++ b/app/assets/stylesheets/pages/members.scss
@@ -46,7 +46,7 @@
    }

    strong {
-      font-weight: 600;
+      font-weight: $gl-font-weight-bold;
    }
  }

@@ -221,7 +221,7 @@
  }

  .member {
-    font-weight: bold;
+    font-weight: $gl-font-weight-bold;
    overflow-wrap: break-word;
    word-break: break-all;
  }

--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -197,7 +197,7 @@
    @extend .ref-name;

    color: $gl-text-color;
-    font-weight: 600;
+    font-weight: $gl-font-weight-bold;
    overflow: hidden;
    word-break: break-all;

@@ -228,7 +228,7 @@
  .mr-widget-body {
    h4 {
      float: left;
-      font-weight: 600;
+      font-weight: $gl-font-weight-bold;
      font-size: 14px;
      line-height: inherit;
      margin-top: 0;
@@ -239,7 +239,7 @@
      }

      time {
-        font-weight: normal;
+        font-weight: $gl-font-weight-normal;
      }
    }

@@ -249,7 +249,7 @@
    }

    label {
-      font-weight: normal;
+      font-weight: $gl-font-weight-normal;
    }

    .spacing {
@@ -257,12 +257,12 @@
    }

    .bold {
-      font-weight: 600;
+      font-weight: $gl-font-weight-bold;
      color: $gl-gray-light;
    }

    .state-label {
-      font-weight: 600;
+      font-weight: $gl-font-weight-bold;
      padding-right: 10px;
    }

@@ -336,7 +336,7 @@

      .text {
        span {
-          font-weight: 600;
+          font-weight: $gl-font-weight-bold;
        }

        p {
@@ -505,7 +505,7 @@
 .panel-new-merge-request {
  .panel-heading {
    padding: 5px 10px;
-    font-weight: 600;
+    font-weight: $gl-font-weight-bold;
    line-height: 25px;
  }


--- a/app/assets/stylesheets/pages/milestone.scss
+++ b/app/assets/stylesheets/pages/milestone.scss
@@ -7,7 +7,7 @@
    padding: 10px 16px;

    h4 {
-      font-weight: bold;
+      font-weight: $gl-font-weight-bold;
    }

    .progress {
@@ -81,7 +81,7 @@
  }

  .remaining-days strong {
-    font-weight: normal;
+    font-weight: $gl-font-weight-normal;
  }

  .milestone-stat {

--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -188,7 +188,7 @@
    .close {
      color: $white-light;
      opacity: 0.85;
-      font-weight: normal;
+      font-weight: $gl-font-weight-normal;

      &:hover {
        opacity: 1;

--- a/app/assets/stylesheets/pages/pipeline_schedules.scss
+++ b/app/assets/stylesheets/pages/pipeline_schedules.scss
@@ -12,7 +12,7 @@
 .interval-pattern-form-group {
  label {
    margin-right: 10px;
-    font-weight: normal;
+    font-weight: $gl-font-weight-normal;

    &[for='custom'] {
      margin-right: 0;

--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -128,7 +128,7 @@
  .branch-commit {

    .ref-name {
-      font-weight: bold;
+      font-weight: $gl-font-weight-bold;
      max-width: 120px;
      overflow: hidden;
      display: inline-block;
@@ -272,7 +272,7 @@

    .build-name {
      float: right;
-      font-weight: 500;
+      font-weight: $gl-font-weight-normal;
    }

    .ci-status-icon-failed svg {
@@ -281,7 +281,7 @@

    .stage {
      color: $gl-text-color-secondary;
-      font-weight: 500;
+      font-weight: $gl-font-weight-normal;
      vertical-align: middle;
    }
  }
@@ -420,7 +420,7 @@

  .stage-name {
    margin: 0 0 15px 10px;
-    font-weight: bold;
+    font-weight: $gl-font-weight-bold;
    width: 176px;
    white-space: nowrap;
    overflow: hidden;
@@ -580,7 +580,7 @@
  vertical-align: bottom;
  display: inline-block;
  position: relative;
-  font-weight: normal;
+  font-weight: $gl-font-weight-normal;
 }

 @mixin mini-pipeline-graph-color($color-light, $color-main, $color-dark) {
@@ -724,7 +724,7 @@ button.mini-pipeline-graph-dropdown-toggle {
  .mini-pipeline-graph-dropdown-item {
    padding: 3px 7px 4px;
    clear: both;
-    font-weight: normal;
+    font-weight: $gl-font-weight-normal;
    line-height: 1.428571429;
    white-space: nowrap;
    margin: 0 5px;

--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -83,7 +83,7 @@
  &::after {
    content: "\00B7"; // Middle Dot
    padding: 0 6px;
-    font-weight: bold;
+    font-weight: $gl-font-weight-bold;
  }

  &:last-child {
@@ -277,7 +277,7 @@ table.u2f-registrations {

 .oauth-application-show {
  .scope-name {
-    font-weight: 600;
+    font-weight: $gl-font-weight-bold;
  }

  .scopes-list {

--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -2,7 +2,7 @@
  margin: -16px;

  .alert-link {
-    font-weight: normal;
+    font-weight: $gl-font-weight-normal;
  }
 }

@@ -114,7 +114,7 @@
    margin-top: 10px;
    margin-bottom: 10px;
    font-size: 24px;
-    font-weight: 400;
+    font-weight: $gl-font-weight-normal;
    line-height: 1;
    word-wrap: break-word;

@@ -259,7 +259,7 @@
      border-width: 1px;
      border-style: solid;
      font-size: 13px;
-      font-weight: 600;
+      font-weight: $gl-font-weight-bold;
      line-height: 13px;
      letter-spacing: .4px;
      padding: 6px 14px;
@@ -309,7 +309,7 @@
    }

    .option-title {
-      font-weight: normal;
+      font-weight: $gl-font-weight-normal;
      display: inline-block;
      color: $gl-text-color;
    }
@@ -575,7 +575,7 @@ a.deploy-project-label {
      color: $gl-text-color-tertiary;
      transform: translateY(-50%);
      font-size: 12px;
-      font-weight: bold;
+      font-weight: $gl-font-weight-bold;
      line-height: 20px;

      // Mobile
@@ -826,7 +826,7 @@ pre.light-well {
 .new-protected-tag {
  label {
    margin-top: 6px;
-    font-weight: normal;
+    font-weight: $gl-font-weight-normal;
  }
 }

@@ -853,7 +853,7 @@ pre.light-well {
    }

    &.is-active {
-      font-weight: 600;
+      font-weight: $gl-font-weight-bold;
    }
  }

@@ -952,7 +952,7 @@ pre.light-well {

    &::before {
      font-family: FontAwesome;
-      font-weight: normal;
+      font-weight: $gl-font-weight-normal;
      font-style: normal;
    }
  }

--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -267,7 +267,7 @@
          display: inline-block;
          font-size: 10px;
          text-transform: uppercase;
-          font-weight: bold;
+          font-weight: $gl-font-weight-bold;
          color: $gray-darkest;
          white-space: nowrap;
          overflow: hidden;

--- a/app/assets/stylesheets/pages/runners.scss
+++ b/app/assets/stylesheets/pages/runners.scss
@@ -30,7 +30,7 @@
  }

  h4 {
-    font-weight: normal;
+    font-weight: $gl-font-weight-normal;
  }
 }


--- a/app/assets/stylesheets/pages/search.scss
+++ b/app/assets/stylesheets/pages/search.scss
@@ -94,7 +94,7 @@ input[type="checkbox"]:hover {

      &::before {
        font-family: FontAwesome;
-        font-weight: normal;
+        font-weight: $gl-font-weight-normal;
        font-style: normal;
      }
    }

--- a/app/assets/stylesheets/pages/sherlock.scss
+++ b/app/assets/stylesheets/pages/sherlock.scss
@@ -29,5 +29,5 @@ table .sherlock-code {

 .sherlock-line-samples-table .slow {
  color: $red-500;
-  font-weight: bold;
+  font-weight: $gl-font-weight-bold;
 }
--- a/app/assets/stylesheets/pages/todos.scss
+++ b/app/assets/stylesheets/pages/todos.scss
@@ -108,14 +108,14 @@
    margin: 0;
    float: none;
    display: inline-block;
-    font-weight: normal;
+    font-weight: $gl-font-weight-normal;
    padding: 0 5px;
    line-height: inherit;
    font-size: 14px;
  }

  .action-name {
-    font-weight: normal;
+    font-weight: $gl-font-weight-normal;
  }

  .todo-body {
@@ -262,6 +262,6 @@
  }

  a {
-    font-weight: 600;
+    font-weight: $gl-font-weight-bold;
  }
 }
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -231,7 +231,7 @@
 }

 .upload-link {
-  font-weight: normal;
+  font-weight: $gl-font-weight-normal;
  color: $md-link-color;
 }


--- a/app/assets/stylesheets/pages/ui_dev_kit.scss
+++ b/app/assets/stylesheets/pages/ui_dev_kit.scss
 .gitlab-ui-dev-kit {
  > h2 {
    margin: 35px 0 20px;
-    font-weight: bold;
+    font-weight: $gl-font-weight-bold;
  }

  .example {

--- a/app/assets/stylesheets/pages/wiki.scss
+++ b/app/assets/stylesheets/pages/wiki.scss
@@ -37,7 +37,7 @@
  }

  .light {
-    font-weight: normal;
+    font-weight: $gl-font-weight-normal;
    color: $gl-text-color-secondary;
  }

@@ -89,7 +89,7 @@

  h3 {
    font-size: 19px;
-    font-weight: normal;
+    font-weight: $gl-font-weight-normal;
    margin: $gl-padding 0;
  }
 }

--- a/app/assets/stylesheets/pages/xterm.scss
+++ b/app/assets/stylesheets/pages/xterm.scss
@@ -281,7 +281,7 @@
  $xterm-fg-255: #eee;

  .term-bold {
-    font-weight: bold;
+    font-weight: $gl-font-weight-bold;
  }

  .term-italic {

--- a/app/assets/stylesheets/print.scss
+++ b/app/assets/stylesheets/print.scss
@@ -17,7 +17,7 @@

 .wiki h3 {
  font-size: 18px;
-  font-weight: bold;
+  font-weight: 600;
 }

 header,

--- a/app/views/layouts/errors.html.haml
+++ b/app/views/layouts/errors.html.haml
@@ -15,7 +15,7 @@
      h1 {
        font-size: 56px;
        line-height: 100px;
-        font-weight: normal;
+        font-weight: 400;
        color: #456;
      }

@@ -28,7 +28,7 @@
      h3 {
        color: #456;
        font-size: 20px;
-        font-weight: normal;
+        font-weight: 400;
        line-height: 28px;
      }


--- a/app/views/layouts/oauth_error.html.haml
+++ b/app/views/layouts/oauth_error.html.haml
@@ -19,7 +19,7 @@
      h3 {
        color: #456;
        font-size: 22px;
-        font-weight: bold;
+        font-weight: 600;
        margin-bottom: 6px;
      }


--- a/changelogs/unreleased/font-weight-adjusted.yml
+++ b/changelogs/unreleased/font-weight-adjusted.yml
+---
+title: Changed all font-weight values to 400 and 600 and introduced 2 variables to
+  manage them
+merge_request: !12896
+author:
--- a/public/404.html
+++ b/public/404.html
@@ -15,7 +15,7 @@
    h1 {
      font-size: 56px;
      line-height: 100px;
-      font-weight: normal;
+      font-weight: 400;
      color: #456;
    }

@@ -28,7 +28,7 @@
    h3 {
      color: #456;
      font-size: 20px;
-      font-weight: normal;
+      font-weight: 400;
      line-height: 28px;
    }

@@ -48,7 +48,7 @@

    a {
      line-height: 100px;
-      font-weight: normal;
+      font-weight: 400;
      color: #4A8BEE;
      font-size: 18px;
      text-decoration: none;

--- a/public/422.html
+++ b/public/422.html
@@ -15,7 +15,7 @@
    h1 {
      font-size: 56px;
      line-height: 100px;
-      font-weight: normal;
+      font-weight: 400;
      color: #456;
    }

@@ -28,7 +28,7 @@
    h3 {
      color: #456;
      font-size: 20px;
-      font-weight: normal;
+      font-weight: 400;
      line-height: 28px;
    }

@@ -48,7 +48,7 @@

    a {
      line-height: 100px;
-      font-weight: normal;
+      font-weight: 400;
      color: #4A8BEE;
      font-size: 18px;
      text-decoration: none;

--- a/public/500.html
+++ b/public/500.html
@@ -15,7 +15,7 @@
    h1 {
      font-size: 56px;
      line-height: 100px;
-      font-weight: normal;
+      font-weight: 400;
      color: #456;
    }

@@ -28,7 +28,7 @@
    h3 {
      color: #456;
      font-size: 20px;
-      font-weight: normal;
+      font-weight: 400;
      line-height: 28px;
    }

@@ -48,7 +48,7 @@

    a {
      line-height: 100px;
-      font-weight: normal;
+      font-weight: 400;
      color: #4A8BEE;
      font-size: 18px;
      text-decoration: none;

--- a/public/502.html
+++ b/public/502.html
@@ -15,7 +15,7 @@
    h1 {
      font-size: 56px;
      line-height: 100px;
-      font-weight: normal;
+      font-weight: 400;
      color: #456;
    }

@@ -28,7 +28,7 @@
    h3 {
      color: #456;
      font-size: 20px;
-      font-weight: normal;
+      font-weight: 400;
      line-height: 28px;
    }

@@ -48,7 +48,7 @@

    a {
      line-height: 100px;
-      font-weight: normal;
+      font-weight: 400;
      color: #4A8BEE;
      font-size: 18px;
      text-decoration: none;

--- a/public/503.html
+++ b/public/503.html
@@ -15,7 +15,7 @@
    h1 {
      font-size: 56px;
      line-height: 100px;
-      font-weight: normal;
+      font-weight: 400;
      color: #456;
    }

@@ -28,7 +28,7 @@
    h3 {
      color: #456;
      font-size: 20px;
-      font-weight: normal;
+      font-weight: 400;
      line-height: 28px;
    }

@@ -48,7 +48,7 @@

    a {
      line-height: 100px;
-      font-weight: normal;
+      font-weight: 400;
      color: #4A8BEE;
      font-size: 18px;
      text-decoration: none;

--- a/public/deploy.html
+++ b/public/deploy.html
@@ -20,7 +20,7 @@
    h1 {
      font-size: 56px;
      line-height: 100px;
-      font-weight: normal;
+      font-weight: 400;
      color: #456;
    }

@@ -33,7 +33,7 @@
    h3 {
      color: #456;
      font-size: 20px;
-      font-weight: normal;
+      font-weight: 400;
      line-height: 28px;
    }

@@ -66,4 +66,4 @@
    <p>Please contact your GitLab administrator if this problem persists.</p>
  </div>
 </body>
-</html>
\ No newline at end of file
+</html>
--- a/spec/fixtures/emails/ios_default.eml
+++ b/spec/fixtures/emails/ios_default.eml
@@ -76,7 +76,7 @@ Content-Transfer-Encoding: 7bit
        <img src="https://meta-discourse.global.ssl.fastly.net/user_avatar/meta.discourse.org/techapj/45/3281.png" title="techAPJ" style="max-width:100%;" width="45" height="45">
      </td>
      <td>
-        <a href="https://meta.discourse.org/users/techapj" target="_blank" style="text-decoration: none; font-weight: bold; color: #006699;; font-size:13px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;color:#3b5998;text-decoration:none;font-weight:bold">techAPJ</a><br>
+        <a href="https://meta.discourse.org/users/techapj" target="_blank" style="text-decoration: none; font-weight: 600; color: #006699;; font-size:13px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;color:#3b5998;text-decoration:none;font-weight:bold">techAPJ</a><br>
        <span style="text-align:right;color:#999999;padding-right:5px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;font-size:11px">November 28</span>
      </td>
    </tr>
@@ -94,7 +94,7 @@ Content-Transfer-Encoding: 7bit


  <div style="color:#666;">
-    <p>To respond, reply to this email or visit <a href="https://meta.discourse.org/t/testing-default-email-replies/22638/3" style="text-decoration: none; font-weight: bold; color: #006699;; color:#666;">https://meta.discourse.org/t/testing-default-email-replies/22638/3</a> in your browser.</p>
+    <p>To respond, reply to this email or visit <a href="https://meta.discourse.org/t/testing-default-email-replies/22638/3" style="text-decoration: none; font-weight: 600; color: #006699;; color:#666;">https://meta.discourse.org/t/testing-default-email-replies/22638/3</a> in your browser.</p>
  </div>
  <hr style="background-color: #ddd; height: 1px; border: 1px;; background-color: #ddd; height: 1px; border: 1px;">
  <h4>Previous Replies</h4>
@@ -106,7 +106,7 @@ Content-Transfer-Encoding: 7bit
        <img src="https://meta-discourse.global.ssl.fastly.net/user_avatar/meta.discourse.org/codinghorror/45/5297.png" title="codinghorror" style="max-width:100%;" width="45" height="45">
      </td>
      <td>
-        <a href="https://meta.discourse.org/users/codinghorror" target="_blank" style="text-decoration: none; font-weight: bold; color: #006699;; font-size:13px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;color:#3b5998;text-decoration:none;font-weight:bold">codinghorror</a><br>
+        <a href="https://meta.discourse.org/users/codinghorror" target="_blank" style="text-decoration: none; font-weight: 600; color: #006699;; font-size:13px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;color:#3b5998;text-decoration:none;font-weight:bold">codinghorror</a><br>
        <span style="text-align:right;color:#999999;padding-right:5px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;font-size:11px">November 28</span>
      </td>
    </tr>
@@ -114,7 +114,7 @@ Content-Transfer-Encoding: 7bit
      <td style="padding-top:5px;" colspan="2">
 <p style="margin-top:0; border: 0;">We're testing the latest GitHub email processing library which we are integrating now.</p>

-<p style="margin-top:0; border: 0;"><a href="https://github.com/github/email_reply_parser" target="_blank" style="text-decoration: none; font-weight: bold; color: #006699;">https://github.com/github/email_reply_parser</a></p>
+<p style="margin-top:0; border: 0;"><a href="https://github.com/github/email_reply_parser" target="_blank" style="text-decoration: none; font-weight: 600; color: #006699;">https://github.com/github/email_reply_parser</a></p>

 <p style="margin-top:0; border: 0;">Go ahead and reply to this topic and I'll reply from various email clients for testing.</p>
 </td>
@@ -126,10 +126,10 @@ Content-Transfer-Encoding: 7bit
 <hr style="background-color: #ddd; height: 1px; border: 1px;; background-color: #ddd; height: 1px; border: 1px;">

 <div style="color:#666;">
-<p>To respond, reply to this email or visit <a href="https://meta.discourse.org/t/testing-default-email-replies/22638/3" style="text-decoration: none; font-weight: bold; color: #006699;; color:#666;">https://meta.discourse.org/t/testing-default-email-replies/22638/3</a> in your browser.</p>
+<p>To respond, reply to this email or visit <a href="https://meta.discourse.org/t/testing-default-email-replies/22638/3" style="text-decoration: none; font-weight: 600; color: #006699;; color:#666;">https://meta.discourse.org/t/testing-default-email-replies/22638/3</a> in your browser.</p>
 </div>
 <div style="color:#666;">
-<p>To unsubscribe from these emails, visit your <a href="https://meta.discourse.org/my/preferences" style="text-decoration: none; font-weight: bold; color: #006699;; color:#666;">user preferences</a>.</p>
+<p>To unsubscribe from these emails, visit your <a href="https://meta.discourse.org/my/preferences" style="text-decoration: none; font-weight: 600; color: #006699;; color:#666;">user preferences</a>.</p>
 </div>
 </div>
 </div></blockquote></body></html>

--- a/spec/fixtures/emails/on_wrote.eml
+++ b/spec/fixtures/emails/on_wrote.eml
@@ -53,7 +53,7 @@ y
 >   display: inline-block;
 >   font-family: FontAwesome;
 >   font-style: normal;
->   font-weight: normal;
+>   font-weight: 400;
 >   line-height: 1;
 >   -webkit-font-smoothing: antialiased;
 >   -moz-osx-font-smoothing: grayscale;
@@ -227,7 +227,7 @@ ding:5px">.fa {
  display: inline-block;
  font-family: FontAwesome;
  font-style: normal;
-  font-weight: normal;
+  font-weight: 400;
  line-height: 1;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
@@ -274,4 +274,4 @@ ight:bold;color:#006699" target=3D"_blank">user preferences</a>.</p>
 </div>
 </blockquote></div><br></div></div>

--001a11c34c389e728f0502aa26a0--
\ No newline at end of file
+--001a11c34c389e728f0502aa26a0--
--- a/vendor/assets/stylesheets/katex.scss
+++ b/vendor/assets/stylesheets/katex.scss
@@ -45,112 +45,112 @@ SOFTWARE.
  font-family: 'KaTeX_AMS';
  src: url(font-path('KaTeX_AMS-Regular.eot'));
  src: url(font-path('KaTeX_AMS-Regular.eot#iefix')) format('embedded-opentype'), url(font-path('KaTeX_AMS-Regular.woff2')) format('woff2'), url(font-path('KaTeX_AMS-Regular.woff')) format('woff'), url(font-path('KaTeX_AMS-Regular.ttf')) format('truetype');
-  font-weight: normal;
+  font-weight: 400;
  font-style: normal;
 }
 @font-face {
  font-family: 'KaTeX_Caligraphic';
  src: url(font-path('KaTeX_Caligraphic-Bold.eot'));
  src: url(font-path('KaTeX_Caligraphic-Bold.eot#iefix')) format('embedded-opentype'), url(font-path('KaTeX_Caligraphic-Bold.woff2')) format('woff2'), url(font-path('KaTeX_Caligraphic-Bold.woff')) format('woff'), url(font-path('KaTeX_Caligraphic-Bold.ttf')) format('truetype');
-  font-weight: bold;
+  font-weight: 600;
  font-style: normal;
 }
 @font-face {
  font-family: 'KaTeX_Caligraphic';
  src: url(font-path('KaTeX_Caligraphic-Regular.eot'));
  src: url(font-path('KaTeX_Caligraphic-Regular.eot#iefix')) format('embedded-opentype'), url(font-path('KaTeX_Caligraphic-Regular.woff2')) format('woff2'), url(font-path('KaTeX_Caligraphic-Regular.woff')) format('woff'), url(font-path('KaTeX_Caligraphic-Regular.ttf')) format('truetype');
-  font-weight: normal;
+  font-weight: 400;
  font-style: normal;
 }
 @font-face {
  font-family: 'KaTeX_Fraktur';
  src: url(font-path('KaTeX_Fraktur-Bold.eot'));
  src: url(font-path('KaTeX_Fraktur-Bold.eot#iefix')) format('embedded-opentype'), url(font-path('KaTeX_Fraktur-Bold.woff2')) format('woff2'), url(font-path('KaTeX_Fraktur-Bold.woff')) format('woff'), url(font-path('KaTeX_Fraktur-Bold.ttf')) format('truetype');
-  font-weight: bold;
+  font-weight: 600;
  font-style: normal;
 }
 @font-face {
  font-family: 'KaTeX_Fraktur';
  src: url(font-path('KaTeX_Fraktur-Regular.eot'));
  src: url(font-path('KaTeX_Fraktur-Regular.eot#iefix')) format('embedded-opentype'), url(font-path('KaTeX_Fraktur-Regular.woff2')) format('woff2'), url(font-path('KaTeX_Fraktur-Regular.woff')) format('woff'), url(font-path('KaTeX_Fraktur-Regular.ttf')) format('truetype');
-  font-weight: normal;
+  font-weight: 400;
  font-style: normal;
 }
 @font-face {
  font-family: 'KaTeX_Main';
  src: url(font-path('KaTeX_Main-Bold.eot'));
  src: url(font-path('KaTeX_Main-Bold.eot#iefix')) format('embedded-opentype'), url(font-path('KaTeX_Main-Bold.woff2')) format('woff2'), url(font-path('KaTeX_Main-Bold.woff')) format('woff'), url(font-path('KaTeX_Main-Bold.ttf')) format('truetype');
-  font-weight: bold;
+  font-weight: 600;
  font-style: normal;
 }
 @font-face {
  font-family: 'KaTeX_Main';
  src: url(font-path('KaTeX_Main-Italic.eot'));
  src: url(font-path('KaTeX_Main-Italic.eot#iefix')) format('embedded-opentype'), url(font-path('KaTeX_Main-Italic.woff2')) format('woff2'), url(font-path('KaTeX_Main-Italic.woff')) format('woff'), url(font-path('KaTeX_Main-Italic.ttf')) format('truetype');
-  font-weight: normal;
+  font-weight: 400;
  font-style: italic;
 }
 @font-face {
  font-family: 'KaTeX_Main';
  src: url(font-path('KaTeX_Main-Regular.eot'));
  src: url(font-path('KaTeX_Main-Regular.eot#iefix')) format('embedded-opentype'), url(font-path('KaTeX_Main-Regular.woff2')) format('woff2'), url(font-path('KaTeX_Main-Regular.woff')) format('woff'), url(font-path('KaTeX_Main-Regular.ttf')) format('truetype');
-  font-weight: normal;
+  font-weight: 400;
  font-style: normal;
 }
 @font-face {
  font-family: 'KaTeX_Math';
  src: url(font-path('KaTeX_Math-Italic.eot'));
  src: url(font-path('KaTeX_Math-Italic.eot#iefix')) format('embedded-opentype'), url(font-path('KaTeX_Math-Italic.woff2')) format('woff2'), url(font-path('KaTeX_Math-Italic.woff')) format('woff'), url(font-path('KaTeX_Math-Italic.ttf')) format('truetype');
-  font-weight: normal;
+  font-weight: 400;
  font-style: italic;
 }
 @font-face {
  font-family: 'KaTeX_SansSerif';
  src: url(font-path('KaTeX_SansSerif-Regular.eot'));
  src: url(font-path('KaTeX_SansSerif-Regular.eot#iefix')) format('embedded-opentype'), url(font-path('KaTeX_SansSerif-Regular.woff2')) format('woff2'), url(font-path('KaTeX_SansSerif-Regular.woff')) format('woff'), url(font-path('KaTeX_SansSerif-Regular.ttf')) format('truetype');
-  font-weight: normal;
+  font-weight: 400;
  font-style: normal;
 }
 @font-face {
  font-family: 'KaTeX_Script';
  src: url(font-path('KaTeX_Script-Regular.eot'));
  src: url(font-path('KaTeX_Script-Regular.eot#iefix')) format('embedded-opentype'), url(font-path('KaTeX_Script-Regular.woff2')) format('woff2'), url(font-path('KaTeX_Script-Regular.woff')) format('woff'), url(font-path('KaTeX_Script-Regular.ttf')) format('truetype');
-  font-weight: normal;
+  font-weight: 400;
  font-style: normal;
 }
 @font-face {
  font-family: 'KaTeX_Size1';
  src: url(font-path('KaTeX_Size1-Regular.eot'));
  src: url(font-path('KaTeX_Size1-Regular.eot#iefix')) format('embedded-opentype'), url(font-path('KaTeX_Size1-Regular.woff2')) format('woff2'), url(font-path('KaTeX_Size1-Regular.woff')) format('woff'), url(font-path('KaTeX_Size1-Regular.ttf')) format('truetype');
-  font-weight: normal;
+  font-weight: 400;
  font-style: normal;
 }
 @font-face {
  font-family: 'KaTeX_Size2';
  src: url(font-path('KaTeX_Size2-Regular.eot'));
  src: url(font-path('KaTeX_Size2-Regular.eot#iefix')) format('embedded-opentype'), url(font-path('KaTeX_Size2-Regular.woff2')) format('woff2'), url(font-path('KaTeX_Size2-Regular.woff')) format('woff'), url(font-path('KaTeX_Size2-Regular.ttf')) format('truetype');
-  font-weight: normal;
+  font-weight: 400;
  font-style: normal;
 }
 @font-face {
  font-family: 'KaTeX_Size3';
  src: url(font-path('KaTeX_Size3-Regular.eot'));
  src: url(font-path('KaTeX_Size3-Regular.eot#iefix')) format('embedded-opentype'), url(font-path('KaTeX_Size3-Regular.woff2')) format('woff2'), url(font-path('KaTeX_Size3-Regular.woff')) format('woff'), url(font-path('KaTeX_Size3-Regular.ttf')) format('truetype');
-  font-weight: normal;
+  font-weight: 400;
  font-style: normal;
 }
 @font-face {
  font-family: 'KaTeX_Size4';
  src: url(font-path('KaTeX_Size4-Regular.eot'));
  src: url(font-path('KaTeX_Size4-Regular.eot#iefix')) format('embedded-opentype'), url(font-path('KaTeX_Size4-Regular.woff2')) format('woff2'), url(font-path('KaTeX_Size4-Regular.woff')) format('woff'), url(font-path('KaTeX_Size4-Regular.ttf')) format('truetype');
-  font-weight: normal;
+  font-weight: 400;
  font-style: normal;
 }
 @font-face {
  font-family: 'KaTeX_Typewriter';
  src: url(font-path('KaTeX_Typewriter-Regular.eot'));
  src: url(font-path('KaTeX_Typewriter-Regular.eot#iefix')) format('embedded-opentype'), url(font-path('KaTeX_Typewriter-Regular.woff2')) format('woff2'), url(font-path('KaTeX_Typewriter-Regular.woff')) format('woff'), url(font-path('KaTeX_Typewriter-Regular.ttf')) format('truetype');
-  font-weight: normal;
+  font-weight: 400;
  font-style: normal;
 }
 .katex-display {
@@ -192,7 +192,7 @@ SOFTWARE.
 }
 .katex .mathbf {
  font-family: KaTeX_Main;
-  font-weight: bold;
+  font-weight: 600;
 }
 .katex .amsrm {
  font-family: KaTeX_AMS;

--- a/vendor/assets/stylesheets/xterm/xterm.css
+++ b/vendor/assets/stylesheets/xterm/xterm.css
@@ -142,7 +142,7 @@
 *  Determine default colors for xterm.js
 */
 .terminal .xterm-bold {
-    font-weight: bold;
+    font-weight: 600;
 }

 .terminal .xterm-underline {