correct style Vvalls -> VValls everywhere

12 files changed, 15 insertions, 16 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 48c6e97..57c7197 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -596,7 +596,6 @@ iframe.embed {
 	border-top: 0px solid;
 	font-weight: 500;
 	font-size: 40px;
-	text-transform:capitalize;
 }
 .docs .content img {
 	max-width: 90%;
@@ -643,8 +642,8 @@ iframe.embed {
   text-decoration:underline;
 }
 
-.docs .content.doc-privacy p,
-.docs .content.doc-terms p {
+.docs .content.doc-privacy,
+.docs .content.doc-terms {
   font-size: 15px;
   line-height: 25px;
   font-weight: 300;
diff --git a/server/lib/auth/mail.js b/server/lib/auth/mail.js
index 0ba6d5d..eac4007 100644
--- a/server/lib/auth/mail.js
+++ b/server/lib/auth/mail.js
@@ -6,7 +6,7 @@ var email = require("emailjs"),
 
 var mail = {
 	
-	from: 'Vvalls <info@vvalls.com>',
+	from: 'VValls <info@vvalls.com>',
 	templates: {},
 	
 	init: function(){
@@ -40,7 +40,7 @@ var mail = {
 			 text:    mail.templates.welcome.text(user),
 			 from:    mail.from,
 			 to:      user.email,
-			 subject: "Welcome to Vvalls",
+			 subject: "Welcome to VValls",
 			 attachment: [
 					{ data: mail.templates.welcome.html(user), alternative: true },
 			 ]
diff --git a/server/lib/middleware.js b/server/lib/middleware.js
index 870451a..60f2e46 100644
--- a/server/lib/middleware.js
+++ b/server/lib/middleware.js
@@ -41,10 +41,10 @@ var middleware = {
 		res.locals.config = config
 		res.locals.profile = null
     res.locals.ogImage = ""
-    res.locals.ogTitle = "Vvalls"
+    res.locals.ogTitle = "VValls"
     res.locals.ogUrl = "http://vvalls.com/"
     res.locals.ogDescription = "3D gallery space, fully customizable"
-    res.locals.ogAuthor = "Vvalls"
+    res.locals.ogAuthor = "VValls"
 		res.locals.opt = {}
 		next()
 	},
diff --git a/server/lib/util.js b/server/lib/util.js
index 0a71cb7..1f63a30 100644
--- a/server/lib/util.js
+++ b/server/lib/util.js
@@ -31,7 +31,7 @@ util.escapeRegExp = function (s) {
 	return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&")
 }
 util.htmlize = function(s) {
-  return ("<p>" + s.replace(/\n/g,"</p><p>") + "</p>").replace(/<p><\/p>/, "<br>")
+  return s.replace(/\n/g,"<br>")
 }
 
 util.cleanQuery = function (query) {
diff --git a/server/lib/views/index.js b/server/lib/views/index.js
index b3a15c2..31cb1db 100644
--- a/server/lib/views/index.js
+++ b/server/lib/views/index.js
@@ -169,7 +169,7 @@ var views = module.exports = {
 			  isOwnProfile: isOwnProfile,
 				profile: user,
 				projects: projects || [],
-				ogTitle: "Vvalls: Profile of " + user.displayName,
+				ogTitle: "VValls: Profile of " + user.displayName,
         ogUrl: "http://vvalls.com/profile/" + user.username + "/",
         ogImage: user.photo,
 			})
diff --git a/views/controls/editor/collaborators.ejs b/views/controls/editor/collaborators.ejs
index 8ad8c00..5de7d25 100644
--- a/views/controls/editor/collaborators.ejs
+++ b/views/controls/editor/collaborators.ejs
@@ -7,7 +7,7 @@
         <h2>Collaborators</h2>
 
         <p>
-          To invite others to contribute to this project, submit their email address below. They'll receive an email with instructions to join this project and register if they're not a Vvalls user yet.
+          To invite others to contribute to this project, submit their email address below. They'll receive an email with instructions to join this project and register if they're not a VValls user yet.
         </p>
 
         <form>
diff --git a/views/controls/reader/embed.ejs b/views/controls/reader/embed.ejs
index cc21c74..814644d 100644
--- a/views/controls/reader/embed.ejs
+++ b/views/controls/reader/embed.ejs
@@ -4,7 +4,7 @@
   <div class="rap">
 		<div class="holder">
 			<div class="inner vvbox">
-        <h2>Embed Vvalls</h2>
+        <h2>Embed VValls</h2>
 
         <p>
           This code generates an iframe which will embed this room in your website or blog.
diff --git a/views/mail/collaborator.html.ejs b/views/mail/collaborator.html.ejs
index 2a08a1c..c4832d1 100644
--- a/views/mail/collaborator.html.ejs
+++ b/views/mail/collaborator.html.ejs
@@ -7,7 +7,7 @@
 
 <p>
   <a href="http://vvalls.com/profile/[[- username ]]">[[- username ]]</a> has invited you to join the project
-  <a href="http://vvalls.com/project/[[- projectSlug ]]">[[- projectName ]]</a> on Vvalls.
+  <a href="http://vvalls.com/project/[[- projectSlug ]]">[[- projectName ]]</a> on VValls.
 </p>
 
 <p>
diff --git a/views/mail/collaborator.text.ejs b/views/mail/collaborator.text.ejs
index 52d39b6..2de78ad 100644
--- a/views/mail/collaborator.text.ejs
+++ b/views/mail/collaborator.text.ejs
@@ -1,5 +1,5 @@
 
-[[- username ]] has invited you to join the project [[- projectName ]] on Vvalls.
+[[- username ]] has invited you to join the project [[- projectName ]] on VValls.
 
 Accept the invitation below:
 
diff --git a/views/mail/welcome.html.ejs b/views/mail/welcome.html.ejs
index b2c329f..1d45faf 100644
--- a/views/mail/welcome.html.ejs
+++ b/views/mail/welcome.html.ejs
@@ -6,7 +6,7 @@
 </p>
 
 <p>
-	Welcome to Vvalls, [[- username ]]
+	Welcome to VValls, [[- username ]]
 </p>
 
 <p>
diff --git a/views/mail/welcome.text.ejs b/views/mail/welcome.text.ejs
index 02b449b..5c0b51d 100644
--- a/views/mail/welcome.text.ejs
+++ b/views/mail/welcome.text.ejs
@@ -1,4 +1,4 @@
 
-Welcome to Vvalls, [[- username ]]
+Welcome to VValls, [[- username ]]
 
 http://www.vvalls.com
diff --git a/views/partials/meta.ejs b/views/partials/meta.ejs
index f1b6f48..defb187 100644
--- a/views/partials/meta.ejs
+++ b/views/partials/meta.ejs
@@ -25,7 +25,7 @@
 	<meta property="og:type" content="website" />
 	<meta property="og:image" content="[[- ogImage ]]" />
 	<meta property="og:url" content="[[- ogUrl ]]" />
-	<meta property="og:site_name" content="Vvalls" />
+	<meta property="og:site_name" content="VValls" />
 	<link rel="icon" href="/favicon.ico" type="image/x-icon">
 	<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
 	<link href='/assets/stylesheets/ionicons.css' rel='stylesheet' type='text/css'>