commit 9a01de79bd112ab542f008abf9b832d76d9f3d4c Author: Antonela hola@antonela.me Date: Thu Jan 17 16:58:54 2019 -0300
UI review - sponsors
add sponsor images, review padding, minor ui bugs --- assets/scss/_portal.scss | 2 +- assets/static/bootstrap.css | 2 +- assets/static/images/sponsors/OTF.png | Bin 0 -> 18657 bytes assets/static/images/sponsors/USSD.png | Bin 499319 -> 90079 bytes assets/static/images/sponsors/cymru.png | Bin 18259 -> 16385 bytes assets/static/images/sponsors/darpa.png | Bin 525926 -> 127422 bytes assets/static/images/sponsors/fastly.png | Bin 0 -> 10142 bytes assets/static/images/sponsors/handshake.png | Bin 0 -> 11209 bytes assets/static/images/sponsors/imls.png | Bin 31458 -> 36164 bytes assets/static/images/sponsors/mdf.png | Bin 0 -> 29004 bytes assets/static/images/sponsors/mozilla.png | Bin 0 -> 16327 bytes assets/static/images/sponsors/nsf.png | Bin 1434049 -> 63745 bytes assets/static/images/sponsors/rose.png | Bin 37996 -> 42626 bytes assets/static/images/sponsors/sida.png | Bin 3355 -> 38963 bytes content/about/sponsors/fastly/contents.lr | 2 +- content/about/sponsors/handshake/contents.lr | 2 +- content/about/sponsors/mdf/contents.lr | 2 +- content/about/sponsors/mozilla/contents.lr | 2 +- content/about/sponsors/otf/contents.lr | 2 +- templates/layout.html | 2 +- templates/macros/sponsors.html | 6 +++-- templates/sponsors.html | 32 +++++++++++++-------------- 22 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/assets/scss/_portal.scss b/assets/scss/_portal.scss index bd6d902..2cd09f3 100644 --- a/assets/scss/_portal.scss +++ b/assets/scss/_portal.scss @@ -47,7 +47,7 @@ text-align: left; }
-.description-small { +.description-small, .description-small p { font-size: 16px; width: 95%; } diff --git a/assets/static/bootstrap.css b/assets/static/bootstrap.css index a5ad318..73863a4 100644 --- a/assets/static/bootstrap.css +++ b/assets/static/bootstrap.css @@ -8652,7 +8652,7 @@ a.text-dark:focus, a.text-dark:hover { text-align: left; }
-.description-small { +.description-small, .description-small p { font-size: 16px; width: 95%; } diff --git a/assets/static/images/sponsors/OTF.png b/assets/static/images/sponsors/OTF.png new file mode 100644 index 0000000..6b5d9bb Binary files /dev/null and b/assets/static/images/sponsors/OTF.png differ diff --git a/assets/static/images/sponsors/USSD.png b/assets/static/images/sponsors/USSD.png index de3edeb..a62b096 100644 Binary files a/assets/static/images/sponsors/USSD.png and b/assets/static/images/sponsors/USSD.png differ diff --git a/assets/static/images/sponsors/cymru.png b/assets/static/images/sponsors/cymru.png index f31f95b..8170abb 100644 Binary files a/assets/static/images/sponsors/cymru.png and b/assets/static/images/sponsors/cymru.png differ diff --git a/assets/static/images/sponsors/darpa.png b/assets/static/images/sponsors/darpa.png index be4405f..8a6e79c 100644 Binary files a/assets/static/images/sponsors/darpa.png and b/assets/static/images/sponsors/darpa.png differ diff --git a/assets/static/images/sponsors/fastly.png b/assets/static/images/sponsors/fastly.png new file mode 100644 index 0000000..ba71a3c Binary files /dev/null and b/assets/static/images/sponsors/fastly.png differ diff --git a/assets/static/images/sponsors/handshake.png b/assets/static/images/sponsors/handshake.png new file mode 100644 index 0000000..82bd860 Binary files /dev/null and b/assets/static/images/sponsors/handshake.png differ diff --git a/assets/static/images/sponsors/imls.png b/assets/static/images/sponsors/imls.png index 88a3bdf..20fff7a 100644 Binary files a/assets/static/images/sponsors/imls.png and b/assets/static/images/sponsors/imls.png differ diff --git a/assets/static/images/sponsors/mdf.png b/assets/static/images/sponsors/mdf.png new file mode 100644 index 0000000..2228612 Binary files /dev/null and b/assets/static/images/sponsors/mdf.png differ diff --git a/assets/static/images/sponsors/mozilla.png b/assets/static/images/sponsors/mozilla.png new file mode 100644 index 0000000..614b80d Binary files /dev/null and b/assets/static/images/sponsors/mozilla.png differ diff --git a/assets/static/images/sponsors/nsf.png b/assets/static/images/sponsors/nsf.png index 7c52c69..8e45952 100644 Binary files a/assets/static/images/sponsors/nsf.png and b/assets/static/images/sponsors/nsf.png differ diff --git a/assets/static/images/sponsors/rose.png b/assets/static/images/sponsors/rose.png index 6efe42f..0fa90d0 100644 Binary files a/assets/static/images/sponsors/rose.png and b/assets/static/images/sponsors/rose.png differ diff --git a/assets/static/images/sponsors/sida.png b/assets/static/images/sponsors/sida.png index bb620ee..f6a6802 100644 Binary files a/assets/static/images/sponsors/sida.png and b/assets/static/images/sponsors/sida.png differ diff --git a/content/about/sponsors/fastly/contents.lr b/content/about/sponsors/fastly/contents.lr index 46088f2..bbd1e20 100644 --- a/content/about/sponsors/fastly/contents.lr +++ b/content/about/sponsors/fastly/contents.lr @@ -6,7 +6,7 @@ time: 2016 - 2018 --- name: Fastly --- -logo: /static/images/sponsors/fastly.svg +logo: /static/images/sponsors/fastly.png --- link: https://www.fastly.com/ --- diff --git a/content/about/sponsors/handshake/contents.lr b/content/about/sponsors/handshake/contents.lr index bb7f6fd..b39a8b8 100644 --- a/content/about/sponsors/handshake/contents.lr +++ b/content/about/sponsors/handshake/contents.lr @@ -6,7 +6,7 @@ time: 2010 - 2013, 2017 - 2020 --- name: The Handshake Foundation --- -logo: /static/images/sponsors/handshake.svg +logo: /static/images/sponsors/handshake.png --- link: https://handshake.org/ --- diff --git a/content/about/sponsors/mdf/contents.lr b/content/about/sponsors/mdf/contents.lr index bc64470..4eced17 100644 --- a/content/about/sponsors/mdf/contents.lr +++ b/content/about/sponsors/mdf/contents.lr @@ -6,7 +6,7 @@ time: 2016 - 2018 --- name: Media Democracy Found --- -logo: /static/images/sponsors/mdf.jpg +logo: /static/images/sponsors/mdf.png --- link: http://mediademocracyfund.org/ --- diff --git a/content/about/sponsors/mozilla/contents.lr b/content/about/sponsors/mozilla/contents.lr index 48ff4f0..4f8fadc 100644 --- a/content/about/sponsors/mozilla/contents.lr +++ b/content/about/sponsors/mozilla/contents.lr @@ -6,7 +6,7 @@ time: 2016 - 2018 --- name: Mozilla --- -logo: /static/images/sponsors/mozilla.jpg +logo: /static/images/sponsors/mozilla.png --- link: https://www.mozilla.org/en-US/moss/ --- diff --git a/content/about/sponsors/otf/contents.lr b/content/about/sponsors/otf/contents.lr index ef21336..c1dbe2b 100644 --- a/content/about/sponsors/otf/contents.lr +++ b/content/about/sponsors/otf/contents.lr @@ -6,7 +6,7 @@ time: 2012 - 2019 --- name: Open Technology Fund --- -logo: /static/images/sponsors/OTF.jpg +logo: /static/images/sponsors/OTF.png --- link: https://www.opentech.fund/ --- diff --git a/templates/layout.html b/templates/layout.html index 53bf2b8..82e7e5f 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -14,7 +14,7 @@ <div class="container-fluid"> <div class="row flex-xl-nowrap"> <main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'order') }}"> - <div class="container py-3 preamble"> + <div class="container py-3 mt-5 preamble"> {{ this.body }} </div> {% include this.html %} diff --git a/templates/macros/sponsors.html b/templates/macros/sponsors.html index f5d53dd..fd7d4a1 100644 --- a/templates/macros/sponsors.html +++ b/templates/macros/sponsors.html @@ -1,9 +1,11 @@ {% macro render_active(item, alternative) %} -<div class="card border-0 col-6"> +<div class="col-4"> +<div class="card border-1"> <img class="card-img-top" src="{{ item.logo|asseturl }}" alt="Card image cap"> <div class="card-body"> - <p class="text-primary description description-small"><u><a href="{{ item.link }}">{{ item.name }}</a></u></p> + <h4><a href="{{ item.link }}">{{ item.name }}</a></h4> <p class="card-text description description-small">{{ item.description }}</p> </div> </div> +</div> {% endmacro %} diff --git a/templates/sponsors.html b/templates/sponsors.html index 8bb08ba..228a582 100644 --- a/templates/sponsors.html +++ b/templates/sponsors.html @@ -1,20 +1,5 @@ <div class="container py-3"> - <h3 class="text-primary display-5">Past Sponsors</h3> -</div> -<div class="container"> - <div class="row"> - <div class="col-8"> - <ul class="jobs-ul"> - {% set items = this.children %} - {% for item in items.filter(F.active == False) %} - <li><a href="{{ item.link}}">{{ item.name }}</a> - <span> {{ item.time }}</span></li> - {% endfor %} - </ul> - </div> - </div> -</div> -<div class="container py-3"> - <h3 class="text-primary display-5">Active Sponsors</h3> +<h3 class="text-primary display-5">Active Sponsors</h3> </div> <div class="container"> <div class="row"> @@ -25,6 +10,21 @@ {% endfor %} </div> </div> +<div class="container py-3"> +<h3 class="text-primary display-5">Past Sponsors</h3> +</div> +<div class="container"> +<div class="row"> + <div class="col-8"> + <ul class="jobs-ul"> + {% set items = this.children %} + {% for item in items.filter(F.active == False) %} + <li><a href="{{ item.link}}">{{ item.name }}</a> - <span> {{ item.time }}</span></li> + {% endfor %} + </ul> + </div> +</div> +</div> <div class="container"> <div class="row"> <p>This sponsors page is based upon un-audited and un-reviewed financial and in-kind donations, contract, and other data. Further details about our audited and reviewed funding can be found on our Financial Reports page.</p>