Changed all font-weight values to 400 and 600

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 **/

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;

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;
   }

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 */

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 */

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 */

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 */

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; }

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; }

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;
     }
   }

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;
   }
 }

app/assets/stylesheets/pages/boards.scss

@@ -471,7 +471,7 @@
     padding-right: 35px;
     > strong {
-      font-weight: 600;
+      font-weight: $gl-font-weight-bold;
     }
   }
 }

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;

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;
       }
     }

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;
 }

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 {

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 {

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 {

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;
   }

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;
   }