summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-11-05 12:40:14 -0500
committerJules Laplace <jules@okfoc.us>2014-11-05 12:40:14 -0500
commit69cf6a5005dcd0e7fcebcc1db9bd290b5fb63ed1 (patch)
treed9783302bebc355ce79398770689cdbfbddba95a /public
parent38721a909cf2fe2e809f08445c94321d8635c1c9 (diff)
parentf4a11055e13b08bc90ee72cad79acaf295318d67 (diff)
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'public')
-rw-r--r--public/assets/javascripts/app.js1
-rwxr-xr-xpublic/assets/stylesheets/app.css6
2 files changed, 6 insertions, 1 deletions
diff --git a/public/assets/javascripts/app.js b/public/assets/javascripts/app.js
index 0488f11..b4eb9e6 100644
--- a/public/assets/javascripts/app.js
+++ b/public/assets/javascripts/app.js
@@ -8,7 +8,6 @@ else if ($.browser.msie || ! has3d()) {
}
else {
$("html").addClass("desktop");
- new WOW().init()
}
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 7b8dd26..90454be 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -2354,6 +2354,8 @@ form li textarea {
-webkit-transition:0.2s background;
-moz-transition:0.2s background;
transition:0.2s background;
+ position: relative;
+ z-index: 5;
}
.loading .hero .circle {
@@ -2823,6 +2825,10 @@ a[data-role="forgot-password"] {
.footer {
padding:50px 0 120px 0;
}
+ .videoModal .ion-ios7-close-empty {
+ right: 10px;
+ top: 20px;
+ }
}
@media screen and (orientation:portrait) {