vuestorefront · pkarw · Apr 27, 2018 · Apr 27, 2018
diff --git a/src/index.template.html b/src/index.template.html
@@ -3,22 +3,7 @@
   <head>
   	{{{ meta.inject().title.text() }}}
   	{{{ meta.inject().meta.text() }}}
-	{{{ meta.inject().link.text() }}}
-
-	<script type="text/javascript">
-		WebFontConfig = {
-		  google: { families: [ 'Playfair+Display:400,700', 'Roboto:300,400,700' ] }
-		};
-		(function() {
-		  var wf = document.createElement('script');
-		  wf.src = ('https:' == document.location.protocol ? 'https' : 'http') +
-			'://ajax.googleapis.com/ajax/libs/webfont/1.5.18/webfont.js';
-		  wf.type = 'text/javascript';
-		  wf.async = 'true';
-		  var s = document.getElementsByTagName('script')[0];
-		  s.parentNode.insertBefore(wf, s);
-		})(); 
-	</script>
+		{{{ meta.inject().link.text() }}}
 
     <% for (var chunk of webpack.chunks) {
         for (var file of chunk.files) {

diff --git a/src/themes/catalog/index.template.html b/src/themes/catalog/index.template.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html data-vue-meta-server-rendered {{{ meta.inject().htmlAttrs.text() }}}>
+  <head><!-- index for default theme -->
+  	{{{ meta.inject().title.text() }}}
+  	{{{ meta.inject().meta.text() }}}
+		{{{ meta.inject().link.text() }}}
+
+		<script type="text/javascript">
+			WebFontConfig = {
+				google: { families: [ 'Montserrat:300,400,400i,500,600,700,800' ] }
+			};
+			(function() {
+				var wf = document.createElement('script');
+				wf.src = ('https:' == document.location.protocol ? 'https' : 'http') +
+				'://ajax.googleapis.com/ajax/libs/webfont/1.5.18/webfont.js';
+				wf.type = 'text/javascript';
+				wf.async = 'true';
+				var s = document.getElementsByTagName('script')[0];
+				s.parentNode.insertBefore(wf, s);
+			})(); 
+		</script>
+
+    <% for (var chunk of webpack.chunks) {
+        for (var file of chunk.files) {
+          if (file.match(/\.(js|css)$/)) { %>
+    <link rel="<%= chunk.initial?'preload':'prefetch' %>" href="<%= htmlWebpackPlugin.files.publicPath + file %>" as="<%= file.match(/\.css$/)?'style':'script' %>"><% }}} %>
+  </head>
+  <body>
+    <!--vue-ssr-outlet-->
+  </body>
+</html>
diff --git a/src/themes/default/components/core/ProductLinks.vue b/src/themes/default/components/core/ProductLinks.vue
@@ -21,7 +21,7 @@
           </p>
           <input
             type="number"
-            class="product-qty py10 brdr-cl-primary bg-cl-transparent h4 weight-300"
+            class="product-qty py10 brdr-cl-primary bg-cl-transparent h4"
             min="1"
             autofocus
             v-model.number="productLink.product.qty"

diff --git a/src/themes/default/components/core/ProductTile.vue b/src/themes/default/components/core/ProductTile.vue
@@ -136,7 +136,6 @@ $color-white: color(white);
   text-transform: uppercase;
   color: $color-white;
   font-size: 12px;
-  font-weight: 400;
 }
 
 .product-image {

diff --git a/src/themes/default/components/core/blocks/Microcart/EditButton.vue b/src/themes/default/components/core/blocks/Microcart/EditButton.vue
@@ -1,6 +1,6 @@
 <template>
   <button class="middle-xs brdr-none bg-cl-transparent p0 inline-flex cl-secondary">
-    <span class="hidden-xs h6 weight-300">
+    <span class="hidden-xs h6">
       {{ $t('Edit') }}
     </span>
     <i class="material-icons h4 p5 pr0">mode_edit</i>

diff --git a/src/themes/default/components/core/blocks/Microcart/RemoveButton.vue b/src/themes/default/components/core/blocks/Microcart/RemoveButton.vue
@@ -1,6 +1,6 @@
 <template>
   <button class="brdr-none bg-cl-transparent p0 middle-xs inline-flex cl-secondary">
-    <span class="hidden-xs h6 weight-300">
+    <span class="hidden-xs h6">
       {{ $t('Remove') }}
     </span>
     <i class="material-icons h4 p5 pr0">remove_shopping_cart</i>

diff --git a/src/themes/default/components/core/blocks/MyAccount/MyOrder.vue b/src/themes/default/components/core/blocks/MyAccount/MyOrder.vue
@@ -172,7 +172,7 @@ table {
 
       &:before {
         content: attr(data-th) ': ';
-        font-weight: bold
+        font-weight: 700
       }
 
       &:first-child {
@@ -212,7 +212,7 @@ table {
 
       &:first-child {
         @media (max-width: 767px) {
-          font-weight: bold;
+          font-weight: 700;
           padding: 20px 20px 5px 20px;
         }
       }

diff --git a/src/themes/default/components/theme/ButtonOutline.vue b/src/themes/default/components/theme/ButtonOutline.vue
@@ -47,7 +47,6 @@ export default {
     min-width: 250px;
   }
   .dark {
-    font-weight: 200;
     border: 1px solid $dark-border;
     &:hover,
     &:focus {

diff --git a/src/themes/default/components/theme/blocks/Home/Onboard.vue b/src/themes/default/components/theme/blocks/Home/Onboard.vue
@@ -4,7 +4,7 @@
       <i slot="close" class="modal-close material-icons p15 cl-bg-tertiary" @click="close">close</i>
       <img src="/assets/logo.svg" alt="Vuestore" class="logo">
 
-      <div class="copy align-center cl-secondary weight-200">
+      <div class="copy align-center cl-secondary">
         <p class="h1">Welcome to Vue Storefront!</p>
         <div class="h4">
           <p>

diff --git a/src/themes/default/css/base/_text.scss b/src/themes/default/css/base/_text.scss
@@ -2,7 +2,7 @@
 body {
   font-size: 14px;
   font-family: 'Roboto', sans-serif;
-  font-weight: 300;
+  font-weight: 400;
 }
 
 h1,
@@ -65,12 +65,6 @@ h6,
   text-align: left;
 }
 
-.weight-200 {
-  font-weight: 200;
-}
-.weight-300 {
-  font-weight: 300;
-}
 .weight-400 {
   font-weight: 400;
 }

diff --git a/src/themes/default/index.template.html b/src/themes/default/index.template.html
@@ -3,22 +3,22 @@
   <head><!-- index for default theme -->
   	{{{ meta.inject().title.text() }}}
   	{{{ meta.inject().meta.text() }}}
-	{{{ meta.inject().link.text() }}}
-	  
-	<script type="text/javascript">
-		WebFontConfig = {
-		  google: { families: [ 'Playfair+Display:400,700', 'Roboto:300,400,700' ] }
-		};
-		(function() {
-		  var wf = document.createElement('script');
-		  wf.src = ('https:' == document.location.protocol ? 'https' : 'http') +
-			'://ajax.googleapis.com/ajax/libs/webfont/1.5.18/webfont.js';
-		  wf.type = 'text/javascript';
-		  wf.async = 'true';
-		  var s = document.getElementsByTagName('script')[0];
-		  s.parentNode.insertBefore(wf, s);
-		})(); 
-	</script>
+		{{{ meta.inject().link.text() }}}
+			
+		<script type="text/javascript">
+			WebFontConfig = {
+				google: { families: [ 'Playfair+Display:400,700', 'Roboto:400,700' ] }
+			};
+			(function() {
+				var wf = document.createElement('script');
+				wf.src = ('https:' == document.location.protocol ? 'https' : 'http') +
+				'://ajax.googleapis.com/ajax/libs/webfont/1.5.18/webfont.js';
+				wf.type = 'text/javascript';
+				wf.async = 'true';
+				var s = document.getElementsByTagName('script')[0];
+				s.parentNode.insertBefore(wf, s);
+			})(); 
+		</script>
 
     <% for (var chunk of webpack.chunks) {
         for (var file of chunk.files) {

diff --git a/src/themes/default/pages/Category.vue b/src/themes/default/pages/Category.vue
@@ -8,7 +8,7 @@
       <div class="container">
         <div class="row m0">
           <button
-            class="col-xs-5 mt25 p15 mobile-filters-button bg-cl-th-accent brdr-none cl-white h5 weight-300 sans-serif fs-medium-small"
+            class="col-xs-5 mt25 p15 mobile-filters-button bg-cl-th-accent brdr-none cl-white h5 sans-serif fs-medium-small"
             @click="openFilters"
           >
             {{ $t('Filters') }}