Permalink
Browse files

Fixes for iframe injection and important rules for margins, padding a…

…nd text choices
  • Loading branch information...
1 parent 8c258bc commit 5c47baf080faafdc296f8867acc4da3d3069ef3e @stuartgibson stuartgibson committed May 28, 2012
Showing with 20 additions and 18 deletions.
  1. +3 −1 Pull to Refresh.safariextension/pull_to_refresh.js
  2. +17 −17 Pull to Refresh.safariextension/styles.css
@@ -1,5 +1,6 @@
+// Do not inject into iframes
+if (window.top === window) {
// Setup the namespace
-
var pullToReload = {
// Instance vars
@@ -135,6 +136,7 @@ var pullToReload = {
}, 750);
}
+}
};
$(document).ready(pullToReload.init);
@@ -5,7 +5,7 @@
left: 0px;
height: 40px;
width: 40%;
- margin: 0 30%;
+ margin: 0 30% !important;
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
background: -webkit-linear-gradient(bottom, rgba(20,20,20,0.9) 5%, rgba(64,64,64,0.9) 53%);
@@ -17,17 +17,17 @@
#pullToRefresh .wrap{
width: 180px;
- margin: 0 auto;
- padding: 10px 0;
+ margin: 0 auto !important;
+ padding: 10px 0 !important;
}
#pullToRefresh #pullyText{
width: 160px;
display: block;
color: #fff;
- line-height: 20px;
- font-size: 16px;
- font-family: 'Helvetica Neue', Helvetica, sans-serif;
+ line-height: 20px !important;
+ font-size: 16px !important;
+ font-family: 'Helvetica Neue', Helvetica, sans-serif !important;
text-shadow: 1px 1px 0px rgba(0,0,0,0.8);
}
@@ -38,11 +38,11 @@
width: 20px;
height: 20px;
color: #fff;
- font-size: 20px;
- line-height: 20px;
+ font-size: 20px !important;
+ line-height: 20px !important;
text-align: center;
border-radius: 20px;
- margin-left: 20px;
+ margin-left: 20px !important;
-webkit-transition: all .3s ease-in-out;
}
@@ -74,11 +74,11 @@
width: 20px;
height: 20px;
color: #fff;
- font-size: 20px;
- line-height: 20px;
+ font-size: 20px !important;
+ line-height: 20px !important;
text-align: center;
text-indent: -10000px;
- margin: 10px;
+ margin: 10px !important;
-webkit-animation-name: rotate;
-webkit-animation-duration: 0.5s;
-webkit-animation-iteration-count: infinite;
@@ -93,20 +93,20 @@
top: 200px;
left: 50%;
width: 160px;
- margin-left: -100px;
+ margin-left: -100px !important;
background: rgba(0,0,0,0.8);
border-radius: 5px;
- padding: 20px;
- min-height: 40px;
+ padding: 20px !important;
+ min-height: 40px !important;
z-index: 100010;
}
#pullToRefreshReloading .text{
width: 120px;
display: block;
color: #fff;
- line-height: 40px;
- font-size: 16px;
+ line-height: 40px !important;
+ font-size: 16px !important;
font-family: 'Helvetica Neue', Helvetica, sans-serif;
text-shadow: 1px 1px 0px rgba(0,0,0,0.8);
}

0 comments on commit 5c47baf

Please sign in to comment.