diff --git a/scss/responsiveness.scss b/scss/responsiveness.scss index b2cbfd5696..7ece13120c 100644 --- a/scss/responsiveness.scss +++ b/scss/responsiveness.scss @@ -141,14 +141,6 @@ font-size: 14px; } - #hero { - font-size: 15px; - h1 { - font-size: 36px; - padding: 36px 0 18px; - } - } - .homepage { span { white-space: normal; } display: block; diff --git a/templates/base.html b/templates/base.html index 1d7dc6dd3d..38a79b208f 100644 --- a/templates/base.html +++ b/templates/base.html @@ -2,7 +2,7 @@ {% block head_early %}{% endblock %} - {% if title %}{{ title|e }} - {% endif %}Gratipay + {% if title %}{% if subhead %}{{ subhead|e }} - {% endif %}{{ title|e }} - {% endif %}Gratipay diff --git a/www/%username/account/close.spt b/www/%username/account/close.spt index 031c318b81..fd439e3b71 100644 --- a/www/%username/account/close.spt +++ b/www/%username/account/close.spt @@ -1,8 +1,8 @@ from gratipay.utils import get_participant [---] participant = get_participant(request, restrict=True) -hero = "Close Account" title = participant.username # used in the title tag +subhead = _("Close Account") username = participant.username # used in footer shared with on/$platform/ # pages diff --git a/www/%username/account/index.html.spt b/www/%username/account/index.html.spt index 4756c88967..c6a2fc566c 100644 --- a/www/%username/account/index.html.spt +++ b/www/%username/account/index.html.spt @@ -5,8 +5,8 @@ from cgi import escape [-----------------------------------------------------------------------------] participant = get_participant(request, restrict=True) -hero = _("Account") -title = participant.username # used in the title tag +title = participant.username +subhead = _("Account") username = participant.username # used in footer shared with on/$platform/ # pages locked = False diff --git a/www/%username/events/index.html.spt b/www/%username/events/index.html.spt index a400ef1591..a9dc564b8a 100644 --- a/www/%username/events/index.html.spt +++ b/www/%username/events/index.html.spt @@ -5,8 +5,8 @@ db = website.db [-----------------------------------------------------------------------------] participant = get_participant(request, restrict=True) -hero = "Events" -title = "%s - %s" % (participant.username, hero) +title = participant.username +subhead = "Events" locked = False SQL = """ diff --git a/www/%username/giving/index.html.spt b/www/%username/giving/index.html.spt index 2faa56e6dc..39d46d2f42 100644 --- a/www/%username/giving/index.html.spt +++ b/www/%username/giving/index.html.spt @@ -5,8 +5,8 @@ from gratipay.utils import get_participant participant = get_participant(request, restrict=True) tips, total, unclaimed_tips, unclaimed_total = \ participant.get_giving_for_profile() -hero = _("Giving") -title = "%s - %s" % (participant.username, hero) +title = participant.username +subhead = "Giving" locked = False cancelled_tips = [x for x in tips if x.amount == 0][:10] ncancelled_tips = len(cancelled_tips) diff --git a/www/%username/history/index.html.spt b/www/%username/history/index.html.spt index 028bcefa24..22f4e5fdfb 100644 --- a/www/%username/history/index.html.spt +++ b/www/%username/history/index.html.spt @@ -5,8 +5,8 @@ from gratipay.utils.history import iter_payday_events participant = get_participant(request, restrict=True) events = iter_payday_events(website.db, participant) -hero = _("History") -title = "%s - %s" % (participant.username, hero) +title = participant.username +subhead = _("History") locked = False subpath = 'history/' if user.ADMIN else '' admin_override = user.ADMIN and (participant != user.participant or 'override' in qs) diff --git a/www/%username/index.html.spt b/www/%username/index.html.spt index 6064c070da..2c96b5099b 100644 --- a/www/%username/index.html.spt +++ b/www/%username/index.html.spt @@ -16,7 +16,6 @@ def _clip(text, n): participant = get_participant(request, restrict=False) locked = False tip_or_pledge = "tip" -hero = _("Profile") title = participant.username # used in the title tag username = participant.username # used in footer shared with on/$platform/ # pages diff --git a/www/%username/members/index.html.spt b/www/%username/members/index.html.spt index 3b5958a0eb..d6b15a0711 100644 --- a/www/%username/members/index.html.spt +++ b/www/%username/members/index.html.spt @@ -9,8 +9,8 @@ if not team.show_as_team(user): request.redirect('../') locked = False tip_or_pledge = "tip" -hero = _("Team Members") title = team.username # used in the title tag +subhead = _("Team Members") username = team.username # used in footer shared with on/%platform/ pages [-----------------------------------------------------------------------------] diff --git a/www/%username/widgets/index.html.spt b/www/%username/widgets/index.html.spt index 6fe290fdd4..ce7a63926b 100644 --- a/www/%username/widgets/index.html.spt +++ b/www/%username/widgets/index.html.spt @@ -3,8 +3,8 @@ from gratipay.utils import get_participant [-----------------------------------------------------------------------------] participant = get_participant(request, restrict=True) -hero = _("Widgets") -title = "%s - %s" % (participant.username, hero) +title = participant.username +subhead = _("Widgets") locked = False [-----------------------------------------------------------------------------]