New theme

Author: unknowndomain

apps/home/views/index.pug

@@ -1,19 +1,25 @@
 extends ../../../src/views/base.pug
 
 block navbar
-	.jumbotron
-		h1 Welcome...
-		p #{ config.about.text }
-		p: a( href=config.about.link.url, target="_blank").btn.btn-primary #{ config.about.link.text }
-		.bg
 
 block contents
+	.row
+		.col-md-12
+			h2
+				strong #{ config.organisation }
+				br
+				| #{ config.title }
+			h4 #{ config.about.text }
+			p: a( href=config.about.link.url, target="_blank").btn #{ config.about.link.text }
+			.bg
 	.row
 		.col-md-6
 			.page-header
-				h2 Join
-			p: a( href="/join" ).btn.btn-primary.btn-block Join Now
+				h3 New member
+			p Becoming a new member is straightforward, click below to get started. 
+			a( href="/join" ).btn.btn-primary Join
 		.col-md-6
 			.page-header
-				h2 Login
+				h3 Existing member
 			include ../../login/views/partials/form.pug
+		

apps/join/views/index.pug

@@ -52,14 +52,14 @@ block contents
 				.form-group
 					label( for="address" ).col-md-3 Address
 					.col-md-5
-						textarea( name="address" )#address.form-control #{ user.address }
+						textarea( name="address", rows=4 )#address.form-control #{ user.address }
 				hr
 				.form-group
 					.col-md-12
 						button.btn.btn-primary.pull-right Next
 							span.glyphicon.glyphicon-chevron-right
 		.col-md-4
 			.page-header
-				h2 Already a member?
+				h2 Existing member
 			p If you are already a member you can just login...
 			include ../../login/views/partials/form.pug

apps/login/views/partials/form.pug

@@ -9,4 +9,4 @@ form( method="post", action="/login" )
 	.form-group
 		button( role="button" ).btn.btn-primary Login
 		|  
-		a( href="/password-reset" ).btn.btn-default Reset Password
+		a( href="/password-reset" ).btn.btn-default Forgotten Password

apps/members/views/member.pug

@@ -25,7 +25,7 @@ block contents
 		.row
 			.col-md-6
 				.page-header
-					h2 Profile
+					h3 Profile
 						if access == 'superadmin'
 							a( href="/members/" + member.uuid + "/profile" ).btn.btn-default.pull-right
 								span.glyphicon.glyphicon-pencil
@@ -58,7 +58,7 @@ block contents
 		.row
 			.col-md-6
 				.page-header
-					h3 Membership System
+					h3 System
 						if access == 'superadmin'
 							.btn-group.pull-right
 								a( href="/members/" + member.uuid + "/activation" ).btn.btn-default

src/views/base.pug

@@ -10,7 +10,7 @@ html
 				title #{ config.title } — #{ config.organisation }
 		block head
 			block css
-				link( rel="stylesheet", href="/css/bootstrap.min.css" )
+				link( rel="stylesheet", href="/css/theme.min.css" )
 				link( rel="stylesheet", href="/css/style.css" )
 			block js
 				script( src="/js/jquery.js" )

src/views/partials/navbar.pug

@@ -1,4 +1,4 @@
-nav.navbar.navbar-default
+nav.navbar.navbar-inverse
 	.container-fluid
 		.navbar-header
 		button( type="button", data-toggle="collapse", data-target="#menu", aria-expanded="false" ).navbar-toggle.collapsed

static/css/password-requirements.css

@@ -11,12 +11,12 @@
 .pw:before {
 	font-family: "Glyphicons Halflings";
 	content: "\e014";
-	color: #d9534f;
+	color: #ff0000;
 	margin-right: 0.5em;
 	vertical-align: middle;
 }
 
 .pw.pass:before {
 	content: "\e013";
-	color: #5cb85c;
+	color: #54cc54;
 }

static/css/style.css

@@ -50,10 +50,23 @@ body {
 .btn-link:hover {
   color: #23527c;
 }
+.page-header {
+  margin-top: 0;
+}
+.navbar {
+  box-shadow: none;
+  -webkit-box-shadow: none;
+}
 .navbar .container-fluid {
   padding-left: 0;
 }
 .navbar .container-fluid .collapse.navbar-collapse {
   padding-left: 0;
   padding-right: 0;
 }
+.navbar ul.nav.navbar-nav li a {
+  border-radius: 3px;
+}
+ul.nav.nav-tabs {
+  margin-bottom: 15px;
+}