Merge pull request #96 from misd-service-development/1.7

JeebsUK · web-flow · commit c3ff63123d28 · 2017-05-10T15:32:12.000+01:00
1.7
diff --git a/cambridge_theme.info b/cambridge_theme.info
@@ -2,7 +2,7 @@ name = University of Cambridge
 description = The University of Cambridge's house style.
 core = 7.x
 engine = phptemplate
-version = 1.6-dev
+version = 1.7
 
 stylesheets[all][] = "css/full-stylesheet.css"
 stylesheets[all][] = "css/drupal.css"
diff --git a/js/custom.js b/js/custom.js
@@ -647,9 +647,9 @@ projectlight.localNav=(function(){
 			}
 		}
 	}
-	//controls mulitple levels of dropdown navigation depending on hover and clicked classes being set
-	//nb: we have altered from the original sony code by only allowing users to open one level or
-	//dropdown menu in the desktop view
+	// controls multiple levels of dropdown navigation depending on hover and clicked classes being set
+	// nb: we have altered from the original code by only allowing users to open one level of
+	// dropdown menu in the desktop view
 	function showSubNavigation(linkClicked, event){
 		var $linkClicked = $(linkClicked),
 		$listItemClicked = $linkClicked.parent(),

Original file line number	Diff line number	Diff line change
`@@ -647,9 +647,9 @@ projectlight.localNav=(function(){`
`647`	`647`	`}`
`648`	`648`	`}`
`649`	`649`	`}`
`650`		`- //controls mulitple levels of dropdown navigation depending on hover and clicked classes being set`
`651`		`- //nb: we have altered from the original sony code by only allowing users to open one level or`
`652`		`- //dropdown menu in the desktop view`
	`650`	`+ // controls multiple levels of dropdown navigation depending on hover and clicked classes being set`
	`651`	`+ // nb: we have altered from the original code by only allowing users to open one level of`
	`652`	`+ // dropdown menu in the desktop view`
`653`	`653`	`function showSubNavigation(linkClicked, event){`
`654`	`654`	`var $linkClicked = $(linkClicked),`
`655`	`655`	`$listItemClicked = $linkClicked.parent(),`