commit 9c314805852ffed036ceb07c8e0a2504552cc48e Author: hiro hiro@torproject.org Date: Thu Jan 17 15:59:07 2019 +0100
Add jobs and modify sponsors --- templates/macros/people.html | 9 +-------- templates/sponsors.html | 47 -------------------------------------------- 2 files changed, 1 insertion(+), 55 deletions(-)
diff --git a/templates/macros/people.html b/templates/macros/people.html index b6743a7..11109fe 100644 --- a/templates/macros/people.html +++ b/templates/macros/people.html @@ -1,9 +1,5 @@ {% macro render_board(item, alternative) %} -<<<<<<< HEAD - <div class="card p-3 mx-auto border-0 col-4"> -======= <div class="card border-0 col-6"> ->>>>>>> 530331a95807603311a9dafe6ecbe5a623fd0d8e <div class="card-body"> <h5 class="card-title human-name">{{ item.name }}</h5> <h6 class="card-subtitle mb-2 text-primary nick text-capitalize">{{ item.title }}</h6> @@ -14,11 +10,8 @@ {% endmacro %}
{% macro render_core(item, alternative) %} -<<<<<<< HEAD - <div class="card mx-auto border-0 border-bottom border-light col-3"> -======= <div class="card border-0 border-bottom border-light col-3"> ->>>>>>> 530331a95807603311a9dafe6ecbe5a623fd0d8e + <div class="card border-0 border-bottom border-light col-3"> <div class="card-body"> <h5 class="card-title human-name human-name-small">{{ item.name }}</h5> <h6 class="card-subtitle mb-2 text-primary nick text-lowercase">{{ item.nickname }}{% if item.pronoun %} - {{ item.pronoun }}{% endif %}{% if item.twitter_handle %} - <a href="https://twitter.com/{{ item.twitter_handle }}">@{{ item.twitter_handle }}</a>{% endif %}</h6> diff --git a/templates/sponsors.html b/templates/sponsors.html index f434a08..8bb08ba 100644 --- a/templates/sponsors.html +++ b/templates/sponsors.html @@ -3,35 +3,6 @@ </div> <div class="container"> <div class="row"> -<<<<<<< HEAD - <div class="card mx-auto col-3"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> - </div> - <div class="card mx-auto col-3"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> - </div> - <div class="card mx-auto col-3"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> - </div> - <div class="card mx-auto col-3"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> -======= <div class="col-8"> <ul class="jobs-ul"> {% set items = this.children %} @@ -39,7 +10,6 @@ <li><a href="{{ item.link}}">{{ item.name }}</a> - <span> {{ item.time }}</span></li> {% endfor %} </ul> ->>>>>>> 530331a95807603311a9dafe6ecbe5a623fd0d8e </div> </div> </div> @@ -48,22 +18,6 @@ </div> <div class="container"> <div class="row"> -<<<<<<< HEAD - <div class="card mx-auto"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> - </div> - <div class="card mx-auto" > - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> - </div> -======= {% from "macros/sponsors.html" import render_active %} {% set items = this.children %} {% for item in items.filter(F.active == True) %} @@ -74,6 +28,5 @@ <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> ->>>>>>> 530331a95807603311a9dafe6ecbe5a623fd0d8e </div> </div>