diff --git a/style/base/cards.scss b/style/base/cards.scss index 00297e266..f823eb561 100644 --- a/style/base/cards.scss +++ b/style/base/cards.scss @@ -1,16 +1,8 @@ .card { - border-radius: 0.5em; display: block; margin-bottom: 0.5em; padding: 0.5em; - vertical-align: top; -} -.card-default { - border: 1px solid $panel-default-border; -} -.card-primary { - border: 1px solid $panel-primary-border; } .card-md { font-size: $font-size-medium; @@ -18,17 +10,30 @@ @media (min-width: $screen-sm-min) { .card { + border-radius: 0.5em; display: inline-block; margin-right: 1em; + vertical-align: top; width: 450px; } .card-narrow { width: 290px; } + .card-center { + display: block; + margin-left: auto; + margin-right: auto; + } + .card-default { + border: 1px solid $panel-default-border; + } + .card-primary { + border: 1px solid $panel-primary-border; + } } -@media (max-width: $screen-sm-min) { - .card-xs-vanish { +@media (max-width: $screen-xs-max) { + .card-default, .card-primary { border-radius: 0; border-style: dashed; border-width: 1px 0; @@ -40,6 +45,9 @@ padding-top: 0; } } + .card-xs-vanish { + border-width: 0; + } } .card.donation { diff --git a/templates/macros/nav.html b/templates/macros/nav.html index 80773aff9..6f649de86 100644 --- a/templates/macros/nav.html +++ b/templates/macros/nav.html @@ -87,9 +87,8 @@ % macro nav_explore() {{ nav([ ('/', _('Overview')), - ('/teams', _('Teams')), - ('/organizations', _('Organizations')), - ('/individuals', _('Individuals')), + ('/recipients', _('Recipients')), + ('/hopefuls', _('Hopefuls')), ('/pledges', _('Unclaimed Donations')), ('/repositories', _('Repositories')), ('/elsewhere', _('Social Networks')), diff --git a/www/%username/giving/index.html.spt b/www/%username/giving/index.html.spt index 649cb4f0e..6d376cb4e 100644 --- a/www/%username/giving/index.html.spt +++ b/www/%username/giving/index.html.spt @@ -281,7 +281,7 @@ next_payday = compute_next_payday_date() % for tip in tips % set tippee = tip.tippee_p -
+
% set username = tippee.username
{{ @@ -429,7 +429,7 @@ next_payday = compute_next_payday_date() % for tip in pledges % set e = tip.e_account -
+
{{ avatar_img(e.participant, size=72) @@ -497,7 +497,7 @@ next_payday = compute_next_payday_date() % for tip in cancelled_tips % set tippee = tip.tippee_p -
+
% set username = tippee.username
{{ @@ -555,7 +555,7 @@ next_payday = compute_next_payday_date() % for tip in cancelled_pledges % set e = tip.e_account -
+
{{ avatar_img(e.participant, size=72) diff --git a/www/explore/index.html.spt b/www/explore/index.html.spt index 5d0287fb1..b58430d1f 100644 --- a/www/explore/index.html.spt +++ b/www/explore/index.html.spt @@ -9,37 +9,25 @@ title = _("Explore") % extends "templates/layouts/explore.html" % block content +
-

{{ _( - "Liberapay provides several ways of finding great people to donate to:" - ) }}

-
- -
- -
-

{{ _("Organizations") }}

+
+

{{ _("Recipients") }}

{{ _( - "Great nonprofits and companies trying to improve the world." + "People and projects who receive donations through Liberapay." ) }}

-

{{ _("Explore Organizations") }}

+

{{ _("Explore Recipients") }}

-
-

{{ _("Individuals") }}

+
+

{{ _("Hopefuls") }}

{{ _( - "People like you who contribute to the commons (art, knowledge, software, …)." + "Users who are hoping to receive their first donations through Liberapay." ) }}

-

{{ _("Explore Individuals") }}

+

{{ _("Explore Hopefuls") }}

-
+

{{ _("Pledges") }}

{{ _( "Liberapay allows pledging to fund people who haven't joined the site yet." @@ -47,7 +35,7 @@ title = _("Explore")

{{ _("Explore Pledges") }}

-
+

{{ _("Repositories") }} {{ _("Explore Repositories") }}

-
+

{{ _("Social Networks") }}

{{ _( "Browse the accounts that Liberapay users have on other platforms. " @@ -69,7 +57,7 @@ title = _("Explore")

{{ _("Explore Social Networks") }}

- {#
+ {#

{{ _("Communities") }}

{{ _( "Communities allow you to find people that work on things you care " @@ -78,4 +66,5 @@ title = _("Explore")

{{ _("Explore Communities") }}

#} +
% endblock