#23: Reduce number of webfonts

timble · Mar 24, 2017 · dcd6059 · dcd6059
1 parent eef20e5
commit dcd6059
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 94 deletions.
diff --git a/application/site/public/theme/muhimu/css/atoms/_strong.scss b/application/site/public/theme/muhimu/css/atoms/_strong.scss
@@ -1,3 +1,3 @@
 strong {
-  font-weight: 700;
-}
+  font-weight: 600;
+}
diff --git a/application/site/public/theme/muhimu/css/default.css b/application/site/public/theme/muhimu/css/default.css
@@ -1165,13 +1165,11 @@ table {
 .container__header:before,
 .container__content:before,
 .breadcrumb:before,
-.container__footer:before, .card .card__box:before, .media:before, .pagination:before, .skip .container__skip:before, .organization:before, .organization a:before, .container__navigation:before, .container__news:before, .component:before, .component.article article:before,
-.component.news article:before, .footer--group:before, .footer__menu ul:before, .container__top:after,
+.container__footer:before, .card .card__box:before, .media:before, .pagination:before, .skip .container__skip:before, .organization:before, .organization a:before, .container__navigation:before, .container__news:before, .component:before, .footer--group:before, .footer__menu ul:before, .container__top:after,
 .container__header:after,
 .container__content:after,
 .breadcrumb:after,
-.container__footer:after, .card .card__box:after, .media:after, .pagination:after, .skip .container__skip:after, .organization:after, .organization a:after, .container__navigation:after, .container__news:after, .component:after, .component.article article:after,
-.component.news article:after, .footer--group:after, .footer__menu ul:after {
+.container__footer:after, .card .card__box:after, .media:after, .pagination:after, .skip .container__skip:after, .organization:after, .organization a:after, .container__navigation:after, .container__news:after, .component:after, .footer--group:after, .footer__menu ul:after {
   display: table;
   content: " ";
   line-height: 0; }
@@ -1180,8 +1178,7 @@ table {
 .container__header:after,
 .container__content:after,
 .breadcrumb:after,
-.container__footer:after, .card .card__box:after, .media:after, .pagination:after, .skip .container__skip:after, .organization:after, .organization a:after, .container__navigation:after, .container__news:after, .component:after, .component.article article:after,
-.component.news article:after, .footer--group:after, .footer__menu ul:after {
+.container__footer:after, .card .card__box:after, .media:after, .pagination:after, .skip .container__skip:after, .organization:after, .organization a:after, .container__navigation:after, .container__news:after, .component:after, .footer--group:after, .footer__menu ul:after {
   clear: both; }
 
 .categories_wrapper li {
@@ -1487,7 +1484,7 @@ a {
   color: inherit; }
 
 strong {
-  font-weight: 700; }
+  font-weight: 600; }
 
 img {
   max-width: 100%;
@@ -1506,7 +1503,6 @@ article ul li {
 
 .button {
   font-size: 18px;
-  font-weight: 300;
   border: 0px none;
   padding: 8px 16px 6px;
   margin-bottom: 0;
@@ -2071,7 +2067,6 @@ table {
     background: url("../images/avatar.png");
     background-size: cover; }
   .organization__name {
-    font-weight: 300;
     color: #26338c;
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -2082,7 +2077,7 @@ table {
     font-size: 1.25em;
     line-height: 1.5em; }
     .organization__name span {
-      font-weight: 700;
+      font-weight: 600;
       font-size: 1.25em;
       padding-right: 0.5em; }
 
@@ -2117,7 +2112,6 @@ table {
     height: 36px;
     width: 36px;
     color: #fff;
-    font-weight: 700;
     background-color: #26338c; }
 
 @media screen and (max-width: 37.5em) {
@@ -2164,8 +2158,7 @@ table {
       padding-bottom: 1em; } }
   .container__breadcrumb .breadcrumb li, .container__breadcrumb .breadcrumb .divider {
     display: inline-block;
-    margin-right: 5px;
-    font-weight: 300; }
+    margin-right: 5px; }
   .container__breadcrumb .breadcrumb .divider {
     color: #d7e2e0;
     display: inline-block;
@@ -2189,7 +2182,6 @@ table {
     display: block;
     font-size: 1.125em;
     line-height: 1.2em;
-    font-weight: 300;
     padding-top: .6em;
     padding-bottom: .6em;
     position: relative; }
@@ -2311,23 +2303,6 @@ body.press.articles time {
     .container__content {
       padding-top: 2.25em; } }
 
-@media screen and (min-width: 64em) {
-  .component.article article,
-  .component.news article {
-    max-width: 42em; } }
-
-.component.article header,
-.component.news header {
-  margin-bottom: 1.5em; }
-
-.component.article time,
-.component.news time {
-  display: block;
-  font-size: 1.25em;
-  line-height: 1.2em;
-  color: #3142b4;
-  font-weight: 300; }
-
 /* ==========================================================================
    Copyright
    ========================================================================== */

diff --git a/application/site/public/theme/muhimu/css/ie.css b/application/site/public/theme/muhimu/css/ie.css
@@ -1165,13 +1165,11 @@ table {
 .container__header:before,
 .container__content:before,
 .breadcrumb:before,
-.container__footer:before, .card .card__box:before, .media:before, .pagination:before, .skip .container__skip:before, .organization:before, .organization a:before, .container__navigation:before, .container__news:before, .component:before, .component.article article:before,
-.component.news article:before, .footer--group:before, .footer__menu ul:before, .container__top:after,
+.container__footer:before, .card .card__box:before, .media:before, .pagination:before, .skip .container__skip:before, .organization:before, .organization a:before, .container__navigation:before, .container__news:before, .component:before, .footer--group:before, .footer__menu ul:before, .container__top:after,
 .container__header:after,
 .container__content:after,
 .breadcrumb:after,
-.container__footer:after, .card .card__box:after, .media:after, .pagination:after, .skip .container__skip:after, .organization:after, .organization a:after, .container__navigation:after, .container__news:after, .component:after, .component.article article:after,
-.component.news article:after, .footer--group:after, .footer__menu ul:after {
+.container__footer:after, .card .card__box:after, .media:after, .pagination:after, .skip .container__skip:after, .organization:after, .organization a:after, .container__navigation:after, .container__news:after, .component:after, .footer--group:after, .footer__menu ul:after {
   display: table;
   content: " ";
   line-height: 0; }
@@ -1180,8 +1178,7 @@ table {
 .container__header:after,
 .container__content:after,
 .breadcrumb:after,
-.container__footer:after, .card .card__box:after, .media:after, .pagination:after, .skip .container__skip:after, .organization:after, .organization a:after, .container__navigation:after, .container__news:after, .component:after, .component.article article:after,
-.component.news article:after, .footer--group:after, .footer__menu ul:after {
+.container__footer:after, .card .card__box:after, .media:after, .pagination:after, .skip .container__skip:after, .organization:after, .organization a:after, .container__navigation:after, .container__news:after, .component:after, .footer--group:after, .footer__menu ul:after {
   clear: both; }
 
 .categories_wrapper li {
@@ -1480,7 +1477,7 @@ a {
   color: inherit; }
 
 strong {
-  font-weight: 700; }
+  font-weight: 600; }
 
 img {
   max-width: 100%;
@@ -1499,7 +1496,6 @@ article ul li {
 
 .button {
   font-size: 18px;
-  font-weight: 300;
   border: 0px none;
   padding: 8px 16px 6px;
   margin-bottom: 0;
@@ -2059,7 +2055,6 @@ table {
     background: url("../images/avatar.png");
     background-size: cover; }
   .organization__name {
-    font-weight: 300;
     color: #26338c;
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -2070,7 +2065,7 @@ table {
     font-size: 1.25em;
     line-height: 1.5em; }
     .organization__name span {
-      font-weight: 700;
+      font-weight: 600;
       font-size: 1.25em;
       padding-right: 0.5em; }
 
@@ -2105,7 +2100,6 @@ table {
     height: 36px;
     width: 36px;
     color: #fff;
-    font-weight: 700;
     background-color: #26338c; }
 
 .toggle-search {
@@ -2142,8 +2136,7 @@ table {
   padding-bottom: 1em; }
   .container__breadcrumb .breadcrumb li, .container__breadcrumb .breadcrumb .divider {
     display: inline-block;
-    margin-right: 5px;
-    font-weight: 300; }
+    margin-right: 5px; }
   .container__breadcrumb .breadcrumb .divider {
     color: #d7e2e0;
     display: inline-block;
@@ -2165,7 +2158,6 @@ table {
     display: block;
     font-size: 1.125em;
     line-height: 1.2em;
-    font-weight: 300;
     padding-top: .6em;
     padding-bottom: .6em;
     position: relative;
@@ -2265,22 +2257,6 @@ body.press.articles time {
   .container__content ul, .container__content ol {
     margin-bottom: 1.5em; }
 
-.component.article article,
-.component.news article {
-  max-width: 42em; }
-
-.component.article header,
-.component.news header {
-  margin-bottom: 1.5em; }
-
-.component.article time,
-.component.news time {
-  display: block;
-  font-size: 1.25em;
-  line-height: 1.2em;
-  color: #3142b4;
-  font-weight: 300; }
-
 /* ==========================================================================
    Copyright
    ========================================================================== */

diff --git a/application/site/public/theme/muhimu/css/molecules/button/_button.scss b/application/site/public/theme/muhimu/css/molecules/button/_button.scss
@@ -4,7 +4,6 @@
 // Core
 .button {
   font-size: $font-size-large;
-  font-weight: 300;
   border: 0px none;
   padding: 8px 16px 6px;
   margin-bottom: 0; // For input.button

diff --git a/application/site/public/theme/muhimu/css/organisms/_breadcrumb.scss b/application/site/public/theme/muhimu/css/organisms/_breadcrumb.scss
@@ -32,7 +32,6 @@
     li, .divider {
       display: inline-block;
       margin-right: 5px;
-      font-weight: 300;
     }
 
     .divider {
@@ -66,7 +65,6 @@
     display: block;
     font-size: 1.125em;
     line-height: 1.2em;
-    font-weight: 300;
     padding-top: .6em;
     padding-bottom: .6em;
     position: relative;

diff --git a/application/site/public/theme/muhimu/css/organisms/_content.scss b/application/site/public/theme/muhimu/css/organisms/_content.scss
@@ -32,27 +32,3 @@
 .component {
   @extend %clearfix;
 }
-
-.component.article,
-.component.news {
-
-  article {
-    @extend %clearfix;
-
-    @include breakpoint($breakpoint-delta) {
-      max-width: 42em;
-    }
-  }
-
-  header {
-    margin-bottom: $spacing;
-  }
-
-  time {
-    display: block;
-    font-size: 1.25em;
-    line-height: 1.2em;
-    color: palette(blue, light);
-    font-weight: 300;
-  }
-}
diff --git a/application/site/public/theme/muhimu/css/organisms/_organization.scss b/application/site/public/theme/muhimu/css/organisms/_organization.scss
@@ -44,7 +44,6 @@
   }
 
   &__name {
-    font-weight: 300;
     color: $color-main-blue;
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -57,7 +56,7 @@
     line-height: $spacing;
 
     span {
-      font-weight: 700;
+      font-weight: 600;
       font-size: $spacing-s;
       padding-right: ($spacing-xs / 2);
     }

diff --git a/application/site/public/theme/muhimu/css/organisms/_search.scss b/application/site/public/theme/muhimu/css/organisms/_search.scss
@@ -38,7 +38,6 @@
     height: $button-width;
     width: $button-width;
     color: #fff;
-    font-weight: 700;
     @extend %icon--search;
     background-color: palette(blue);
   }

diff --git a/application/site/public/theme/muhimu/templates/application/page/page_head.html.php b/application/site/public/theme/muhimu/templates/application/page/page_head.html.php
@@ -21,7 +21,7 @@
     <link rel="shortcut icon" type="image/png" href="assets://application/images/touch-icon.png" />
     <link rel="apple-touch-icon" type="image/png" href="assets://application/images/touch-icon.png" />
 
-    <link href='//fonts.googleapis.com/css?family=Open+Sans:400italic,400,300,600,700' rel='stylesheet' type='text/css'>
+    <link href='//fonts.googleapis.com/css?family=Open+Sans:400,600' rel='stylesheet' type='text/css'>
 
     <ktml:title>
     <ktml:meta>