Merge pull request #139 from devinmatte/develop

bgrawi · web-flow · commit bc306818295a · 2017-11-01T16:00:43.000-04:00
Added 6 new Colors
diff --git a/assets/src/modules/sm/App/controllers/AppController.js b/assets/src/modules/sm/App/controllers/AppController.js
@@ -624,16 +624,24 @@ angular.module('sm').controller("AppController", function($scope, localStorage,
 				label: "Location, Number, Professor"
 			}]
 		},
-		colors:
-			["#7BA270",
-			 "#85B4C2",
-			 "#CD9161",
-			 "#74B79F",
-			 "#AA9E5B",
-			 "#769E9F",
-			 "#9D987A",
-			 "#658B76",
-			 "#92838F",
-			 "#A9ABC3"]
+        colors:
+            [
+                "#7BA270",
+                "#85B4C2",
+                "#CD9161",
+                "#74B79F",
+                "#AA9E5B",
+                "#769E9F",
+                "#9D987A",
+                "#658B76",
+                "#92838F",
+                "#A9ABC3",
+                "#7C7FA4",
+                "#CD6167",
+                "#61CDC7",
+                "#61CD91",
+                "#9DCD61",
+                "#619DCD"
+            ]
 	};
 });
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "schedulemaker",
-  "version": "3.0.28",
+  "version": "3.0.29",
   "private": true,
   "description": "A course database lookup tool and schedule building web application for use at Rochester Institute of Technology.",
   "main": "index.php",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "schedulemaker",`
`3`		`- "version": "3.0.28",`
	`3`	`+ "version": "3.0.29",`
`4`	`4`	`"private": true,`
`5`	`5`	`"description": "A course database lookup tool and schedule building web application for use at Rochester Institute of Technology.",`
`6`	`6`	`"main": "index.php",`