summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorryderr <r@okfoc.us>2014-09-29 14:07:31 -0400
committerryderr <r@okfoc.us>2014-09-29 14:07:31 -0400
commit5dcd5c815ba623194e8d33859f4dd2cb3d8b579c (patch)
tree5f3da3798505e0495bc3db61e998f2f3c8fe6f9f
parent7cd5291ff363c0fcd776e1039c2af650b758d70d (diff)
parent704fbb9156299cfa49fc9c514b641dd77423c121 (diff)
Merge branch 'master' of github.com:okfocus/vvalls
-rw-r--r--public/assets/javascripts/rectangles/util/minotaur.js4
-rwxr-xr-xpublic/assets/stylesheets/app.css7
2 files changed, 8 insertions, 3 deletions
diff --git a/public/assets/javascripts/rectangles/util/minotaur.js b/public/assets/javascripts/rectangles/util/minotaur.js
index e6a37e0..0fcc766 100644
--- a/public/assets/javascripts/rectangles/util/minotaur.js
+++ b/public/assets/javascripts/rectangles/util/minotaur.js
@@ -53,7 +53,9 @@
}
base.hide = function () {
- base.$el.removeClass()
+ setTimeout(function(){
+ base.$el.removeClass()
+ }, 500)
}
base.init();
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 8816673..23d8e60 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -654,7 +654,7 @@ iframe.embed {
#minotaur {
position: absolute;
- top: 26px;
+ top: 25px;
right: 260px;
opacity: 0;
}
@@ -664,8 +664,11 @@ iframe.embed {
font-weight: 300;
}
#minotaur.saving {
- background: #8fd;
+ background: white;
opacity: 1;
+ z-index: 20;
+ font-size: 13px;
+ border: 1px solid;
}
#minotaur.saving .label:after {
content: 'SAVING';