github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Henry Oswald 2014-08-08 14:43:14 +01:00
commit cc71834e4e
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
services/web/app/views/templates/template.jade
View file

@ -28,20 +28,17 @@ block content
.template-details-section .template-details-section
h3 #{translate("about")} h3 #{translate("about")}
div !{template.description} div !{template.description}
div(ng-controller="openInSlController").download-buttons div(ng-controller="openInSlController", ng-cloak).download-buttons
a.btn.btn-primary.btn-large(href=template.open_in_sharelatex_url, ng-click='open()', ng-disabled="isDisabled", rel='nofollow') {{openInSlText}} a.btn.btn-primary.btn-large(href=template.open_in_sharelatex_url, ng-click='open()', ng-disabled="isDisabled", rel='nofollow') {{openInSlText}}
|   |  
a.btn.btn-default( a.btn.btn-default(
href=template.zipUrl, href=template.zipUrl,
rel='nofollow', rel='nofollow',
ng-click='downloadZip()', ng-click='downloadZip()',
data-toggle="tooltip", tooltip-placement="bottom",
data-placement="bottom", tooltip="Download .zip File"
title="",
data-original-title="Download .zip File"
) )
i.fa.fa-cloud-download i.fa.fa-cloud-download
.template-details-section.social_buttons .template-details-section.social_buttons
.addthis_toolbox.addthis_default_style.addthis_32x32_style .addthis_toolbox.addthis_default_style.addthis_32x32_style

6
services/web/public/coffee/ide/editor/directives/aceEditor/highlights/HighlightsManager.coffee
View file

@ -216,7 +216,7 @@ define [
@_addMarkerWithCustomStyle( @_addMarkerWithCustomStyle(
new Range( new Range(
annotation.highlight.start.row, annotation.highlight.start.column, annotation.highlight.start.row, annotation.highlight.start.column,
annotation.highlight.end.row, annotation.highlight.end.column + 1 annotation.highlight.end.row, annotation.highlight.end.column
), ),
"annotation highlight", "annotation highlight",
false, false,
@ -228,7 +228,7 @@ define [
@_addMarkerWithCustomStyle( @_addMarkerWithCustomStyle(
new Range( new Range(
annotation.strikeThrough.start.row, annotation.strikeThrough.start.column, annotation.strikeThrough.start.row, annotation.strikeThrough.start.column,
annotation.strikeThrough.end.row, annotation.strikeThrough.end.column + 1 annotation.strikeThrough.end.row, annotation.strikeThrough.end.column
), ),
"annotation strike-through-background", "annotation strike-through-background",
false, false,
@ -237,7 +237,7 @@ define [
@_addMarkerWithCustomStyle( @_addMarkerWithCustomStyle(
new Range( new Range(
annotation.strikeThrough.start.row, annotation.strikeThrough.start.column, annotation.strikeThrough.start.row, annotation.strikeThrough.start.column,
annotation.strikeThrough.end.row, annotation.strikeThrough.end.column + 1 annotation.strikeThrough.end.row, annotation.strikeThrough.end.column
), ),
"annotation strike-through-foreground", "annotation strike-through-foreground",
true, true,