diff options
| author | Henare Degan <henare.degan@gmail.com> | 2013-02-15 17:40:04 +1100 |
|---|---|---|
| committer | Henare Degan <henare.degan@gmail.com> | 2013-02-15 17:59:06 +1100 |
| commit | a0f250204a376ce97a187cf8a9b2cb0b8c628298 (patch) | |
| tree | 812504a7b8da2431b3fed6f38f6796cdbbc84e00 /public | |
| parent | 8f1caab7990dc417e32b14cbb5f00c34a0ddc10c (diff) | |
| parent | d16f2f8242352a2d3c0350275110453dd6ac6b12 (diff) | |
Merge branch 'develop' into rails-3-spike
Conflicts:
Gemfile
Gemfile.lock
app/controllers/general_controller.rb
app/controllers/track_controller.rb
app/models/outgoing_message.rb
app/models/public_body.rb
app/models/user.rb
app/views/general/frontpage.rhtml
config/environment.rb
config/initializers/inflections.rb
config/initializers/mime_types.rb
db/migrate/094_remove_old_tags_foreign_key.rb
lib/timezone_fixes.rb
spec/models/request_mailer_spec.rb
spec/views/request/list.rhtml_spec.rb
Diffstat (limited to 'public')
| -rw-r--r-- | public/javascripts/general.js | 3 | ||||
| -rw-r--r-- | public/stylesheets/main.css | 23 |
2 files changed, 23 insertions, 3 deletions
diff --git a/public/javascripts/general.js b/public/javascripts/general.js index 9ae10593c..b52131b83 100644 --- a/public/javascripts/general.js +++ b/public/javascripts/general.js @@ -33,8 +33,9 @@ $(document).ready(function() { at: "left bottom", of: this, collision: "fit" }); - + return false; }); + $('.close-button').click(function() { $(this).parent().hide() }); $('div#variety-filter a').each(function() { $(this).click(function() { diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index 0bf88b0f2..1a6aa1d84 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -1292,9 +1292,23 @@ font-size:1.1em !important; margin:0 !important; } +/* Remove button padding in FF */ +button::-moz-focus-inner, +input[type="button"]::-moz-focus-inner, +input[type="submit"]::-moz-focus-inner { + border:0; + padding:0; +} + form input[type=submit],a.link_button_green,a.link_button_green_large { -background:url(/images/button-gradient.png); color:#FFF; +background-color: #8cc63f; /* fallback color if gradients are not supported */ +background-image: url(/images/button-gradient.png); +background-image: -webkit-linear-gradient(top, #8cc63f, #6b9731); /* For Chrome and Safari */ +background-image: -moz-linear-gradient(top, #8cc63f, #6b9731); /* For old Fx (3.6 to 15) */ +background-image: -ms-linear-gradient(top, #8cc63f, #6b9731); /* For pre-releases of IE 10*/ +background-image: -o-linear-gradient(top, #8cc63f, #6b9731); /* For old Opera (11.1 to 12.0) */ +background-image: linear-gradient(to bottom, #8cc63f, #6b9731); /* Standard syntax; must be last */ text-decoration:none; display:inline-block; line-height:18px; @@ -1311,7 +1325,12 @@ padding:5px 6px; color:white; } a.link_button_green_large { -background:url(/images/button-gradient-large.png); +background-image: url(/images/button-gradient-large.png); +background-image: -webkit-linear-gradient(top, #8cc63f, #6b9731); /* For Chrome and Safari */ +background-image: -moz-linear-gradient(top, #8cc63f, #6b9731); /* For old Fx (3.6 to 15) */ +background-image: -ms-linear-gradient(top, #8cc63f, #6b9731); /* For pre-releases of IE 10*/ +background-image: -o-linear-gradient(top, #8cc63f, #6b9731); /* For old Opera (11.1 to 12.0) */ +background-image: linear-gradient(to bottom, #8cc63f, #6b9731); /* Standard syntax; must be last */ font-size:2em; line-height:22px; padding-bottom:7px; |