aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEinar Egilsson2011-08-30 14:55:16 +0200
committerEinar Egilsson2011-08-30 14:55:16 +0200
commit9ef693c6f7d0c720e33b5415bd78191d52e1eef8 (patch)
tree9ab24b40df8343dbfe8fd28a3b9725f6d56a73b2
parente5f69904485c924d8eef44dd64ee7a07d9fc4789 (diff)
Some style fixes
-rw-r--r--chrome/js/settings.js18
-rw-r--r--chrome/settings.html8
2 files changed, 15 insertions, 11 deletions
diff --git a/chrome/js/settings.js b/chrome/js/settings.js
index 29cdf29..1a190ff 100644
--- a/chrome/js/settings.js
+++ b/chrome/js/settings.js
@@ -97,7 +97,12 @@ $(document).ready(function() {
}
ev.preventDefault();
});
-
+
+ $('#redirect-list li div a.edit').live('click', function(ev) {
+ var redirect = $(this.parentNode.parentNode).data('redirect');
+ $('#redirect-form').show();
+ ev.preventDefault();
+ });
databind();
$('#import').click(importRedirects);
@@ -112,13 +117,12 @@ $(document).ready(function() {
bindConfig();
prefs.addListener({ changedPrefs:bindConfig});
- var moving = false;
-
- function drag() {
-
- }
+
var movingElement = null;
- $('li').mousedown(function() {
+ $('li').mousedown(function(ev) {
+ if (ev.target && ev.target.tagName == 'A') {
+ return;
+ }
$(this).css('background', '-moz-linear-gradient(top, #aac, #99b)');
$('#redirect-list').css('cursor', 'move');
movingElement = this;
diff --git a/chrome/settings.html b/chrome/settings.html
index ec98b10..43318bf 100644
--- a/chrome/settings.html
+++ b/chrome/settings.html
@@ -4,7 +4,7 @@
<title>Redirector Extension Settings</title>
<style type="text/css">
body {
- font-family: Helvetica, Georgia, Arial, sans-serif;
+ font-family: Tahoma, Arial, sans-serif;
font-size:10pt;
min-height:100%;
background:-moz-linear-gradient(top, #bcd, #fff);
@@ -15,7 +15,7 @@
margin:0;
padding:0;
}
- h1 { text-align:center; color:#555; text-shadow:0px 0px 15px white; font-size:34pt; padding:0px; margin:20px 0px 0px 0px; }
+ h1 { font-family: ; text-align:center; color:#555; text-shadow:0px 0px 15px white; font-size:34pt; padding:0px; margin:20px 0px 0px 0px; letter-spacing:2px; }
label { display:table-cell; }
input { display:table-cell; }
li { margin:0; padding:5px; border-top: dotted 1px grey;}
@@ -34,7 +34,7 @@
box-shadow: 0px 0px 2px grey;
text-shadow: 1px 1px 1px white;
}
- #config { display:none; }
+ #config { display:none; position:fixed; margin:auto;}
button { border:solid 1px grey; border-radius:4px; background:-moz-linear-gradient(top, #ccc, #fff); cursor:pointer;}
h5 { text-align:center; margin:0px; padding-left:130px; }
.pattern, .redirectTo { color:blue; font-style:italic;}
@@ -42,7 +42,7 @@
#redirect-list li:nth-child(odd) { background:-moz-linear-gradient(top, #ddf, #cce); }
#redirect-list li:nth-child(even) { background-color:#fff; }
#redirect-form div { display:table-row; }
- #redirect-form { display:none; }
+ #redirect-form { display:none; position:fixed; margin:0 auto; }
</style>
<script type="text/javascript" src="js/jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="js/settings.js"></script>