From d4be1ba7aa70317370125d43c4fd0261efa37081 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 28 Jul 2014 12:50:56 +0100 Subject: [PATCH 1/3] changed template image paths to use correct ones --- services/web/app/views/templates/index.jade | 6 ++---- services/web/app/views/templates/tag.jade | 3 +-- services/web/app/views/templates/template.jade | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/services/web/app/views/templates/index.jade b/services/web/app/views/templates/index.jade index 64d927d186..feade78f51 100644 --- a/services/web/app/views/templates/index.jade +++ b/services/web/app/views/templates/index.jade @@ -25,8 +25,7 @@ block content .row a(ng-href='{{hit.url}}') .col-md-3 - img(src="https://d1hk1zhcb5hn6i.cloudfront.net/52fb8c6f34a287a85245b493/v/0/pdf-converted-cache/style-thumbnail") - //img(ng-src='{{hit.image_url}}') + img(ng-src='{{hit.image_url}}') .col-md-7 h1(ng-bind-html='hit.name') p(ng-bind-html='hit.description') @@ -44,8 +43,7 @@ block content -each template in tag.exampleTemplates .col-md-3.template-thumbnail a(href=template.templatePagePath ? template.templatePagePath : template.canonicalUrl).thumbnail - //- img(src=template.thumbnailUrl) - img(src="https://d1hk1zhcb5hn6i.cloudfront.net/52fb8c6f34a287a85245b493/v/0/pdf-converted-cache/style-thumbnail") + img(src=template.thumbnailUrl) div.caption h3.txt-middle #{template.name} diff --git a/services/web/app/views/templates/tag.jade b/services/web/app/views/templates/tag.jade index 6913c62595..2ac601a596 100644 --- a/services/web/app/views/templates/tag.jade +++ b/services/web/app/views/templates/tag.jade @@ -14,7 +14,6 @@ block content a(href=template.templatePagePath || template.canonicalUrl) .col-md-3.template-thumbnail a(href=template.templatePagePath ? template.templatePagePath : template.canonicalUrl).thumbnail - //- img(src=template.thumbnailUrl) - img(src="https://d1hk1zhcb5hn6i.cloudfront.net/52fb8c6f34a287a85245b493/v/0/pdf-converted-cache/style-thumbnail") + img(src=template.thumbnailUrl) div.caption h3 #{template.name} diff --git a/services/web/app/views/templates/template.jade b/services/web/app/views/templates/template.jade index 4f922fa0a9..50c2db74fb 100644 --- a/services/web/app/views/templates/template.jade +++ b/services/web/app/views/templates/template.jade @@ -18,8 +18,7 @@ block content .row .col-md-12 a(href=template.pdfUrl) - //img(src="#{template.previewUrl}") - img(src="https://d1hk1zhcb5hn6i.cloudfront.net/52fb89a333621a613683ec95/v/1/pdf-converted-cache/style-preview") + img(src="#{template.previewUrl}") .col-md-6 .template-details-section From 0fb11520100a3c6617dd8ebf1c07a9fcb9e7b61b Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 28 Jul 2014 12:54:55 +0100 Subject: [PATCH 2/3] added templates less file in, got lost somewhere --- services/web/public/stylesheets/style.less | 1 + 1 file changed, 1 insertion(+) diff --git a/services/web/public/stylesheets/style.less b/services/web/public/stylesheets/style.less index be44cc249c..f05070664b 100755 --- a/services/web/public/stylesheets/style.less +++ b/services/web/public/stylesheets/style.less @@ -64,3 +64,4 @@ @import "app/register.less"; @import "app/blog.less"; @import "app/features.less"; +@import "app/templates.less"; From 2c7623d3a73f226c4718f97d908279cc801a292e Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 28 Jul 2014 14:57:06 +0100 Subject: [PATCH 3/3] added the other font sizes we use into the font import, not magic fix --- services/web/public/stylesheets/core/variables.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/web/public/stylesheets/core/variables.less b/services/web/public/stylesheets/core/variables.less index 8d9a97b0bd..73991388d7 100755 --- a/services/web/public/stylesheets/core/variables.less +++ b/services/web/public/stylesheets/core/variables.less @@ -49,8 +49,8 @@ // //## Font, line-height, and color for body text, headings, and more. -@import url(//fonts.googleapis.com/css?family=PT+Serif:400); -@import url(//fonts.googleapis.com/css?family=Open+Sans:400,300); +@import url(//fonts.googleapis.com/css?family=Open+Sans:400,600,700); +@import url(//fonts.googleapis.com/css?family=PT+Serif:400,600,700); @font-family-sans-serif: "Open Sans", sans-serif; @font-family-serif: "PT Serif", serif;