From 34d8547fc458a6eef5d936e49cc45a18a8190a12 Mon Sep 17 00:00:00 2001 From: Tunde Date: Wed, 31 Oct 2018 18:02:44 +0000 Subject: [PATCH 1/5] adds background hex image --- app/assets/images/bg-hex.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 app/assets/images/bg-hex.svg diff --git a/app/assets/images/bg-hex.svg b/app/assets/images/bg-hex.svg new file mode 100644 index 00000000..785dc08f --- /dev/null +++ b/app/assets/images/bg-hex.svg @@ -0,0 +1 @@ + \ No newline at end of file From ee3dbc09baa3fea910e52acd45908d45496b4a2b Mon Sep 17 00:00:00 2001 From: Tunde Date: Wed, 31 Oct 2018 18:03:10 +0000 Subject: [PATCH 2/5] adds image positioning for hex bg --- app/assets/stylesheets/custom.sass | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/custom.sass b/app/assets/stylesheets/custom.sass index 6101aec3..e72adf20 100644 --- a/app/assets/stylesheets/custom.sass +++ b/app/assets/stylesheets/custom.sass @@ -314,4 +314,17 @@ footer.white hr .public > .icon height: 8px margin-bottom: 5px - background: url(eye.svg) no-repeat \ No newline at end of file + background: url(eye.svg) no-repeat + +.hex-bg-image + position: absolute + z-index: 1 + max-width: 500px + height: auto + top: 10% + + +.infront-report + position: absolute + z-index: 2 + top: 33.3% \ No newline at end of file From 1f49ee7d61147724de5701012364a6b89b65cee5 Mon Sep 17 00:00:00 2001 From: Tunde Date: Wed, 31 Oct 2018 18:09:31 +0000 Subject: [PATCH 3/5] adds article page --- app/views/articles/index.html.haml | 88 +++++++++++++++++++++++++----- 1 file changed, 75 insertions(+), 13 deletions(-) diff --git a/app/views/articles/index.html.haml b/app/views/articles/index.html.haml index d3333bbb..4d7d6bf4 100644 --- a/app/views/articles/index.html.haml +++ b/app/views/articles/index.html.haml @@ -1,19 +1,81 @@ +/////////////////////////////////////////////////////////////////////////////////////////////// +//Below should work when the articles are dynamically coming from db, commented out for now +//because its not return the values + + +-# = content_for :title, 'Blog' + +-# %main.bg-ice +-# %header +-# = render partial: 'shared/nav', locals: { color: 'blue' } +-# = cell(:breadcrumb, { 'Blog' => articles_path }, color: 'blue') + +-# %section.col2.mx-auto.mb40 +-# .center.px15 +-# %h1.h2.m10 Blog + +-# - @articles.each do |article| + +-# .bg-white.rounded.shadow.my40 +-# .bg-white.p20.border-bottom.border-mist.blue +-# .fs25= link_to(article.title, article_path(article), class: 'blue') + +-# .p20.fs16.lh20 +-# .markdown= strip_tags(article.body_html).truncate_words(50, omission: "... #{link_to('more', article_path(article), class: 'bold')}").html_safe + +-# -# TODO : Pagination -- only for display view is written below +-# .bg-ice +-# = render partial: 'shared/footer', locals: { color: 'slate' } + +////////////////////////////////////////////////////////////////////////////////////////////////////// + + = content_for :title, 'Blog' -%header - = cell :breadcrumb, { 'Blog' => articles_path }, color: 'blue' +%main.bg-ice + %header + = render partial: 'shared/nav', locals: { color: 'blue' } + = cell(:breadcrumb, { 'Blog' => articles_path }, color: 'blue') + + %section.col2.mx-auto.mb40 + .center.px15 + %h1.h2.m10 Blog + .bg-white.rounded.shadow.my40 + .bg-white.p20.border-bottom.border-mist.blue + .fs25 Finding Funding: How Much Should I Apply For? + .p20.fs16.lh20 + At Beehive we have data at our fingertips which can help you get the most out of a funding application. Something we’ve noticed small charities can struggle with is the amount of funding they should ask for. Usually when looking for funding, you’ll have an amount in mind for how… more -%main - %section.maxw1080.mx-auto - .mb40.mx40 - %h1.center Blog + .bg-white.rounded.shadow.my40 + .bg-white.p20.border-bottom.border-mist.blue + .fs25 Our Test Driven Approach + .p20.fs16.lh20 + Knowing you’re focusing on the right things is hard when developing a product or service - we share a process that makes it easier for us. Suraj Vadgama, Creator of www.beehivegiving.org & Associate @ CAST I spend most of my time working on Beehive. And being part of a… more - .maxw790.mx-auto + .bg-white.rounded.shadow.my40 + .bg-white.p20.border-bottom.border-mist.blue + .fs25 What Funders Struggle With + .p20.fs16.lh20 + David and Suraj the team behind www.beehivegiving.org share findings from their recent user research with charitable funders. Beehive was set up by a charitable foundation that understood the challenges of distributing grants, as well the difficulties faced by applicants seeking their support. Since it’s inception, Beehive - a web based… more - - @articles.each do |article| - %hr.maxw1000.mx40 + .center + .pagination + %a.blue{ href: '#' } + « + %a.blue{ href: '#' } + 1 + %a.blue{ href: '#' } + 2 + %a.blue{ href: '#' } + 3 + %a.blue{ href: '#' } + 4 + %a.blue{ href: '#' } + 5 + %a.blue{ href: '#' } + Next + %a.blue{ href: '#' } + » - %section.p40 - .mb20 - %h3= link_to(article.title, article_path(article), class: 'blue') - .markdown= strip_tags(article.body_html).truncate_words(50, omission: "... #{link_to('more', article_path(article), class: 'bold')}").html_safe +.bg-ice + = render partial: 'shared/footer', locals: { color: 'slate' } \ No newline at end of file From 4fdc516fe006ec8ee5bd6153e2b75d85c82afd32 Mon Sep 17 00:00:00 2001 From: Tunde Date: Wed, 31 Oct 2018 18:10:00 +0000 Subject: [PATCH 4/5] adds image tag of bg-hex to home page --- app/views/pages/home.html.haml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/views/pages/home.html.haml b/app/views/pages/home.html.haml index dff9f87e..026c09ec 100644 --- a/app/views/pages/home.html.haml +++ b/app/views/pages/home.html.haml @@ -3,7 +3,7 @@ %header.bg-ice = render partial: 'shared/nav', locals: { color: 'blue' } -%main.bg-ice.flex +%main.bg-ice.flex.flex-wrap .maxw1050.mx-auto.mt40.flex.flex-wrap.items-center .col2.px15.mb40 %h1.bold.mb20 Save time and avoid wasted effort @@ -22,8 +22,9 @@ Karen, = link_to "Erb's Palsy Group", 'http://www.erbspalsygroup.co.uk/', target: '_blank' - .col2.mb40 - .col1.md.px15 + .col2.mb40.flex.fex-wrap + = image_tag('bg-hex.svg', class: 'hex-bg-image') + .infront-report.col1.md.px15 .bg-white.rounded.shadow .bg-ice.border-bottom.border-mist.p20.h5.bold Recent reports @@ -36,5 +37,7 @@ = link_to 'More...', opportunities_path, class: 'bold' + + .bg-ice = render partial: 'shared/footer', locals: { color: 'slate' } From e31c0364f56a78982f0c76121b8769b7accf452c Mon Sep 17 00:00:00 2001 From: Tunde Date: Wed, 31 Oct 2018 18:10:32 +0000 Subject: [PATCH 5/5] adds the private and report element to the report page --- app/views/reports/index.html.haml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/views/reports/index.html.haml b/app/views/reports/index.html.haml index 3647bbc2..13f9fdb3 100644 --- a/app/views/reports/index.html.haml +++ b/app/views/reports/index.html.haml @@ -8,10 +8,12 @@ .maxw1050.mx-auto.px15 %h1.h2.white.mb10 My reports - .white.pb40 - Reports for - = obscure_email(@current_user.email) - + %div + .white.pb40.inline-block + Reports for + = obscure_email(@current_user.email) + .bg-rich-blue.border.border-white.rounded.white.fs15.px12.py6.inline-block Private + .right.bg-dark-blue.border-dark-blue.rounded.white.maxw100.fs12.bold.py10.px14.inline-block.center New report .maxw1050.mx-auto.px15 %section.grid.py40 - @reports.each do |report|