Skip to content

Commit

Permalink
Merge pull request #243 from ecosyste-ms/funds-design-tweaks
Browse files Browse the repository at this point in the history
Prep for fund pages extension
  • Loading branch information
andrew authored Mar 7, 2025
2 parents 7f27ffb + c1fddc5 commit 1b066b9
Show file tree
Hide file tree
Showing 10 changed files with 70 additions and 40 deletions.
25 changes: 21 additions & 4 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,6 @@
margin-right: 0;
}
}
.stat-card-title {
@include font-size(1.625rem);
}
}

.fund-section-header {
Expand All @@ -113,8 +110,13 @@
.container {
position: relative;
}
.inverted-nav {
border-top: 3px solid $color-purple-dark;
}
}



.fund-logo {
max-width: 100px;
border-radius: 8px;
Expand Down Expand Up @@ -182,9 +184,24 @@
}

.home-search__wrapper {

@include media-breakpoint-up(md) {
display: flex;
justify-content: center;
}
}

.inverted-nav {
.nav-link {
color: $color-white;
&.disabled {
color: $color-purple-light;
}
&.active {
background-color: adjust-color($color-purple-dark, $saturation: -15%, $lightness: -15%);
border-bottom: 1px solid $color-purple;
}
&:hover, &:active, &:focus {
background-color: adjust-color($color-purple-dark, $saturation: -15%, $lightness: -7.5%);
}
}
}
8 changes: 4 additions & 4 deletions app/assets/stylesheets/ecosystems.scss
Original file line number Diff line number Diff line change
Expand Up @@ -346,11 +346,11 @@ body {
li {
padding: var(--bs-nav-link-padding-y) var(--bs-nav-link-padding-x);
}
}

.nav {
@include media-breakpoint-up(lg) {
justify-content: end;
@include media-breakpoint-up(lg) {
justify-content: end;
}
}
}

