Skip to content
Snippets Groups Projects
Commit b1e3230c authored by khawkins98's avatar khawkins98
Browse files

Merge branch 'v1.1' into v1.2

# Conflicts:
#	index.html
#	js/foundationExtendEBI.js
#	libraries/foundation-6/js/foundation.js
#	libraries/foundation-6/js/foundation.min.js
parents 7c4aaddc 5d36e0a1
No related branches found
No related tags found
No related merge requests found
......@@ -28,7 +28,7 @@ a.special { background-color: #7cd17c; }
.menu .active > a,
.tag,
.tabs-title > a:hover
.tabs-title > a:hover,
.button,
.button.primary {
background-color: rgb(0,124,130);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment