From 996d5413d85e4d38d33ac3827a1fc853ba9d0149 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 11 Jul 2015 11:40:14 +0100 Subject: [PATCH] Remove donation drive banner Fixes #1003 --- app/assets/images/donate-sprite@2x.png | Bin 7387 -> 0 bytes app/assets/javascripts/index.js | 9 ------- app/assets/stylesheets/common.scss | 36 ------------------------- app/views/layouts/map.html.erb | 14 ---------- config/locales/en.yml | 3 --- 5 files changed, 62 deletions(-) delete mode 100644 app/assets/images/donate-sprite@2x.png diff --git a/app/assets/images/donate-sprite@2x.png b/app/assets/images/donate-sprite@2x.png deleted file mode 100644 index 20ef9119a2806d8fcde270e77cd35aeda28b15fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7387 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 Kv;Lmrlm7$7EDz8C diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index d96bbad4a..085b615c7 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -165,15 +165,6 @@ $(document).ready(function () { $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" }); }); - if ($.cookie('_osm_donatedone2015') === 'hide') { - $('#donate').hide(); - } - - $('#donate .close').on('click', function() { - $('#donate').hide(); - $.cookie("_osm_donatedone2015", 'hide', { expires: expiry }); - }); - if ($.cookie('_osm_welcome') === 'hide') { $('.welcome').hide(); } diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 45a047611..61975d5f6 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -2674,42 +2674,6 @@ input.richtext_title[type="text"] { } } -#sidebar #donate { - background-color: rgb(89, 89, 89); - padding: 10px 5px; - min-height: 120px; - - .sprite { - background: transparent image-url('donate-sprite@2x.png') no-repeat scroll 0 0 / 120px 100px; - } - - .sprite.logo { - float: left; - background-position: 0 0; - height: 100px; - width: 100px; - } - - h2 { - margin-left: 100px; - padding: 14px 10px 6px 10px; - } - - p { - margin-left: 100px; - padding: 2px 10px 3px 10px; - } - - a { - color: $offwhite; - } - - :hover { - text-decoration: none; - color: #b7b7bf; - } -} - @import 'browse'; @media only screen and (max-width:960px) { diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb index a51daf753..cb2fd0e07 100644 --- a/app/views/layouts/map.html.erb +++ b/app/views/layouts/map.html.erb @@ -30,20 +30,6 @@

<%= t 'layouts.osm_read_only' %>

<% end %> - -
<%= render :partial => "layouts/flash" %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index ab18c6922..ea04a2c01 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -953,9 +953,6 @@ en: text: Make a Donation learn_more: "Learn More" more: More - donate_done_header: Thank You - donate_done_line_1: We hit our fundraising target! - donate_line_3: Hardware Funding Drive 2015 license_page: foreign: title: About this translation -- 2.43.2