From b35f81cc47aaaf431c4af7c159f95e7a3d038d2c Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 16 May 2016 17:41:35 -0700 Subject: added duckduckgo pages --- amber/layouts/_blog_summary.html.haml | 18 +-- img-sources/partners/duckduckgo.svg | 215 +++++++++++++++++++++++++++++++++ pages/about-us/news/2016/duckduckgo.md | 6 + pages/about-us/partners/en.md | 5 + pages/assets/_leap.scss | 7 +- pages/en.html.haml | 4 +- pages/img/pages/duckduckgo.png | Bin 0 -> 9028 bytes pages/img/partners/duckduckgo.png | Bin 0 -> 12064 bytes 8 files changed, 241 insertions(+), 14 deletions(-) create mode 100644 img-sources/partners/duckduckgo.svg create mode 100644 pages/about-us/news/2016/duckduckgo.md create mode 100644 pages/img/pages/duckduckgo.png create mode 100644 pages/img/partners/duckduckgo.png diff --git a/amber/layouts/_blog_summary.html.haml b/amber/layouts/_blog_summary.html.haml index b4a7308..2c1d0ce 100644 --- a/amber/layouts/_blog_summary.html.haml +++ b/amber/layouts/_blog_summary.html.haml @@ -11,12 +11,12 @@ = time_tag(page.props.posted_at.to_date, :format => :long, :pubdate => true) %div.content - if page.props.preview_image - - if page.props.preview_image - .preview-img - %img{:src => page.props.preview_image} - - if page.props.preview - = page.props.preview - - else - = render :text => page.props.excerpt, :type => page.props.content_type - - if page.props.more - = link(I18n.t(:read_more) => amber_path(page)) \ No newline at end of file + .preview-img + %img{:src => page.props.preview_image} + .preview-text + - if page.props.preview + = page.props.preview + - else + = render :text => page.props.excerpt, :type => page.props.content_type + - if page.props.more + = link(I18n.t(:read_more) => amber_path(page)) \ No newline at end of file diff --git a/img-sources/partners/duckduckgo.svg b/img-sources/partners/duckduckgo.svg new file mode 100644 index 0000000..a7568f1 --- /dev/null +++ b/img-sources/partners/duckduckgo.svg @@ -0,0 +1,215 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/pages/about-us/news/2016/duckduckgo.md b/pages/about-us/news/2016/duckduckgo.md new file mode 100644 index 0000000..b8cf1fe --- /dev/null +++ b/pages/about-us/news/2016/duckduckgo.md @@ -0,0 +1,6 @@ +@title = 'Hurray for DuckDuckGo' +@author = 'elijah' +@posted_at = '2016-05-03' +@preview_image = '/img/pages/duckduckgo.png' + +Honestly, I have always been a shill for DuckDuckGo, the search engine that doesn't track its users. If you haven't tried DuckDuckGo recently, you really should. It keeps getting better all the time, largely thanks to an [[army of volunteer hackers => https://duck.co/]] who keep adding nice instant answers for all sort of useful things. DuckDuckGo also gives tons of money to great free software and security projects, and this year [[LEAP was included => https://duck.co/blog/post/303/2016-foss-donations-announcement]]. So, the next time I bump into you at the café, I better see DuckDuckGo as your default search engine or I am throwing your laptop into the street. \ No newline at end of file diff --git a/pages/about-us/partners/en.md b/pages/about-us/partners/en.md index be63fd9..f47a6ac 100644 --- a/pages/about-us/partners/en.md +++ b/pages/about-us/partners/en.md @@ -1,4 +1,5 @@ @title = 'Partners' +@toc = true ## Development partners @@ -20,6 +21,10 @@ Hivos International international development organisation guided by humanist values. Together with local civil society organisations in developing countries, Hivos wants to contribute to a free, fair and sustainable world. A world in which all citizens – both women and men – have equal access to opportunities and resources for development and can participate actively and equally in decision-making processes that determine their lives, their society and their future. + + +DuckDuckGo is an Internet search engine that emphasizes protecting searchers' privacy and avoiding the filter bubble of personalized search results. DuckDuckGo distinguishes itself from other search engines by not profiling its users and by deliberately showing all users the same search results for a given search term. + Wallace Global Fund is guided by the vision of the late Henry A. Wallace, former Secretary of Agriculture and Vice-President under Franklin D. Roosevelt. Committed to serving the general welfare, his life exemplified farsightedness, global vision, and receptivity to new ideas. He was keenly interested in scientific innovation as a force to enhance human well-being and had an abiding faith in the individual's spirit and capacity to bring about sound and just social change diff --git a/pages/assets/_leap.scss b/pages/assets/_leap.scss index 88b2a41..62cb52b 100644 --- a/pages/assets/_leap.scss +++ b/pages/assets/_leap.scss @@ -203,7 +203,7 @@ a:visited { padding: 19px; margin-bottom: 11px; // same as 'p', not sure what variable this is. background-color: $well-bg-color; - box-shadow: inset 0px 0px 5px 1px darken($well-bg-color,10%); + // box-shadow: inset 0px 0px 5px 1px darken($well-bg-color,10%); border: 1px solid lighten($well-border-color,50%); border-radius: 0px; .heading { @@ -241,13 +241,16 @@ article.page-summary { .preview-img { float:left; - margin-right: 8px; + margin-right: 12px; margin-left: 0; img { width: 175px; height: auto; } } +.preview-text { + margin-left: 175px + 12px; +} img.left { float:left; diff --git a/pages/en.html.haml b/pages/en.html.haml index 3a6e956..818fa6b 100644 --- a/pages/en.html.haml +++ b/pages/en.html.haml @@ -44,8 +44,6 @@ .row .col-sm-12 - %h1.first - Recent News - =# news_feed_link + =# news_feed_link = recent_summaries(:limit => 10) do |page| = render :partial => 'layouts/blog_summary', :locals => {:page => page} diff --git a/pages/img/pages/duckduckgo.png b/pages/img/pages/duckduckgo.png new file mode 100644 index 0000000..33fd71a Binary files /dev/null and b/pages/img/pages/duckduckgo.png differ diff --git a/pages/img/partners/duckduckgo.png b/pages/img/partners/duckduckgo.png new file mode 100644 index 0000000..fec6dc0 Binary files /dev/null and b/pages/img/partners/duckduckgo.png differ -- cgit v1.2.3