Expand Down Expand Up @@ -513,7 +513,7 @@ body {

.purple-grad-bg {
background-color: $color-purple-dark;
background: linear-gradient(0deg, $color-purple-dark 50%, $color-purple 100%);
background: linear-gradient(0deg, $color-purple-dark 0%, $color-purple 50%);
color: $color-white;
}

Expand Down
18 changes: 9 additions & 9 deletions app/views/allocations/_allocation_details.html.erb
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
<h3 class="fw-normal fs-6">Allocation Details</h3>
<h3 class="h4">Allocation Details</h3>
<div class="fund-stat-bar fund-stat-bar--allocation-stat-bar mb-2 mb-md-3">
<div class="stat-card mb-2">
<div class="stat-card-body">
<span class="stat-card-title"><%= number_to_currency @allocation.total_cents/100.0 %></span>
<span class="stat-card-text extra-small">Total funded</span>
<span class="stat-card-text">Total funded</span>
</div>
</div>

<div class="stat-card mb-2">
<div class="stat-card-body">
<span class="stat-card-title"><%= @allocation.funders_count %></span>
<span class="stat-card-text extra-small">Funders</span>
<span class="stat-card-text">Funders</span>
</div>
</div>

<div class="stat-card mb-2">
<div class="stat-card-body">
<span class="stat-card-title"><%= @allocation.funded_projects_count %></span>
<span class="stat-card-text extra-small">Projects</span>
<span class="stat-card-text">Projects</span>
</div>
</div>
</div>

<div class="col-md-7 col-xl-12">
<h3 class="fw-normal fs-6">Distribution Details</h3>
<h3 class="h4 mt-5">Distribution Details</h3>
<div class="fund-stat-bar fund-stat-bar--allocation-stat-bar mb-4 mb-md-5">
<% if @allocation.github_sponsored_projects_count > 0 %>
<div class="stat-card mb-2">
<div class="stat-card-body">
<span class="stat-card-title"><%= @allocation.github_sponsored_projects_count %></span>
<span class="stat-card-text extra-small">GitHub Sponsors</span>
<span class="stat-card-text">GitHub Sponsors</span>
</div>
</div>
<% end %>
Expand All @@ -38,7 +38,7 @@
<div class="stat-card mb-2">
<div class="stat-card-body">
<span class="stat-card-title"><%= @allocation.open_collective_projects_count %></span>
<span class="stat-card-text extra-small">Open Collective</span>
<span class="stat-card-text">Open Collective</span>
</div>
</div>
<% end %>
Expand All @@ -47,7 +47,7 @@
<div class="stat-card mb-2">
<div class="stat-card-body">
<span class="stat-card-title"><%= @allocation.other_projects_count %></span>
<span class="stat-card-text extra-small" data-bs-toggle="tooltip" data-bs-title="ecosyste.ms supports most funding platforms like Patreon, Kofi, and GoFundMe.">Other sources <a href="#"><%= bootstrap_icon 'info-circle', width: 14, height: 14 %></a></span>
<span class="stat-card-text" data-bs-toggle="tooltip" data-bs-title="ecosyste.ms supports most funding platforms like Patreon, Kofi, and GoFundMe.">Other sources <a href="#"><%= bootstrap_icon 'info-circle', width: 14, height: 14 %></a></span>
</div>
</div>
<% end %>
Expand All @@ -56,7 +56,7 @@
<div class="stat-card mb-2">
<div class="stat-card-body">
<span class="stat-card-title"><%= @allocation.invited_projects_count %></span>
<span class="stat-card-text extra-small" data-bs-toggle="tooltip" data-bs-title="ecosyste.ms has contacted maintainers to direct this contribution to their preferred platform or payment method.">Projects invited <a href="#"><%= bootstrap_icon 'info-circle', width: 14, height: 14 %></a></span>
<span class="stat-card-text" data-bs-toggle="tooltip" data-bs-title="ecosyste.ms has contacted maintainers to direct this contribution to their preferred platform or payment method.">Projects invited <a href="#"><%= bootstrap_icon 'info-circle', width: 14, height: 14 %></a></span>
</div>
</div>
<% end %>
Expand Down
18 changes: 9 additions & 9 deletions app/views/allocations/_completed_allocation_details.html.erb
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
<h3 class="fw-normal fs-6">Allocation Details</h3>
<h3 class="h4">Allocation Details</h3>
<div class="fund-stat-bar fund-stat-bar--allocation-stat-bar mb-2 mb-md-3">
<div class="stat-card mb-2">
<div class="stat-card-body">
<span class="stat-card-title"><%= number_to_currency @allocation.complete_payout_total_cents/100.0 %></span>
<span class="stat-card-text extra-small">Total funded</span>
<span class="stat-card-text">Total funded</span>
</div>
</div>

<div class="stat-card mb-2">
<div class="stat-card-body">
<span class="stat-card-title"><%= @allocation.funders_count %></span>
<span class="stat-card-text extra-small">Funders</span>
<span class="stat-card-text">Funders</span>
</div>
</div>

<div class="stat-card mb-2">
<div class="stat-card-body">
<span class="stat-card-title"><%= @allocation.complete_payout_projects_count %></span>
<span class="stat-card-text extra-small">Projects</span>
<span class="stat-card-text">Projects</span>
</div>
</div>
</div>

<div class="col-md-7 col-xl-12">
<h3 class="fw-normal fs-6">Distribution Details</h3>
<h3 class="h4 mt-5">Distribution Details</h3>
<div class="fund-stat-bar fund-stat-bar--allocation-stat-bar mb-4 mb-md-5">
<% if @allocation.completed_github_sponsored_projects_count > 0 %>
<div class="stat-card mb-2">
<div class="stat-card-body">
<span class="stat-card-title"><%= @allocation.completed_github_sponsored_projects_count %></span>
<span class="stat-card-text extra-small">GitHub Sponsors</span>
<span class="stat-card-text">GitHub Sponsors</span>
</div>
</div>
<% end %>
Expand All @@ -38,7 +38,7 @@
<div class="stat-card mb-2">
<div class="stat-card-body">
<span class="stat-card-title"><%= @allocation.open_collective_projects_count %></span>
<span class="stat-card-text extra-small">Open Collective</span>
<span class="stat-card-text">Open Collective</span>
</div>
</div>
<% end %>
Expand All @@ -47,7 +47,7 @@
<div class="stat-card mb-2">
<div class="stat-card-body">
<span class="stat-card-title"><%= @allocation.other_projects_count %></span>
<span class="stat-card-text extra-small" data-bs-toggle="tooltip" data-bs-title="ecosyste.ms supports most funding platforms like Patreon, Kofi, and GoFundMe.">Other sources <a href="#"><%= bootstrap_icon 'info-circle', width: 14, height: 14 %></a></span>
<span class="stat-card-text" data-bs-toggle="tooltip" data-bs-title="ecosyste.ms supports most funding platforms like Patreon, Kofi, and GoFundMe.">Other sources <a href="#"><%= bootstrap_icon 'info-circle', width: 14, height: 14 %></a></span>
</div>
</div>
<% end %>
Expand All @@ -56,7 +56,7 @@
<div class="stat-card mb-2">
<div class="stat-card-body">
<span class="stat-card-title"><%= @allocation.invited_projects_count %></span>
<span class="stat-card-text extra-small" data-bs-toggle="tooltip" data-bs-title="ecosyste.ms has contacted maintainers to direct this contribution to their preferred platform or payment method.">Projects invited <a href="#"><%= bootstrap_icon 'info-circle', width: 14, height: 14 %></a></span>
<span class="stat-card-text" data-bs-toggle="tooltip" data-bs-title="ecosyste.ms has contacted maintainers to direct this contribution to their preferred platform or payment method.">Projects invited <a href="#"><%= bootstrap_icon 'info-circle', width: 14, height: 14 %></a></span>
</div>
</div>
<% end %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/allocations/_header.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<% if @allocation.completed? %>
<span class="badge bg-success">Completed</span>
<% elsif @allocation.latest? %>
<span class="badge bg-info">Latest</span>
<span class="badge bg-primary">Latest</span>
<% end %>
</h2>

Expand All @@ -15,7 +15,7 @@
<ul class="dropdown-menu" aria-labelledby="allocationsDropdown">
<% grouped_allocations = @fund.allocations.order(created_at: :desc).group_by { |allocation| allocation.created_at.year } %>
<% grouped_allocations.each_with_index do |(year, allocations), index| %>
<li><h6 class="dropdown-header"><%= year %></h6></li>
<li><p class="dropdown-header"><%= year %></p></li>
<% allocations.each do |allocation| %>
<li>
<a class="dropdown-item" href="<%= fund_allocation_path(@fund, allocation) %>">
Expand Down
13 changes: 13 additions & 0 deletions app/views/funds/_header.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,18 @@

</div>
</div>
<% if @allocation %>
<div class="row">
<div class="col-12">
<nav class="inverted-nav mt-2 pt-4">
<ul class="nav nav-pills">
<li class="nav-item">
<a class="nav-link active" aria-current="page" href="#">Allocations</a>
</li>
</ul>
</nav>
</div>
</div>
<% end %>
</div>
</div>
2 changes: 1 addition & 1 deletion app/views/funds/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</div>
<div class="row">
<div class="callout text-center my-5 col-lg-8 offset-lg-2 ">
<p class="h3">We&rsquo;ve officially announced ecosyste.ms funds, <a href="https://opencollective.com/opensource/updates/ecosystem-funds-curated-support-for-your-critical-software-dependencies" class="spesh-link">read the blog post</a><p>
<p class="h3">We&rsquo;ve officially announced ecosyste.ms Funds, <a href="https://opencollective.com/opensource/updates/ecosystem-funds-curated-support-for-your-critical-software-dependencies" class="spesh-link">read the blog post</a><p>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/pages/about.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<h1 class="h4 text-center">About</h1>


<h2 class="text-center display-3 col-lg-10 offset-lg-1 hero pb-5 pt-3">Ecosystem Funds sets out to solve the issues of today&rsquo;s open source funding services</h2>
<h2 class="text-center display-3 col-lg-10 offset-lg-1 hero pb-5 pt-3">ecosyste.ms Funds sets out to solve the issues of today&rsquo;s open source funding services</h2>
<div class="row">
<div class="col-lg-6 col-xl-5 order-lg-2">
<%= image_tag("iceberg-dependencies.svg", alt: "Deep dependencies are hidden below the waterline", class: "img-fluid", size: "802x600") %>
Expand Down Expand Up @@ -41,7 +41,7 @@
</div>
</div>
<div class="container mt-5">
<h2 class="text-center pt-5">Ecosystem Funds is a collaboration</h2>
<h2 class="text-center pt-5">ecosyste.ms Funds is a collaboration</h2>
<div class="row">
<div class="col-lg-6 col-xl-4 offset-xl-1">
<a href="https://ecosyste.ms"><%= image_tag("ecosystems-logo.svg", alt: "ecosyste.ms", class: "img-fluid mt-5 mb-3", size: "320x68") %></a>
Expand Down
12 changes: 6 additions & 6 deletions app/views/pages/faq.html.erb
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="container">
<div class="row">
<div class="col-lg-8 page-content">
<h1 class="page-content__title display-2">ecosystem Funds FAQ</h1>
<h1 class="page-content__title display-2">ecosyste.ms Funds FAQ</h1>

<p class="lead">ecosystem funds is new, we&rsquo;ll expand this FAQ as we develop the service, until then here are a few questions we anticipate</p>
<p class="lead">ecosyste.ms Funds is new, we&rsquo;ll expand this FAQ as we develop the service, until then here are a few questions we anticipate</p>

<h2>What is ecosyste.ms?</h2>
<p>ecosyste.ms is a set of free services and tools for developers, researchers and policymakers to help identify, secure and sustain open source software. It was developed throughout 2022 by Andrew Nesbitt and Benjamin Nickols, with support from the now disbanded Plaintext Group at Schmidt Futures and Open Source Collective.</p>
Expand All @@ -14,20 +14,20 @@
<h2>I&rsquo;m a maintainer, how do I get paid?</h2>
<p>If you haven&rsquo;t already, add a <a href="https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/displaying-a-sponsor-button-in-your-repository"><code>funding.yml</code></a> file to your repository/ies. We track 10.7m packages and their corresponding repositories, directing payments according to the instructions provided in a <code>funding.yml</code> file. If we cannot find or read a file, we use publicly available information to contact the maintainer(s), asking them to accept funds on behalf of their community, or to direct a payment by adding a <code>funding.yml</code> file to their repos.</p>

<h2>Do I have to pay tax on donations accepted from Ecosystems?</h2>
<h2>Do I have to pay tax on donations accepted from ecosyste.ms?</h2>
<p>If you have received a donation as a maintainer through ecosyste.ms it is likely that you will have to pay tax on that as income. However, if you have established a relationship with a fiscal sponsor, and you use donations to cover costs that you have paid (for instance, hosting, domain names, event attendance etc) you may be able to reimburse yourself without incurring a tax liability. We recommend you seek advice from a local tax professional if you are unsure of the law in your territory.</p>

<h2>What&rsquo;s an Ecosystem?</h2>
<h2>What&rsquo;s an ecosystem?</h2>
<p>We&rsquo;ve packaged open source projects together according to a particular technology like MariaDB, Cucumber, or Vagrant. Each of these packaged &lsquo;Funds&rsquo; includes the core technology plus any dependent projects (bindings, utilities etc) and dependencies. The idea being that you direct us toward the key technologies you depend upon, and we direct funds to the most critical projects within that domain on your behalf.</p>

<h2>How do I donate to or sponsor an ecosystem?</h2>
<p>We&rsquo;re still in public beta, so please excuse us if we&rsquo;ve yet to iron everything out but: every Ecosystem Fund has a corresponding page on Open Collective. You can donate or sponsor a Fund using Open Collective who accept a myriad of payment options. Open Source Collective, who administrate the program, are registered vendors to most large corporate sponsors. If you would like us to register with your procurement team contact <a href="mailto:[email protected]">[email protected]</a>.</p>
<p>We&rsquo;re still in public beta, so please excuse us if we&rsquo;ve yet to iron everything out but: every Ecosystem Fund has a corresponding page on Open Collective. You can donate or sponsor a fund using Open Collective who accept a myriad of payment options. Open Source Collective, who administrate the program, are registered vendors to most large corporate sponsors. If you would like us to register with your procurement team contact <a href="mailto:[email protected]">[email protected]</a>.</p>

<h2>What&rsquo;s the cost of donating to an Ecosystem?</h2>
<p>Open Source Collective (who accept and manage your sponsorship) take a 10% management fee to distribute the funds and handle all the appropriate legal and accounting responsibilities. Open Source Collective is a registered non-profit based in CA, USA.</p>

<h2>Are donations tax deductible?</h2>
<p>Donations to Ecosystem Funds are managed by Open Source Collective and are not tax deductible.</p>
<p>Donations to ecosyste.ms Funds are managed by Open Source Collective and are not tax deductible.</p>

<h2>How are funds allocated to projects?</h2>
<p>Our approach is to fund the most critical projects in a software ecosystem, and we believe that actual usage is the best measure of how critical an open source component is.</p>
Expand Down
6 changes: 3 additions & 3 deletions app/views/pages/overview.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="page-content">
<h1 class="page-content__title display-2">How it works</h1>

<p style="max-width: 40em;">Ecosystem Funds is a data-driven method to collaboratively fund the software we all depend upon. By funding the most-used software in a specific language, framework, or technology, we expand a little knowledge like &lsquo;I use Postgres&rsquo; into an empirically sound method for supporting the entire Postgres ecosystem.</p>
<p style="max-width: 40em;">ecosyste.ms Funds is a data-driven method to collaboratively fund the software we all depend upon. By funding the most-used software in a specific language, framework, or technology, we expand a little knowledge like &lsquo;I use Postgres&rsquo; into an empirically sound method for supporting the entire Postgres ecosystem.</p>
<div class="row mt-5">
<div class="col-lg-6">
<%= image_tag("gather-data.svg", alt: "", class: "img-fluid", size: "128x112") %>
Expand All @@ -25,14 +25,14 @@
<div class="col-lg-6">
<%= image_tag("moving-money.svg", alt: "", class: "img-fluid", size: "128x112") %>
<h2>We allocate funds to projects</h2>
<p>We believe that usage is the best indicator of value or &lsquo;criticality&rsquo;, so we allocate funds based on a combination of observed usage amongst 240m tracked repositories and downloads for 10.7m tracked packages. Each allocation is published on a monthly basis for each Fund.</p>
<p>We believe that usage is the best indicator of value or &lsquo;criticality&rsquo;, so we allocate funds based on a combination of observed usage amongst 240m tracked repositories and downloads for 10.7m tracked packages. Each allocation is published on a monthly basis for each fund.</p>
</div>
</div>
<div class="row mt-5">
<div class="col-lg-6">
<%= image_tag("wallet.svg", alt: "", class: "img-fluid", size: "128x112") %>
<h2>We distribute funds to maintainers</h2>
<p>Funds are sent where projects have indicated they would like to receive them in their funding.yaml files. We work with other funding platforms to get money to maintainers where they want it. For those projects that have not yet indicated, we invite them to do so or to accept funding directly.</p>
<p>Funds are sent where projects have indicated they would like to receive them in their <code>funding.yml</code> files. We work with other funding platforms to get money to maintainers where they want it. For those projects that have not yet indicated, we invite them to do so or to accept funding directly.</p>
</div>
<div class="col-lg-6">
<%= image_tag("magnifying-glass.svg", alt: "", class: "img-fluid", size: "128x112") %>
Expand Down

0 comments on commit 1b066b9

Please sign in to comment.