From f75376124ef29e5f025c462d7b67709f0a4e756d Mon Sep 17 00:00:00 2001
From: James Allen <james@sharelatex.com>
Date: Thu, 5 Feb 2015 16:56:35 +0000
Subject: [PATCH] Update open source branding

---
 services/web/app/views/layout/footer.jade     | 19 ++-----------------
 services/web/app/views/layout/navbar.jade     |  5 ++++-
 services/web/config/settings.defaults.coffee  |  4 +++-
 .../public/stylesheets/components/navbar.less | 11 +++++++++++
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/services/web/app/views/layout/footer.jade b/services/web/app/views/layout/footer.jade
index 473a62b91d..8110acddff 100644
--- a/services/web/app/views/layout/footer.jade
+++ b/services/web/app/views/layout/footer.jade
@@ -3,7 +3,7 @@
 footer.site-footer
 	.container
 		.row
-			ul.col-md-10
+			ul.col-md-9
 				
 				if Object.keys(settings.i18n.subdomainLang).length > 1
 					li.dropdown.dropup.subdued
@@ -32,7 +32,7 @@ footer.site-footer
 						else
 							| !{translate(item.text)}
 
-			ul.col-md-2.text-right
+			ul.col-md-3.text-right
 
 				each item in nav.right_footer
 					li
@@ -41,18 +41,3 @@ footer.site-footer
 						else
 							| !{item.text}
 
-
-
-
-				//- li
-				//- 	a(href="http://www.twitter.com/sharelatex")
-				//- 		i.fa.fa-twitter-square
-				//- li
-				//- 	a(href="http://www.facebook.com/pages/ShareLaTeX/301671376556660")
-				//- 		i.fa.fa-facebook-square
-				//- li
-				//- 	a(href="https://plus.google.com/115074691861228882827", rel="publisher")
-				//- 		i.fa.fa-google-plus-square
-				//- li
-				//- 	a(href="https://github.com/sharelatex/sharelatex")
-				//- 		i.fa.fa-github-square
diff --git a/services/web/app/views/layout/navbar.jade b/services/web/app/views/layout/navbar.jade
index 5095dae7ca..e91e8cd824 100644
--- a/services/web/app/views/layout/navbar.jade
+++ b/services/web/app/views/layout/navbar.jade
@@ -3,7 +3,10 @@ nav.navbar.navbar-default
 		.navbar-header
 			button.navbar-toggle(ng-init="navCollapsed = true", ng-click="navCollapsed = !navCollapsed", ng-class="{active: !navCollapsed}")
 				i.fa.fa-bars
-			a(href='/').navbar-brand
+			if nav.title
+				a(href='/').navbar-title #{nav.title}
+			else
+				a(href='/').navbar-brand
 
 		.navbar-collapse.collapse(collapse="navCollapsed")
 			
diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee
index a134498c1a..24d7a80e12 100644
--- a/services/web/config/settings.defaults.coffee
+++ b/services/web/config/settings.defaults.coffee
@@ -264,12 +264,14 @@ module.exports =
 	# 	projectId: ""
 
 	nav:
+		title: "ShareLaTeX Community Edition"
+		
 		left_footer: [{
 			text: "Powered by <a href='https://www.sharelatex.com'>ShareLaTeX</a> © 2014"
 		}]
 
 		right_footer: [{
-			text: "<i class='fa fa-github-square'></i> Contribute on Github"
+			text: "<i class='fa fa-github-square'></i> Fork on Github!"
 			url: "https://github.com/sharelatex/sharelatex"
 		}]
 
diff --git a/services/web/public/stylesheets/components/navbar.less b/services/web/public/stylesheets/components/navbar.less
index 23158c29d4..9a7555cb81 100755
--- a/services/web/public/stylesheets/components/navbar.less
+++ b/services/web/public/stylesheets/components/navbar.less
@@ -170,6 +170,17 @@
   // }
 }
 
+.navbar-title {
+    font-size: 20px;
+    display: inline-block;
+    margin-top: 2px;
+    color: #666;
+    &:hover, &:active, &:focus {
+        color: #333;
+        text-decoration: none;
+    }
+}
+
 
 // Navbar toggle
 //