From 38f9aba54c17beae1f13fb435c6ebb65fbd821c0 Mon Sep 17 00:00:00 2001
From: David Baldwynn <david.baldwin@alumni.ubc.ca>
Date: Wed, 15 Jun 2016 15:28:27 -0700
Subject: [PATCH] fixed navbar toggle button css

---
 public/modules/core/css/core.css              |  3 +++
 .../core/views/header.client.view.html        |  4 +--
 .../forms/base/config/forms.client.config.js  | 27 -------------------
 3 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/public/modules/core/css/core.css b/public/modules/core/css/core.css
index 12f6b6b9..55fbded2 100755
--- a/public/modules/core/css/core.css
+++ b/public/modules/core/css/core.css
@@ -42,6 +42,9 @@ body {
 	background-color: #ddd;
 	border:none;
 }
+.navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus {
+	color: white;
+}
 .navbar-inverse .navbar-collapse{
 	border: none;
 }
diff --git a/public/modules/core/views/header.client.view.html b/public/modules/core/views/header.client.view.html
index c1a1505b..1164dee2 100755
--- a/public/modules/core/views/header.client.view.html
+++ b/public/modules/core/views/header.client.view.html
@@ -3,9 +3,7 @@
 		<div class="navbar-header">
 			<button class="navbar-toggle" type="button" data-ng-click="toggleCollapsibleMenu()">
 				<span class="sr-only">Toggle navigation</span>
-				<span class="icon-bar"></span>
-				<span class="icon-bar"></span>
-				<span class="icon-bar"></span>
+				<span>MENU</span>
 			</button>
 			<a href="https://www.tellform.com/#!/" class="navbar-brand">
 				<i class="fa fa-archive" style="padding-right: 0.3em;"></i>Tell<span>Form</span>
diff --git a/public/modules/forms/base/config/forms.client.config.js b/public/modules/forms/base/config/forms.client.config.js
index 6b04a479..e4a5feeb 100644
--- a/public/modules/forms/base/config/forms.client.config.js
+++ b/public/modules/forms/base/config/forms.client.config.js
@@ -1,33 +1,6 @@
 'use strict';
 
 // Configuring the Forms drop-down menus
-angular.module('forms')
-.filter('formValidity', function(){
-	return function(formObj){
-		if(formObj && formObj.form_fields && formObj.visible_form_fields){
-
-			//get keys
-			var formKeys = Object.keys(formObj);
-
-			//we only care about things that don't start with $
-			var fieldKeys = formKeys.filter(function(key){
-				return key[0] !== '$';
-			});
-
-			var fields = formObj.form_fields;
-
-			var valid_count = fields.filter(function(field){
-				if(typeof field === 'object' && field.fieldType !== 'statement' && field.fieldType !== 'rating'){
-					return !!(field.fieldValue);
-				}
-
-			}).length;
-			return valid_count - (formObj.form_fields.length - formObj.visible_form_fields.length);
-		}
-		return 0;
-	};
-});
-
 angular.module('forms').value('supportedFields', [
 	'textfield',
 	'textarea',