github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-11 05:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
James Allen 2014-07-21 15:12:00 +01:00
commit 27795c451f
3 changed files with 50 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
services/web/app/coffee/Features/Email/EmailBuilder.coffee
View file

@ -48,7 +48,7 @@ templates.passwordResetRequested =
We got a request to reset your ShareLaTeX password.
<p>
<center>
<div style="width:200px;background-color:#0069CC;border:1px solid #02A9D6;border-radius:4px;padding:15px; margin:10px 5px">
<div style="width:200px;background-color:#a93629;border:1px solid #e24b3b;border-radius:3px;padding:15px; margin:12.5px;">
<div style="padding-right:10px;padding-left:10px">
<a href="<%= setNewPasswordUrl %>" style="text-decoration:none" target="_blank">
<span style= "font-size:16px;font-family:Arial;font-weight:bold;color:#fff;white-space:nowrap;display:block; text-align:center">
@ -73,13 +73,13 @@ templates.projectSharedWithYou =
layout: NotificationEmailLayout
type:"notification"
compiledTemplate: _.template '''
<h1 class="h1"><%= owner.email %> wants to share <a href="<%= project.url %>">'<%= project.name %>'</a> with you</h1>
<p>Hi, <%= owner.email %> wants to share <a href="<%= project.url %>">'<%= project.name %>'</a> with you</p>
<p>&nbsp;</p>
<center>
<div style="width:200px;background-color:#0069CC;border:1px solid #02A9D6;border-radius:4px;padding:15px; margin:10px 5px">
<div style="width:200px;background-color:#a93629;border:1px solid #e24b3b;border-radius:3px;padding:15px; margin:12.5px;">
<div style="padding-right:10px;padding-left:10px">
<a href="<%= project.url %>" style="text-decoration:none" target="_blank">
<span style= "font-size:16px;font-family:Arial;font-weight:bold;color:#fff;white-space:nowrap;display:block; text-align:center">
<span style= "font-size:16px;font-family:Helvetica,Arial;font-weight:400;color:#fff;white-space:nowrap;display:block; text-align:center">
View Project
</span>
</a>
@ -88,6 +88,7 @@ templates.projectSharedWithYou =
</center>
<p> Thank you</p>
<p> <a href="<%= siteUrl %>"> ShareLatex.com </a></p>
'''
module.exports =

85
services/web/app/coffee/Features/Email/Layouts/NotificationEmailLayout.coffee
View file

