Merge branch 'master' of github.com:sharelatex/web-sharelatex

This commit is contained in:
James Allen 2014-07-28 15:06:39 +01:00
commit db920f7aaf
5 changed files with 7 additions and 10 deletions

View file

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

View file

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

View file

@ -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

View file

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

View file

@ -64,3 +64,4 @@
@import "app/register.less";
@import "app/blog.less";
@import "app/features.less";
@import "app/templates.less";