summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulie Lala <jules@okfoc.us>2014-11-27 15:21:25 -0500
committerJulie Lala <jules@okfoc.us>2014-11-27 15:21:25 -0500
commit6f7f0ac032193215223787ca69717fcb478f12ac (patch)
tree28d475ea2afbff286a1692f49261d62c5550eae1
parent150a5ef3ab0dbd8a63009ddad02a6e9df007d824 (diff)
parent09f9ea552c0867ba1628393be012ad9046889076 (diff)
Merge branch 'master' of github.com:okfocus/vvalls
-rwxr-xr-xpublic/assets/stylesheets/app.css30
1 files changed, 15 insertions, 15 deletions
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 218f38b..3c380ef 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -2908,6 +2908,18 @@ a[data-role="forgot-password"] {
100%{height:500px;top:2px;}
}
+
+#threesixty {
+ display:none;
+ width:80px;
+ z-index: 3;
+ position: fixed;
+ bottom: 0;
+ right: 0;
+ pointer-events:none;
+}
+
+
/* KEYBOARD SHORTCUTS */
.keyboard { float: left; width: 50%; margin-top: 50px; }
@@ -3113,6 +3125,9 @@ a[data-role="forgot-password"] {
.reader iframe {
display:none;
}
+ #threesixty {
+ display:inline;
+ }
}
@media screen and (orientation:portrait) {
@@ -3139,22 +3154,7 @@ a[data-role="forgot-password"] {
}
}
-#threesixty {
- display:none;
- width:80px;
- z-index: 3;
- position: fixed;
- bottom: 0;
- right: 0;
- pointer-events:none;
-}
-@media screen and (orientation:landscape) {
- #threesixty {
- display:inline;
- }
-
-}
@media screen and (orientation:landscape) and (max-width: 680px){
.projectList.about .item span:nth-child(1) {
height: 180px;