@ -7,7 +7,11 @@ module.exports = _.template '''
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<!-- Facebook sharing information tags -->
<meta property="og:title" />
</head>
<body leftmargin="0" marginwidth="0" topmargin="0" marginheight="0" offset="0">
<style type="text/css">
#outlook a{padding:0;} /* Force Outlook to provide a "view in browser" button. */
body{width:100% !important;} .ReadMsgBody{width:100%;} .ExternalClass{width:100%;} /* Force Hotmail to display emails at full width */
@ -29,10 +33,10 @@ module.exports = _.template '''
h1, .h1{
/*@editable*/ color:#202020;
display:block;
/*@editable*/ font-family:Arial;
/*@editable*/ font-size:34px;
/*@editable*/ font-weight:bold;
/*@editable*/ line-height:100%;
/*@editable*/ font-family:Georgia, Times;
/*@editable*/ font-size:31px;
/*@editable*/ font-weight:400;
/*@editable*/ line-height:120%;
margin-top:0;
margin-right:0;
margin-bottom:10px;
@ -43,10 +47,10 @@ module.exports = _.template '''
h2, .h2{
/*@editable*/ color:#202020;
display:block;
/*@editable*/ font-family:Arial;
/*@editable*/ font-size:30px;
/*@editable*/ font-weight:bold;
/*@editable*/ line-height:100%;
/*@editable*/ font-family:Georgia, Times;
/*@editable*/ font-size:25px;
/*@editable*/ font-weight:400;
/*@editable*/ line-height:120%;
margin-top:0;
margin-right:0;
margin-bottom:10px;
@ -57,10 +61,10 @@ module.exports = _.template '''
h3, .h3{
/*@editable*/ color:#202020;
display:block;
/*@editable*/ font-family:Arial;
/*@editable*/ font-size:26px;
/*@editable*/ font-weight:bold;
/*@editable*/ line-height:100%;
/*@editable*/ font-family:Georgia, Times;
/*@editable*/ font-size:20px;
/*@editable*/ font-weight:400;
/*@editable*/ line-height:156%;
margin-top:0;
margin-right:0;
margin-bottom:10px;
@ -77,9 +81,9 @@ module.exports = _.template '''
h4, .h4{
/*@editable*/ color:#202020;
display:block;
/*@editable*/ font-family:Arial;
/*@editable*/ font-size:22px;
/*@editable*/ font-weight:bold;
/*@editable*/ font-family:Georgia, Times;
/*@editable*/ font-size:20px;
/*@editable*/ font-weight:400;
/*@editable*/ line-height:100%;
margin-top:0;
margin-right:0;
@ -107,8 +111,8 @@ module.exports = _.template '''
*/
.preheaderContent div{
/*@editable*/ color:#505050;
/*@editable*/ font-family:Arial;
/*@editable*/ font-size:10px;
/*@editable*/ font-family:Georgia, Times;
/*@editable*/ font-size:16px;
/*@editable*/ line-height:100%;
/*@editable*/ text-align:left;
}
@ -144,9 +148,9 @@ module.exports = _.template '''
*/
.headerContent{
/*@editable*/ color:#202020;
/*@editable*/ font-family:Arial;
/*@editable*/ font-size:34px;
/*@editable*/ font-weight:bold;
/*@editable*/ font-family:Georgia, Times;
/*@editable*/ font-size:31px;
/*@editable*/ font-weight:400;
/*@editable*/ line-height:100%;
/*@editable*/ padding:0;
/*@editable*/ text-align:center;
@ -188,8 +192,8 @@ module.exports = _.template '''
*/
.bodyContent div{
/*@editable*/ color:#505050;
/*@editable*/ font-family:Arial;
/*@editable*/ font-size:14px;
/*@editable*/ font-family:Georgia, Times;
/*@editable*/ font-size:16px;
/*@editable*/ line-height:150%;
/*@editable*/ text-align:left;
}
@ -231,8 +235,8 @@ module.exports = _.template '''
*/
.footerContent div{
/*@editable*/ color:#707070;
/*@editable*/ font-family:Arial;
/*@editable*/ font-size:12px;
/*@editable*/ font-family:Georgia, Times;
/*@editable*/ font-size:13px;
/*@editable*/ line-height:125%;
/*@editable*/ text-align:left;
}
@ -296,8 +300,7 @@ module.exports = _.template '''
max-width:190px;
}
</style>
</head>
<body leftmargin="0" marginwidth="0" topmargin="0" marginheight="0" offset="0">
<center>
<table border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" id="backgroundTable">
<tr>
@ -308,12 +311,12 @@ module.exports = _.template '''
<!-- // Begin Template Header \\ -->
<table border="0" cellpadding="0" cellspacing="0" width="600" id="templateHeader">
<tr>
<td class="headerContent">
<td class="headerContent" style="padding: 25px;border-bottom:#dadf90;background-color:#f4f1de;text-align:left;">
<!-- // Begin Module: Standard Header Image \\ -->
<img src="https://www.sharelatex.com/brand/logo/banner-plain.png" style="max-width:600px;" id="headerImage campaign-icon" />
<img src="file:///Users/adamconrad/Code/Work/sharelatex/web/public/img/logo.png" style="max-width:600px;" id="headerImage campaign-icon" />
<!-- // End Module: Standard Header Image \\ -->
</td>
</tr>
</table>
@ -326,19 +329,17 @@ module.exports = _.template '''
<table border="0" cellpadding="0" cellspacing="0" width="600" id="templateBody">
<tr>
<td valign="top" class="bodyContent">
<!-- // Begin Module: Standard Content \\ -->
<table border="0" cellpadding="20" cellspacing="0" width="100%">
<tr>
<td valign="top">
<div>
<%= body %>
</div>
<%= body %>
</td>
</tr>
</table>
<!-- // End Module: Standard Content \\ -->
</td>
</tr>
</table>
@ -348,22 +349,22 @@ module.exports = _.template '''
<tr>
<td align="center" valign="top">
<!-- // Begin Template Footer \\ -->
<table border="0" cellpadding="10" cellspacing="0" width="600" id="templateFooter">
<table border="0" cellpadding="0" cellspacing="0" width="600" id="templateFooter">
<tr>
<td valign="top" class="footerContent">
<!-- // Begin Module: Standard Footer \\ -->
<table border="0" cellpadding="10" cellspacing="0" width="100%">
<table border="0" cellpadding="25" cellspacing="0" width="100%">
<tr>
<td colspan="2" valign="middle" id="social">
<div">
&nbsp;<a href="http://twitter.com/#!/sharelatex">follow on Twitter</a> | <a href="http://www.facebook.com/pages/ShareLaTeX/301671376556660">friend on Facebook</a>
<div>
&nbsp;<a href="http://twitter.com/#!/sharelatex">Follow on Twitter</a> | <a href="http://www.facebook.com/pages/ShareLaTeX/301671376556660">Friend on Facebook</a>
</div>
</td>
</tr>
</table>
<!-- // End Module: Standard Footer \\ -->
</td>
</tr>
</table>
@ -371,7 +372,7 @@ module.exports = _.template '''
</td>
</tr>
</table>
<br />
</td>
</tr>
</table>

2
services/web/public/coffee/main/project-list.coffee
View file

@ -95,7 +95,9 @@ define [
$scope.clearSearchText = () ->
$scope.searchText = ""
$scope.filter = "all"
$scope.$emit "search:clear"
$scope.updateVisibleProjects()
$scope.setFilter = (filter) ->
$scope.filter = filter